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: 06-Jul-2005 14:59:08
Branch: HEAD Handle: 2005070613590800
Modified files:
openpkg-src/openssl openssl.patch openssl.spec
Log:
upgrading package: openssl 0.9.7g -> 0.9.8
Summary:
Revision Changes Path
1.21 +13 -85 openpkg-src/openssl/openssl.patch
1.65 +3 -2 openpkg-src/openssl/openssl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssl/openssl.patch
============================================================================
$ cvs diff -u -r1.20 -r1.21 openssl.patch
--- openpkg-src/openssl/openssl.patch 6 May 2005 20:32:47 -0000 1.20
+++ openpkg-src/openssl/openssl.patch 6 Jul 2005 12:59:08 -0000 1.21
@@ -1,78 +1,18 @@
-Index: Configure
---- 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)",
-+"NetBSD-alpha", "gcc:-DTERMIOS -O2
-Wall::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:SIXTY_FOUR_BIT_LONG DES_INT DES_PTR
DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-arm", "gcc:-DTERMIOS -O2 -Wall
-DL_ENDIAN::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-arm32", "gcc:-DTERMIOS -O2 -Wall
-DL_ENDIAN::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-m68000", "gcc:-DTERMIOS -O2 -Wall
-DB_ENDIAN::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR
RC4_INDEX::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-m68k", "gcc:-DTERMIOS -O2 -m68020-40 -Wall
-DB_ENDIAN::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR
RC4_INDEX::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-mipseb", "gcc:-DTERMIOS -O2 -Wall
-DB_ENDIAN::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-mipsel", "gcc:-DTERMIOS -O2 -Wall
-DL_ENDIAN::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-ns32k", "gcc:-DTERMIOS -O2 -Wall
-DL_ENDIAN::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-powerpc", "gcc:-DTERMIOS -O2 -Wall
-DB_ENDIAN::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-sparc", "gcc:-DTERMIOS -O2 -Wall
-DB_ENDIAN::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-sparc64", "gcc:-DTERMIOS -O2
-Wall::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:SIXTY_FOUR_BIT_LONG DES_INT
DES_RISC1::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-vax", "gcc:-DTERMIOS -O2 -Wall
-DL_ENDIAN::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX
DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-x86", "gcc:-DTERMIOS -O2
-Wall::(unknown)::-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486
-Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG
${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3
-fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE
-D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2
BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O
-fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK
RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-amd64","gcc:-DL_ENDIAN -DTERMIOS -O
-fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK
RC4_CHAR:asm/x86_64-gcc.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "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: 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);
- }
+--- config.orig 2005-06-26 20:10:20 +0200
++++ config 2005-07-06 08:53:56 +0200
+@@ -471,6 +471,7 @@
+
+ if [ "${SYSTEM}" = "AIX" ]; then # favor vendor cc over gcc
+ (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
++ (gcc) 2>&1 | grep -iv "not found" > /dev/null && CC=gcc
+ fi
+
+ CCVER=${CCVER:-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 @@
+--- doc/crypto/des_modes.pod.orig 2004-11-25 18:47:30 +0100
++++ doc/crypto/des_modes.pod 2005-07-06 08:54:01 +0200
+@@ -4,7 +4,7 @@
=head1 NAME
@@ -81,15 +21,3 @@
=head1 DESCRIPTION
-Index: crypto/conf/conf_def.c
---- crypto/conf/conf_def.c 6 May 2004 09:31:31 -0000 1.12.2.6
-+++ crypto/conf/conf_def.c 6 May 2005 20:27:50 -0000
-@@ -629,7 +629,7 @@
-
CONFerr(CONF_F_STR_COPY,CONF_R_VARIABLE_HAS_NO_VALUE);
- goto err;
- }
-- BUF_MEM_grow_clean(buf,(strlen(p)+len-(e-from)));
-+
BUF_MEM_grow_clean(buf,(strlen(p)+buf->length-(e-from)));
- while (*p)
- buf->data[to++]= *(p++);
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssl/openssl.spec
============================================================================
$ cvs diff -u -r1.64 -r1.65 openssl.spec
--- openpkg-src/openssl/openssl.spec 6 May 2005 20:32:47 -0000 1.64
+++ openpkg-src/openssl/openssl.spec 6 Jul 2005 12:59:08 -0000 1.65
@@ -32,8 +32,8 @@
Class: CORE
Group: Cryptography
License: BSD-style
-Version: 0.9.7g
-Release: 20050506
+Version: 0.9.8
+Release: 20050706
# package options
%option with_zlib no
@@ -114,6 +114,7 @@
strip $RPM_BUILD_ROOT%{l_prefix}/bin/openssl >/dev/null 2>&1 || true
( cd $RPM_BUILD_ROOT%{l_prefix}
rm -f bin/c_rehash
+ rmdir lib/engines
rm -rf etc/openssl/private
rm -rf etc/openssl/certs
rm -rf etc/openssl/misc
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
