OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Dec-2006 11:36:00
Branch: HEAD Handle: 2006120710355800
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Removed files:
openpkg-src/openpkg openpkg.c
Log:
upgrade to "openpkg" executable version 2.0.0-C
Summary:
Revision Changes Path
1.408 +1 -1 openpkg-src/openpkg/HISTORY
1.5 +0 -467 openpkg-src/openpkg/openpkg.c
1.552 +79 -62 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.407 -r1.408 HISTORY
--- openpkg-src/openpkg/HISTORY 6 Dec 2006 12:57:01 -0000 1.407
+++ openpkg-src/openpkg/HISTORY 7 Dec 2006 10:35:58 -0000 1.408
@@ -2,7 +2,7 @@
2006
====
-20061206 **** RELEASE AS PART OF OPENPKG 2.20061206 ***
+20061207 upgrade to "openpkg" executable version 2.0.0-C
20061206 apply the GNU Bash 3.2 upstream patches 001-005
20061206 switch GNU gzip from pre-patched OpenPKG tarball to pristine
upstream tarball plus OpenPKG "update" tarball
20061206 enhance "openpkg release" robustness when config file defines same
value repeatedly
@@ .
rm -f openpkg-src/openpkg/openpkg.c <<'@@ .'
Index: openpkg-src/openpkg/openpkg.c
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.551 -r1.552 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 6 Dec 2006 11:19:25 -0000 1.551
+++ openpkg-src/openpkg/openpkg.spec 7 Dec 2006 10:35:58 -0000 1.552
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20061206
+%define V_openpkg 20061207
# the used software versions
%define V_rpm 4.2.1
@@ -59,6 +59,7 @@
%define V_perl 5.8.8
%define V_openssl 0.9.8d
%define V_tools 1.1.1
+%define V_exec 2.0.0-C
# package information
Name: openpkg
@@ -74,44 +75,44 @@
Release: %{V_openpkg}
# list of sources
-Source0: ftp://ftp.openpkg.org/sources/CPY/openpkg/rpm-%{V_rpm}.tar.gz
-Source1: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{V_uuid}.tar.gz
-Source2: ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}.tar
-Source3:
ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}-openpkg-r%{V_gzip_r}.tar
-Source4: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
-Source5: ftp://ftp.gnu.org/gnu/tar/tar-%{V_tar}.tar.gz
-Source6: ftp://ftp.cwru.edu/pub/bash/bash-%{V_bash}.tar.gz
-Source7:
ftp://ftp.openpkg.org/sources/CPY/config/config-%{V_config}.tar.gz
-Source8: ftp://ftp.gnu.org/gnu/make/make-%{V_make}.tar.gz
-Source9: http://www.bzip.org/%{V_bzip2}/bzip2-%{V_bzip2}.tar.gz
-Source10: http://curl.haxx.se/download/curl-%{V_curl}.tar.gz
-Source11:
http://switch.dl.sourceforge.net/beecrypt/beecrypt-%{V_beecrypt}.tar.gz
-Source12: http://www.zlib.net/zlib-%{V_zlib}.tar.gz
-Source13:
ftp://ftp.openpkg.org/sources/CPY/openpkg-registry/openpkg-registry-%{V_registry}.tar.gz
-Source14:
ftp://ftp.openpkg.org/sources/CPY/openpkg-tools/openpkg-tools-%{V_tools}.tar.gz
-Source15:
ftp://ftp.openpkg.org/sources/CPY/perl/perl-%{V_perl}-mini.tar.gz
-Source16: ftp://ftp.openssl.org/source/openssl-%{V_openssl}.tar.gz
-Source17: HISTORY
-Source18: README
-Source19: aux.prereq.sh
-Source20: aux.usrgrp.sh
-Source21: aux.wrapbin.sh
-Source22: aux.wrapsrc.sh
-Source23: bash.patch
-Source24: beecrypt.patch
-Source25: dot.bash_login
-Source26: dot.bashrc
-Source27: dot.lsyncrc
-Source28: install.sh
-Source29: local.README
-Source30: lsync
-Source31: lsync.8
-Source32: lsync.pod
-Source33: make.patch
-Source34: man.sh
-Source35: openpkg.1
-Source36: openpkg.boot
-Source37: openpkg.c
+Source0: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
+Source1: ftp://ftp.cwru.edu/pub/bash/bash-%{V_bash}.tar.gz
+Source2: ftp://ftp.gnu.org/gnu/make/make-%{V_make}.tar.gz
+Source3: ftp://ftp.gnu.org/gnu/tar/tar-%{V_tar}.tar.gz
+Source4:
ftp://ftp.openpkg.org/sources/CPY/config/config-%{V_config}.tar.gz
+Source5:
ftp://ftp.openpkg.org/sources/CPY/openpkg-registry/openpkg-registry-%{V_registry}.tar.gz
+Source6:
ftp://ftp.openpkg.org/sources/CPY/openpkg-tools/openpkg-tools-%{V_tools}.tar.gz
+Source7:
ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}-openpkg-r%{V_gzip_r}.tar
+Source8: ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}.tar
+Source9:
ftp://ftp.openpkg.org/sources/CPY/openpkg/openpkg-executable-%{V_exec}.tar.gz
+Source10: ftp://ftp.openpkg.org/sources/CPY/openpkg/rpm-%{V_rpm}.tar.gz
+Source11:
ftp://ftp.openpkg.org/sources/CPY/perl/perl-%{V_perl}-mini.tar.gz
+Source12: ftp://ftp.openssl.org/source/openssl-%{V_openssl}.tar.gz
+Source13: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{V_uuid}.tar.gz
+Source14: http://curl.haxx.se/download/curl-%{V_curl}.tar.gz
+Source15:
http://switch.dl.sourceforge.net/beecrypt/beecrypt-%{V_beecrypt}.tar.gz
+Source16: http://www.bzip.org/%{V_bzip2}/bzip2-%{V_bzip2}.tar.gz
+Source17: http://www.zlib.net/zlib-%{V_zlib}.tar.gz
+Source18: HISTORY
+Source19: README
+Source20: aux.prereq.sh
+Source21: aux.usrgrp.sh
+Source22: aux.wrapbin.sh
+Source23: aux.wrapsrc.sh
+Source24: bash.patch
+Source25: beecrypt.patch
+Source26: dot.bash_login
+Source27: dot.bashrc
+Source28: dot.lsyncrc
+Source29: install.sh
+Source30: local.README
+Source31: lsync
+Source32: lsync.8
+Source33: lsync.pod
+Source34: make.patch
+Source35: man.sh
+Source36: openpkg.1
+Source37: openpkg.boot
Source38: openpkg.com.pgp
Source39: openpkg.net.pgp
Source40: openpkg.org.pgp
@@ -267,6 +268,11 @@
url = ftp://ftp.openpkg.org/sources/CPY/openpkg-tools/
regex = openpkg-tools-(__VER__)\.tar\.gz
}
+ prog openpkg:openpkg-executable = {
+ version = %{V_exec}
+ url = ftp://ftp.openpkg.org/sources/CPY/openpkg/
+ regex = openpkg-executable-(__VER__-C)\.tar\.gz
+ }
%prep
# skip in bootstrap phase 2 (see openpkg.boot)
@@ -580,18 +586,19 @@
set +x; VERBOSE "PREPARATION: Unpack Distribution Tarballs"; set -x
# unpack distribution tarballs
- ${l_gzip} -dc `SOURCE rpm-%{V_rpm}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
- ${l_gzip} -dc `SOURCE zlib-%{V_zlib}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
- ${l_gzip} -dc `SOURCE bzip2-%{V_bzip2}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
- ${l_gzip} -dc `SOURCE curl-%{V_curl}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
- ${l_gzip} -dc `SOURCE make-%{V_make}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
- ${l_gzip} -dc `SOURCE bash-%{V_bash}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
- ${l_gzip} -dc `SOURCE uuid-%{V_uuid}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
- ${l_gzip} -dc `SOURCE beecrypt-%{V_beecrypt}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
+ ${l_gzip} -dc `SOURCE rpm-%{V_rpm}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
+ ${l_gzip} -dc `SOURCE zlib-%{V_zlib}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
+ ${l_gzip} -dc `SOURCE bzip2-%{V_bzip2}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
+ ${l_gzip} -dc `SOURCE curl-%{V_curl}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
+ ${l_gzip} -dc `SOURCE make-%{V_make}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
+ ${l_gzip} -dc `SOURCE bash-%{V_bash}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
+ ${l_gzip} -dc `SOURCE uuid-%{V_uuid}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
+ ${l_gzip} -dc `SOURCE beecrypt-%{V_beecrypt}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
${l_gzip} -dc `SOURCE openpkg-registry-%{V_registry}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
- ${l_gzip} -dc `SOURCE perl-%{V_perl}-mini.tar.gz` | ${l_tar} xf -
2>/dev/null || true
- ${l_gzip} -dc `SOURCE openssl-%{V_openssl}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
- ${l_gzip} -dc `SOURCE openpkg-tools-%{V_tools}.tar.gz` | ${l_tar} xf -
2>/dev/null || true
+ ${l_gzip} -dc `SOURCE perl-%{V_perl}-mini.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
+ ${l_gzip} -dc `SOURCE openssl-%{V_openssl}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
+ ${l_gzip} -dc `SOURCE openpkg-tools-%{V_tools}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
+ ${l_gzip} -dc `SOURCE openpkg-executable-%{V_exec}.tar.gz` | ${l_tar}
xf - 2>/dev/null || true
# update config.guess/config.sub
for dir in rpm-%{V_rpm} rpm-%{V_rpm}/popt beecrypt-%{V_beecrypt} \
@@ -958,17 +965,13 @@
${l_make}
) || exit $?
- # build frontend wrapper
- ( os_name=`(uname -s) 2>/dev/null` || os_name='Unknown'
- os_name=`echo "${os_name}" |\
- sed -e 's;[^a-zA-Z0-9];;g' |\
- tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- ${l_cc} \
- -DOPENPKG_PLATFORM_${os_name} \
- -DOPENPKG_PREFIX=\"%{l_prefix}\" \
- -DOPENPKG_SUSR=\"%{l_susr}\" \
- -DOPENPKG_MUSR=\"%{l_musr}\" \
- -o openpkg `SOURCE openpkg.c`
+ # build "openpkg" executable
+ ( cd openpkg-executable-%{V_exec}
+ ${l_make} \
+ CC="${l_cc}" \
+ OPENPKG_PREFIX="%{l_prefix}" \
+ OPENPKG_SUSR="%{l_susr}" \
+ OPENPKG_MUSR="%{l_musr}"
) || exit $?
%install
@@ -1229,7 +1232,7 @@
chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmtool
# install OpenPKG tool chain execution frontend and execution wrapper
- cp openpkg $RPM_BUILD_ROOT%{l_prefix}/bin/openpkg
+ cp openpkg-executable-%{V_exec}/openpkg
$RPM_BUILD_ROOT%{l_prefix}/bin/openpkg
${l_strip} $RPM_BUILD_ROOT%{l_prefix}/bin/openpkg
chmod 4775 $RPM_BUILD_ROOT%{l_prefix}/bin/openpkg
sed -e "s;@l_prefix@;%{l_prefix};g" \
@@ -2406,6 +2409,20 @@
fi
chown %{l_musr}:%{l_mgrp} %{l_prefix}/lib/openpkg/fallback >/dev/null
2>&1 || true
+ # display license information of "openpkg" executable in case the
+ # OpenPKG Community version (staying under an OSS license) is NOT used.
+ community_version=`%{l_prefix}/bin/openpkg --license 2>/dev/null | \
+ sed -e 'q' | egrep '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-C'`
+ if [ ".$community_version" = . ]; then
+ ( echo ""
+ echo "NOTICE: This OpenPKG bootstrap package is based on an
\"openpkg\""
+ echo "executable which is covered by the following terms of use:"
+ echo
"______________________________________________________________________________"
+ echo ""
+ %{l_prefix}/bin/openpkg --license | sed -e '1d'
+ ) | %{l_prefix}/lib/openpkg/rpmtool msg -b -t notice
+ fi
+
%preun
[ ".$1" != .0 ] && exit 0
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
