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: 22-Mar-2005 21:29:17
Branch: HEAD Handle: 2005032220291600
Modified files:
openpkg-src/openssl openssl.patch openssl.spec
Log:
upgrading package: openssl 0.9.7e -> 0.9.7f
Summary:
Revision Changes Path
1.19 +59 -72 openpkg-src/openssl/openssl.patch
1.61 +2 -2 openpkg-src/openssl/openssl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssl/openssl.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 openssl.patch
--- openpkg-src/openssl/openssl.patch 13 Mar 2005 19:09:28 -0000 1.18
+++ openpkg-src/openssl/openssl.patch 22 Mar 2005 20:29:16 -0000 1.19
@@ -1,63 +1,10 @@
-Index: crypto/bn/bn_prime.pl
---- crypto/bn/bn_prime.pl.orig 2000-02-16 14:24:06.000000000 +0100
-+++ crypto/bn/bn_prime.pl 2003-10-01 22:06:50.000000000 +0200
-@@ -11,7 +11,7 @@
- $p+=2;
- $s=int(sqrt($p));
-
-- for ($i=0; $primes[$i]<=$s; $i++)
-+ for ($i=0; defined($primes[$i]) && $primes[$i]<=$s; $i++)
- {
- next loop if (($p%$primes[$i]) == 0);
- }
-Index: doc/crypto/des_modes.pod
---- doc/crypto/des_modes.pod.orig 2002-03-05 16:30:13.000000000 +0100
-+++ doc/crypto/des_modes.pod 2003-10-01 22:06:50.000000000 +0200
-@@ -2,7 +2,7 @@
-
- =head1 NAME
-
--Modes of DES - the variants of DES and other crypto algorithms of OpenSSL
-+des_modes - the variants of DES and other crypto algorithms of OpenSSL
-
- =head1 DESCRIPTION
-
-Index: config
---- config.orig 2004-06-29 00:01:05 +0200
-+++ config 2004-11-15 14:22:20 +0100
-@@ -649,6 +649,7 @@
- sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;;
- *86*-*-solaris2) OUT="solaris-x86-$CC" ;;
- *-*-sunos4) OUT="sunos-$CC" ;;
-+ amd64*-*-freebsd*) OUT="FreeBSD-amd64" ;;
- alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
- sparc64-*-freebsd*) OUT="FreeBSD-sparc64" ;;
- ia64-*-freebsd*) OUT="FreeBSD-ia64" ;;
-@@ -656,7 +657,7 @@
- *-freebsd[1-2]*) OUT="FreeBSD" ;;
- *86*-*-netbsd) OUT="NetBSD-x86" ;;
- sun3*-*-netbsd) OUT="NetBSD-m68" ;;
-- *-*-netbsd) OUT="NetBSD-sparc" ;;
-+ *-*-netbsd) OUT="NetBSD-${MACHINE}" ;;
- alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
- *86*-*-openbsd) OUT="OpenBSD-i386" ;;
- m68k*-*-openbsd) OUT="OpenBSD-m68k" ;;
-@@ -671,7 +672,7 @@
- *-*-openbsd) OUT="OpenBSD" ;;
- *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
- *-*-osf) OUT="alphaold-cc" ;;
-- *-*-tru64) OUT="alpha-cc" ;;
-+ *-*-tru64) OUT="alpha-gcc" ;;
- *-*-OpenUNIX*)
- if [ "$CC" = "gcc" ]; then
- OUT="OpenUNIX-8-gcc"
Index: Configure
---- Configure.orig 2004-10-01 13:34:28 +0200
-+++ Configure 2004-11-15 14:22:03 +0100
-@@ -400,12 +400,23 @@
- "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer
-Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK
RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-ia64-ecc", "ecc:-DL_ENDIAN -DTERMIO -O2
-Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK
RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall
-DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR
BF_PTR2 DES_INT
DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+--- Configure.orig 2005-03-12 12:28:21 +0100
++++ Configure 2005-03-22 21:25:59 +0100
+@@ -403,12 +403,23 @@
+ "linux-ia64-ecc", "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall
-no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall
-DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2
DES_INT
DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-amd64.o:::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-em64t", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall
-DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR
BF_PTR2 DES_INT
DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall
-DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall
-DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486
-Wall::(unknown):::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -81,16 +28,56 @@
"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486
-Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
"bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5
-m486::(unknown):::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486
-Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-Index: crypto/rand/rand_unix.c
---- crypto/rand/rand_unix.c.orig 2003-12-27 17:01:52.000000000 +0100
-+++ crypto/rand/rand_unix.c 2005-03-13 20:05:25.927977714 +0100
-@@ -172,9 +172,6 @@
- our controlling tty */
- |O_NOCTTY
- #endif
--#ifdef O_NOFOLLOW /* Fail if the file is a symbolic link */
-- |O_NOFOLLOW
--#endif
- )) >= 0)
- {
- struct timeval t = { 0, 10*1000 }; /* Spend 10ms on
+Index: config
+--- config.orig 2005-02-06 14:09:51 +0100
++++ config 2005-03-22 21:24:34 +0100
+@@ -656,6 +656,7 @@
+ sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;;
+ *86*-*-solaris2) OUT="solaris-x86-$CC" ;;
+ *-*-sunos4) OUT="sunos-$CC" ;;
++ amd64*-*-freebsd*) OUT="FreeBSD-amd64" ;;
+ alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
+ sparc64-*-freebsd*) OUT="FreeBSD-sparc64" ;;
+ ia64-*-freebsd*) OUT="FreeBSD-ia64" ;;
+@@ -663,7 +664,7 @@
+ *-freebsd[1-2]*) OUT="FreeBSD" ;;
+ *86*-*-netbsd) OUT="NetBSD-x86" ;;
+ sun3*-*-netbsd) OUT="NetBSD-m68" ;;
+- *-*-netbsd) OUT="NetBSD-sparc" ;;
++ *-*-netbsd) OUT="NetBSD-${MACHINE}" ;;
+ alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
+ *86*-*-openbsd) OUT="OpenBSD-i386" ;;
+ m68k*-*-openbsd) OUT="OpenBSD-m68k" ;;
+@@ -678,7 +679,7 @@
+ *-*-openbsd) OUT="OpenBSD" ;;
+ *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
+ *-*-osf) OUT="alphaold-cc" ;;
+- *-*-tru64) OUT="alpha-cc" ;;
++ *-*-tru64) OUT="alpha-gcc" ;;
+ *-*-OpenUNIX*)
+ if [ "$CC" = "gcc" ]; then
+ OUT="OpenUNIX-8-gcc"
+Index: crypto/bn/bn_prime.pl
+--- crypto/bn/bn_prime.pl.orig 2000-02-16 14:24:06 +0100
++++ crypto/bn/bn_prime.pl 2005-03-22 21:24:34 +0100
+@@ -11,7 +11,7 @@
+ $p+=2;
+ $s=int(sqrt($p));
+
+- for ($i=0; $primes[$i]<=$s; $i++)
++ for ($i=0; defined($primes[$i]) && $primes[$i]<=$s; $i++)
+ {
+ next loop if (($p%$primes[$i]) == 0);
+ }
+Index: doc/crypto/des_modes.pod
+--- doc/crypto/des_modes.pod.orig 2002-03-05 16:30:13 +0100
++++ doc/crypto/des_modes.pod 2005-03-22 21:24:34 +0100
+@@ -2,7 +2,7 @@
+
+ =head1 NAME
+
+-Modes of DES - the variants of DES and other crypto algorithms of OpenSSL
++des_modes - the variants of DES and other crypto algorithms of OpenSSL
+
+ =head1 DESCRIPTION
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssl/openssl.spec
============================================================================
$ cvs diff -u -r1.60 -r1.61 openssl.spec
--- openpkg-src/openssl/openssl.spec 13 Mar 2005 19:09:28 -0000 1.60
+++ openpkg-src/openssl/openssl.spec 22 Mar 2005 20:29:16 -0000 1.61
@@ -33,8 +33,8 @@
Class: CORE
Group: Cryptography
License: BSD-style
-Version: 0.9.7e
-Release: 20050313
+Version: 0.9.7f
+Release: 20050322
# package options
%option with_zlib no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
