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: 23-Mar-2005 13:59:15
Branch: OPENPKG_2_3_SOLID Handle: 200503041744401624475
Modified files: (Branch: OPENPKG_2_3_SOLID)
openpkg-src/openpkg HISTORY aux.prereq.sh beecrypt.patch openpkg.boot
openpkg.spec rc shtool
Removed files: (Branch: OPENPKG_2_3_SOLID)
openpkg-src/openpkg curl.patch
Log:
MFC: all changes between 20050223 and 20050323
Summary:
Revision Changes Path
1.244.2.4 +9 -0 openpkg-src/openpkg/HISTORY
1.20.2.1 +19 -20 openpkg-src/openpkg/aux.prereq.sh
1.2.4.1 +19 -0 openpkg-src/openpkg/beecrypt.patch
1.6 +0 -245 openpkg-src/openpkg/curl.patch
1.52.2.1 +10 -1 openpkg-src/openpkg/openpkg.boot
1.397.2.4 +4 -8 openpkg-src/openpkg/openpkg.spec
1.59.2.1 +1 -1 openpkg-src/openpkg/rc
1.24.6.1 +19 -3 openpkg-src/openpkg/shtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.244.2.3 -r1.244.2.4 HISTORY
--- openpkg-src/openpkg/HISTORY 23 Feb 2005 14:52:23 -0000
1.244.2.3
+++ openpkg-src/openpkg/HISTORY 23 Mar 2005 12:59:14 -0000
1.244.2.4
@@ -2,6 +2,15 @@
2005
====
+20050223 **** RELEASE AS PART OF OPENPKG 2.3.1 ***
+20050323 give a more precise hint at the end of the .src.sh bootstrap
procedure
+20050314 fix rc env processing: do not assign to the variable "_" (which is
read-only in some shells like zsh)
+20050308 remove GNU gcc specific and unused stuff from <beecrypt/gnu.h>,
because it breaks under non-GCC
+20050305 upgrade to latest version of GNU config.* scripts
+20050304 upgrade to cURL 7.13.1
+20050224 upgrade to GNU shtool 2.0.1
+20050224 update aux.prereq.sh for OpenPKG 2.3's list of platforms
+
20050223 **** RELEASE AS PART OF OPENPKG 2.3.0 ***
20050223 fix %clean procedure to correctly remove build area
20050223 apply cURL 7.13.0 security fixes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.prereq.sh
============================================================================
$ cvs diff -u -r1.20 -r1.20.2.1 aux.prereq.sh
--- openpkg-src/openpkg/aux.prereq.sh 2 Feb 2005 18:58:34 -0000 1.20
+++ openpkg-src/openpkg/aux.prereq.sh 23 Mar 2005 12:59:14 -0000 1.20.2.1
@@ -39,56 +39,55 @@
# official "forecasted" platforms
*-aix*:* |\
*-irix*:* |\
- *-macosx*:* |\
- *-tru64*:* )
+ amd64-freebsd5.3:* )
support=forecasted
;;
# official "tentative" platforms
hppa-hpux11.11:* |\
+ ix86-netbsd2.0:* |\
ix86-debian3.1:* |\
- ix86-gentoo1.5.3:* |\
- ix86-solaris10:* |\
- sparc64-solaris10:* |\
- amd64-freebsd5.3:* |\
+ ix86-mandrake10.1:* |\
+ ppc-darwin7.8.0*:* |\
+ ix86-gentoo1.6.9:* |\
ia64-freebsd5.3:* |\
sparc64-freebsd5.3:* |\
ix86-freebsd6.0:* )
support=tentative
;;
# official "supported" platforms
+ ix86-freebsd4.11:* |\
+ ix86-freebsd5.3:* |\
ix86-debian3.0:* |\
ix86-fedora3:* |\
- ix86-freebsd4.10:* |\
- ix86-freebsd5.3:* |\
- ix86-solaris9:* |\
ix86-rhel3:* |\
- ix86-sles9:* |\
+ ix86-suse9:* |\
ix86-suse9.2:* |\
sparc64-solaris8:* |\
- sparc64-solaris9:* )
+ ix86-solaris9:* |\
+ sparc64-solaris9:* |\
+ ix86-solaris10:* |\
+ sparc64-solaris10:* )
support=supported
;;
# official "obsolete" platforms
- ix86-rhl9:* |\
- ix86-suse9.0:* |\
- sparc64-solaris2.6:* )
- support=obsolete
- ;;
+ #xxx-xxx:* )
+ # support=obsolete
+ # ;;
# official "deprecated" platforms
+ *-tru64*:* |\
*-unixware*:* )
support=deprecated
;;
# probable platforms
*-debian[23].*:* |\
*-fedora*:* |\
- *-freebsd[45].*:* |\
- *-gentoo1.4.*:* |\
+ *-freebsd[456].*:* |\
+ *-gentoo1.*:* |\
*-hpux11.*:* |\
*-mandrake*:* |\
- *-netbsd1.6.*:* |\
+ *-netbsd*:* |\
*-rhel3:* |\
*-rhl9:* |\
- *-solaris*:* |\
*-suse[789].*:* )
support=probable
;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/beecrypt.patch
============================================================================
$ cvs diff -u -r1.2 -r1.2.4.1 beecrypt.patch
--- openpkg-src/openpkg/beecrypt.patch 4 Aug 2004 19:14:47 -0000
1.2
+++ openpkg-src/openpkg/beecrypt.patch 23 Mar 2005 12:59:14 -0000
1.2.4.1
@@ -41,3 +41,22 @@
define(`dblock',`
sxrk
+Index: gnu.h.in
+--- gnu.h.in.orig 2004-12-19 21:18:48 +0100
++++ gnu.h.in 2005-03-08 19:34:03 +0100
+@@ -48,15 +48,6 @@
+ @TYPEDEF_UINT32_T@
+ @TYPEDEF_UINT64_T@
+
+-#if defined(__GNUC__)
+-# if !defined(__GNUC_PREREQ__)
+-# define __GNUC_PREREQ__(maj, min) (__GNUC__ > (maj) || __GNUC__ == (maj)
&& __GNUC_MINOR__ >= (min))
+-# endif
+-#else
+-# define __GNUC__ 0
+-# define __GNUC_PREREQ__(maj, min) 0
+-#endif
+-
+ /* WARNING: overriding this value is dangerous; some assembler routines
+ * make assumptions about the size set by the configure script
+ */
@@ .
rm -f openpkg-src/openpkg/curl.patch <<'@@ .'
Index: openpkg-src/openpkg/curl.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.52 -r1.52.2.1 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 20 Jan 2005 11:08:53 -0000 1.52
+++ openpkg-src/openpkg/openpkg.boot 23 Mar 2005 12:59:14 -0000 1.52.2.1
@@ -666,7 +666,16 @@
echo "STEP to initially create the OpenPKG instance from scratch."
echo "Hence, proceed now by running the following command:"
echo ""
- echo " \$ sh openpkg-$v.$t.sh"
+ cusr=`(id -un) 2>/dev/null ||\
+ (id | sed -e 's;^[^(]*(\([^)]*\)).*;\1;') 2>/dev/null ||\
+ (whoami) 2>/dev/null ||\
+ (who am i | cut "-d " -f1) 2>/dev/null ||\
+ echo $LOGNAME`
+ if [ ".$musr.$rusr.$nusr" = ".$cusr.$cusr.$cusr" -o ".$cusr" = ".root" ];
then
+ echo " \$ sh openpkg-$v.$t.sh"
+ else
+ echo " \$ su root -c \"sh openpkg-$v.$t.sh\""
+ fi
) | sh $tmpdir/rpmtool msg -b -t info
rm -f $tmpdir/rpmtool
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.397.2.3 -r1.397.2.4 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 23 Feb 2005 14:52:23 -0000
1.397.2.3
+++ openpkg-src/openpkg/openpkg.spec 23 Mar 2005 12:59:14 -0000
1.397.2.4
@@ -39,21 +39,21 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.3.0
+%define V_openpkg 2.3.1
# the used software versions
%define V_rpm 4.2.1
%define V_zlib 1.2.2
%define V_bzip2 1.0.2
%define V_beecrypt 4.1.2
-%define V_curl 7.13.0
+%define V_curl 7.13.1
%define V_make 3.80
%define V_gzip 1.3.5
%define V_patch 2.5.9
%define V_tar 1.15.1
%define V_bash 3.0
%define V_uuid 1.2.0
-%define V_config 20050124
+%define V_config 20050305
# package information
Name: openpkg
@@ -131,7 +131,6 @@
Source59: uuid.8
Source60: uuid.pod
Source61: uuid.sh
-Source62: curl.patch
# build information
Prefix: %{l_prefix}
@@ -139,7 +138,7 @@
AutoReq: no
AutoReqProv: no
Provides: OpenPKG
-Provides: openpkg = 20050223-20050223
+Provides: openpkg = 20050323-20050323
%description
This is the bootstrap package for the RPM-based Unix Software
@@ -548,9 +547,6 @@
-e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
configure
) || exit $?
- ( cd curl-%{V_curl}
- ${l_patch} -p0 <`SOURCE curl.patch`
- ) || exit $?
# display verbosity header
set +x; VERBOSE "PREPARATION: Build GNU make (Build Tool)"; set -x
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.59 -r1.59.2.1 rc
--- openpkg-src/openpkg/rc 20 Jan 2005 11:08:53 -0000 1.59
+++ openpkg-src/openpkg/rc 23 Mar 2005 12:59:15 -0000 1.59.2.1
@@ -604,7 +604,7 @@
echo "unset PWD SHLVL" >>$tmpfile
echo "env |\\" >>$tmpfile
echo "egrep '^[A-Z_][A-Z0-9_]*=.' |\\" >>$tmpfile
- echo "sed -e 's/\\\\/\\\\\\\\/g' -e 's/\"/\\\\\"/g' \\" >>$tmpfile
+ echo "sed -e '/^_=/d' -e 's/\\\\/\\\\\\\\/g' -e 's/\"/\\\\\"/g' \\"
>>$tmpfile
case $SHELL in
csh|*/csh|tcsh|*/tcsh )
echo "-e 's/^\\([^=]*\\)=\\(.*\\)\$/setenv \\1 \"\\2\"/'"
>>$tmpfile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/shtool
============================================================================
$ cvs diff -u -r1.24 -r1.24.6.1 shtool
--- openpkg-src/openpkg/shtool 2 Jul 2004 13:24:01 -0000 1.24
+++ openpkg-src/openpkg/shtool 23 Mar 2005 12:59:15 -0000 1.24.6.1
@@ -6,7 +6,7 @@
## See http://www.gnu.org/software/shtool/ for more information.
## See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
##
-## Version: 2.0.0 (02-Jul-2004)
+## Version: 2.0.1 (11-Aug-2004)
## Contents: all available modules
##
@@ -65,7 +65,7 @@
exit 1
fi
if [ ".$1" = ".-h" ] || [ ".$1" = ".--help" ]; then
- echo "This is GNU shtool, version 2.0.0 (02-Jul-2004)"
+ echo "This is GNU shtool, version 2.0.1 (11-Aug-2004)"
echo "Copyright (c) 1994-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>"
echo "Report bugs to <[EMAIL PROTECTED]>"
echo ''
@@ -132,7 +132,7 @@
exit 0
fi
if [ ".$1" = ".-v" ] || [ ".$1" = ".--version" ]; then
- echo "GNU shtool 2.0.0 (02-Jul-2004)"
+ echo "GNU shtool 2.0.1 (11-Aug-2004)"
exit 0
fi
if [ ".$1" = ".-r" ] || [ ".$1" = ".--recreate" ]; then
@@ -3736,6 +3736,22 @@
echo >>$file "#endif /* _${filestr}_AS_HEADER_ */"
echo >>$file ""
;;
+ m4 )
+ echo >>$file "##"
+ echo >>$file "## ${file} -- Version Information for ${name}
(syntax: M4)"
+ echo >>$file "## [automatically generated and maintained by
GNU shtool]"
+ echo >>$file "##"
+ echo >>$file ""
+ echo >>$file "m4_define([v_hex], [${vHex}])"
+ echo >>$file "m4_define([v_short], [${vShort}])"
+ echo >>$file "m4_define([v_long], [${vLong}])"
+ echo >>$file "m4_define([v_tex], [${vTeX}])"
+ echo >>$file "m4_define([v_gnu], [${vGNU}])"
+ echo >>$file "m4_define([v_web], [${vWeb}])"
+ echo >>$file "m4_define([v_sccs], [${vSCCS}])"
+ echo >>$file "m4_define([v_rcs], [${vRCS}])"
+ echo >>$file ""
+ ;;
perl )
echo >>$file "##"
echo >>$file "## ${file} -- Version Information for ${name}
(syntax: Perl)"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
