OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Sep-2003 14:08:52
Branch: HEAD Handle: 2003090413085000
Added files:
openpkg-src/openpkg bash.patch beecrypt.patch
Modified files:
openpkg-src/openpkg HISTORY README openpkg.spec
Log:
1. Apply Solaris/x86 assembly workround patch for BeeCrypt.
Thanks to Matthias Kurz <[EMAIL PROTECTED]>.
2. Apply GNU Bash patch we have in our "bash" package.
3. Upgrade to GNU Patch 2.5.9, the version we have in our "patch" package.
Summary:
Revision Changes Path
1.39 +2 -0 openpkg-src/openpkg/HISTORY
1.17 +10 -9 openpkg-src/openpkg/README
1.1 +150 -0 openpkg-src/openpkg/bash.patch
1.1 +99 -0 openpkg-src/openpkg/beecrypt.patch
1.209 +10 -2 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.38 -r1.39 HISTORY
--- openpkg-src/openpkg/HISTORY 4 Sep 2003 09:57:23 -0000 1.38
+++ openpkg-src/openpkg/HISTORY 4 Sep 2003 12:08:50 -0000 1.39
@@ -2,6 +2,8 @@
2003
====
+20030904 apply new BeeCrypt and Bash patch files
+20030904 remove obsoleted patch files from CVS
20030904 fix cut & paste typo in openpkg.spec related to VERBOSE function
20030904 fix logic in previous owner/group patch
20030903 patch RPM 4.2.1 so it does again (as 4.0.2) ignore file owner/group on
.src.rpm installation.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/README
============================================================================
$ cvs diff -u -r1.16 -r1.17 README
--- openpkg-src/openpkg/README 27 Aug 2003 14:00:38 -0000 1.16
+++ openpkg-src/openpkg/README 4 Sep 2003 12:08:50 -0000 1.17
@@ -20,18 +20,17 @@
patch-2.5.4.tar.gz ...... untouched distribution tarball of the GNU patch tool
bash-2.05b.tar.gz ....... untouched distribution tarball of the GNU bash tool
tar-1.13.25.tar.gz ...... untouched distribution tarball of the GNU tar tool
- curl-7.10.2.tar.gz ...... untouched distribution tarball of the cURL tool
- curl.patch .............. patch for cURL tool
+ curl-7.10.6.tar.gz ...... untouched distribution tarball of the cURL tool
- rpm-4.0.2.tar.gz ........ distribution tarball of the RPM tool
- rpm-4.0.2.patch.bugfix .. patch for RPM (bugfixing parts)
- rpm-4.0.2.patch.feature . patch for RPM (new features parts)
- rpm-4.0.2.patch.porting . patch for RPM (portability enhancement parts)
- rpm-4.0.2.patch.regen ... patch for RPM (re-generated files parts)
- db-3.2.9.tar.gz ......... untouched distribution tarball of the Berkeley-DB
library
- db.patch ................ patch for Berkeley-DB library
bzip2-1.0.2.tar.gz ...... untouched distribution tarball of the BZIP2 library
zlib-1.1.4.tar.gz ....... untouched distribution tarball of the ZLIB library
+ beecrypt-3.1.0.tar.gz ... untouched distribution tarball of the BeeCrypt
+ beecrypt.patch .......... patch for BeeCrypt
+ rpm-4.2.1.tar.gz ........ distribution tarball of the RPM tool
+ rpm.patch.bugfix ........ patch for RPM (bugfixing parts)
+ rpm.patch.feature ....... patch for RPM (new features parts)
+ rpm.patch.porting ....... patch for RPM (portability enhancement parts)
+ rpm.patch.regen ......... patch for RPM (re-generated files parts)
rpmpopt ................. extensions for RPM's popt configuration
rpmrc ................... replacements for RPM's run-commands
@@ -59,6 +58,8 @@
aux.wrapbin.sh .......... wrapper script for generating
openpkg-X.X-X.YYY-YYYY-ZZ.sh
aux.usrgrp.sh ........... user/group name/id determination script
aux.prereq.sh ........... prerequisite checking script
+
+ platform ................ platform identification script
openpkg.pgp ............. the OpenPGP public key of "The OpenPKG Project"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/bash.patch
============================================================================
$ cvs diff -u -r0 -r1.1 bash.patch
--- /dev/null 2003-09-04 14:08:52.000000000 +0200
+++ bash.patch 2003-09-04 14:08:52.000000000 +0200
@@ -0,0 +1,150 @@
+This patch makes sure Bash does not segfault on empty here documents. It
+is derived from Gentoo Linux. The problem can be reproduced with "xargs
+<<< ${EMTPY_VARIABLE}".
+
+--- redir.c 2002-03-12 20:27:38.000000000 +0000
++++ redir.c 2003-05-01 13:04:07.000000000 +0100
+@@ -263,8 +263,10 @@
+ int herelen, n, e;
+
+ herestr = expand_string_to_string (redirectee->word, 0);
+- herelen = strlen (herestr);
+
++ /* verify string wasnt empty */
++ herelen = (herestr == NULL) ? 0 : strlen (herestr);
++
+ n = write (fd, herestr, herelen);
+ if (n == herelen)
+ {
+
+-----------------------------------------------------------------------------
+
+This patch documents two implemented and classical command line options
+"-v" and "-v". It is derived from Debian GNU/Linux.
+
+--- doc/bash.1 Wed Jan 20 22:48:04 1999
++++ doc/bash.1 Sun Nov 14 13:26:59 1999
+@@ -104,6 +104,12 @@
+ This option allows the positional parameters to be set
+ when invoking an interactive shell.
+ .TP
++.B \-v
++Print shell input lines as they are read.
++.TP
++.B \-x
++Print commands and their arguments as they are executed.
++.TP
+ .B \-D
+ A list of all double-quoted strings preceded by \fB$\fP
+ is printed on the standard ouput.
+
+-----------------------------------------------------------------------------
+
+This patch makes sure Bash does not segfault on on "shift" under "shopt
+-s shift_verbose". It is a null pointer dereference caused by an
+erroneous assumption that, when the number of arguments to shift exceeds
+the number of arguments available for shifting, the latter is always
+explicitly specified on the command line rather than left implicit at
+the default 1. The patch was derived from Debian GNU/Linux.
+
+--- builtins/shift.def.orig 2002-10-22 01:05:10.000000000 -0400
++++ builtins/shift.def 2002-10-22 01:05:06.000000000 -0400
+@@ -68,7 +68,7 @@
+ else if (times > number_of_args ())
+ {
+ if (print_shift_error)
+- sh_erange (list->word->word, "shift count");
++ sh_erange (list ? list->word->word : NULL, "shift count");
+ return (EXECUTION_FAILURE);
+ }
+
+
+-----------------------------------------------------------------------------
+
+This patch makes sure a signal state variable is declared "volatile" so
+it is consistent throughout signal handling. This patch is derived from
+SuSE Linux.
+
+--- quit.h
++++ quit.h Wed May 2 17:38:34 2001
+@@ -21,8 +21,8 @@
+ #if !defined (_QUIT_H_)
+ #define _QUIT_H_
+
+ /* Non-zero means SIGINT has already ocurred. */
+-extern int interrupt_state;
++extern volatile int interrupt_state;
+
+ /* Macro to call a great deal. SIGINT just sets above variable. When
+ it is safe, put QUIT in the code, and the "interrupt" will take place. */
+--- sig.c
++++ sig.c Wed May 2 17:36:17 2001
+@@ -57,7 +57,7 @@
+ extern int interactive, interactive_shell, login_shell, startup_state;
+
+ /* Non-zero after SIGINT. */
+-int interrupt_state;
++volatile int interrupt_state = 0;
+
+ /* The environment at the top-level R-E loop. We use this in
+ the case of error return. */
+@@ -69,7 +69,7 @@
+ #endif /* JOB_CONTROL */
+
+ /* When non-zero, we throw_to_top_level (). */
+-int interrupt_immediately = 0;
++volatile int interrupt_immediately = 0;
+
+ static void initialize_shell_signals ();
+
+-----------------------------------------------------------------------------
+
+This patch adds an explicit recognition for terminal sequence "kD" to be
+"Delete" key. This is derived from Debian GNU/Linux and SuSE Linux.
+
+--- lib/readline/terminal.c
++++ lib/readline/terminal.c Thu Jul 18 14:34:00 2002
+@@ -145,6 +145,9 @@
+ static char *_rl_term_kH;
+ static char *_rl_term_at7; /* @7 */
+
++/* The key sequence sent by the Delete key, if any. */
++static char *_rl_term_kD;
++
+ /* Insert key */
+ static char *_rl_term_kI;
+
+@@ -313,6 +316,7 @@
+ { "ei", &_rl_term_ei },
+ { "ic", &_rl_term_ic },
+ { "im", &_rl_term_im },
++ { "kD", &_rl_term_kD }, /* delete */
+ { "kH", &_rl_term_kH }, /* home down ?? */
+ { "kI", &_rl_term_kI }, /* insert */
+ { "kd", &_rl_term_kd },
+@@ -496,6 +500,7 @@
+
+ _rl_bind_if_unbound (_rl_term_kh, rl_beg_of_line); /* Home */
+ _rl_bind_if_unbound (_rl_term_at7, rl_end_of_line); /* End */
++ _rl_bind_if_unbound (_rl_term_kD, rl_delete); /* Delete */
+
+ _rl_keymap = xkeymap;
+ }
+
+-----------------------------------------------------------------------------
+
+This patch makes sure Bash does not segfault on a particular error.
+It is derived from RedHat Linux.
+
+--- builtins/common.c.warnings 2003-03-25 17:48:02.000000000 +0000
++++ builtins/common.c 2003-03-25 17:49:03.000000000 +0000
+@@ -244,7 +244,7 @@
+ char *s;
+ {
+ if (s)
+- builtin_error ("%s: no job control");
++ builtin_error ("%s: no job control", s);
+ else
+ builtin_error ("no job control");
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/beecrypt.patch
============================================================================
$ cvs diff -u -r0 -r1.1 beecrypt.patch
--- /dev/null 2003-09-04 14:08:52.000000000 +0200
+++ beecrypt.patch 2003-09-04 14:08:52.000000000 +0200
@@ -0,0 +1,99 @@
+Index: gas/aesopt.x86.m4
+===================================================================
+RCS file: /CVSROOT/opkg/cvsbase/beecrypt/gas/aesopt.x86.m4,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 aesopt.x86.m4
+--- gas/aesopt.x86.m4 9 Jun 2003 08:35:39 -0000 1.1.1.1
++++ gas/aesopt.x86.m4 4 Sep 2003 07:26:08 -0000
+@@ -133,6 +133,9 @@
+ pxor 6144(%esi,%edx,8),s0
+ ')
+
++')
++ifdef(`USE_MMX',`
++
+ define(`elr',`
+ movd 0(%ebp),s0
+ movd t0,%eax
+@@ -252,6 +255,9 @@
+ ')
+
+
++')
++ifdef(`USE_MMX',`
++
+ C_FUNCTION_BEGIN(aesEncrypt)
+ pushl %edi
+ pushl %esi
+@@ -363,6 +369,9 @@
+ pxor 6144(%esi,%edx,8),t2
+ ')
+
++')
++ifdef(`USE_MMX',`
++
+ define(`dsft',`
+ movd $1+ 0(%ebp),s0
+ movd t0,%eax
+@@ -488,6 +497,9 @@
+ pxor t2,s1
+ pxor t3,s2
+ ')
++
++')
++ifdef(`USE_MMX',`
+
+ define(`dblock',`
+ sxrk
+Index: gas/mpopt.x86.m4
+===================================================================
+RCS file: /CVSROOT/opkg/cvsbase/beecrypt/gas/mpopt.x86.m4,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 mpopt.x86.m4
+--- gas/mpopt.x86.m4 4 Jun 2003 17:39:58 -0000 1.1.1.1
++++ gas/mpopt.x86.m4 4 Sep 2003 07:26:08 -0000
+@@ -29,7 +29,7 @@
+ movl 12(%esp),%edi
+
+ xorl %eax,%eax
+- repz stosl
++ repz; stosl
+
+ popl %edi
+ ret
+@@ -43,7 +43,7 @@
+ movl 12(%esp),%edi
+ movl 16(%esp),%eax
+
+- repz stosl
++ repz; stosl
+
+ popl %edi
+ ret
+Index: gas/sha1opt.x86.m4
+===================================================================
+RCS file: /CVSROOT/opkg/cvsbase/beecrypt/gas/sha1opt.x86.m4,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 sha1opt.x86.m4
+--- gas/sha1opt.x86.m4 8 May 2003 17:52:54 -0000 1.1.1.1
++++ gas/sha1opt.x86.m4 4 Sep 2003 07:26:08 -0000
+@@ -21,13 +21,13 @@
+ include(config.m4)
+ include(ASM_SRCDIR/x86.m4)
+
+- .equ K00, 0x5a827999
+- .equ K20, 0x6ed9eba1
+- .equ K40, 0x8f1bbcdc
+- .equ K60, 0xca62c1d6
++ .set K00, 0x5a827999
++ .set K20, 0x6ed9eba1
++ .set K40, 0x8f1bbcdc
++ .set K60, 0xca62c1d6
+
+- .equ PARAM_H, 0
+- .equ PARAM_DATA, 20
++ .set PARAM_H, 0
++ .set PARAM_DATA, 20
+
+ define(`subround1',`
+ movl $2,%ecx
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.208 -r1.209 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 4 Sep 2003 09:57:23 -0000 1.208
+++ openpkg-src/openpkg/openpkg.spec 4 Sep 2003 12:08:50 -0000 1.209
@@ -49,7 +49,7 @@
%define V_curl 7.10.6
%define V_make 3.80
%define V_gzip 1.3.5
-%define V_patch 2.5.4
+%define V_patch 2.5.9
%define V_tar 1.13.25
%define V_bash 2.05b
@@ -98,7 +98,7 @@
Source29: rpmx.pl
Source30: ftp://ftp.gnu.org/gnu/make/make-%{V_make}.tar.gz
Source31: ftp://alpha.gnu.org/gnu/gzip/gzip-%{V_gzip}.tar
-Source32: ftp://ftp.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
+Source32: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
Source33: rc.openpkg
Source34: ftp://ftp.gnu.org/gnu/tar/tar-%{V_tar}.tar.gz
Source35: ftp://ftp.gnu.org/gnu/bash/bash-%{V_bash}.tar.gz
@@ -117,6 +117,8 @@
Source48: rc.8
Source49: rc.pod
Source50: platform
+Source51: beecrypt.patch
+Source52: bash.patch
# build information
Prefix: %{l_prefix}
@@ -394,6 +396,12 @@
) || exit $?
( cd make-%{V_make}
${l_patch} -p0 <`SOURCE make.patch`
+ ) || exit $?
+ ( cd bash-%{V_bash}
+ ${l_patch} -p0 <`SOURCE bash.patch`
+ ) || exit $?
+ ( cd beecrypt-%{V_beecrypt}
+ ${l_patch} -p0 <`SOURCE beecrypt.patch`
) || exit $?
# display verbosity header
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
