Fri Feb 26 03:15:14 2010 UTC ()
Update openssl to 0.9.8m.

   The OpenSSL project team is pleased to announce the release of
   version 0.9.8m of our open source toolkit for SSL/TLS. This new
   OpenSSL version is a security and bugfix release which implements
   RFC5746 to address renegotiation vulnerabilities mentioned in
   CVE-2009-3555.  For a complete list of changes,
   please see http://www.openssl.org/source/exp/CHANGES.


(taca)
diff -r1.143 -r1.144 pkgsrc/security/openssl/Makefile
diff -r1.71 -r1.72 pkgsrc/security/openssl/distinfo
diff -r1.22 -r1.23 pkgsrc/security/openssl/patches/patch-aa
diff -r1.37 -r1.38 pkgsrc/security/openssl/patches/patch-ac
diff -r1.23 -r1.24 pkgsrc/security/openssl/patches/patch-af
diff -r1.1 -r0 pkgsrc/security/openssl/patches/patch-ax
diff -r1.1 -r0 pkgsrc/security/openssl/patches/patch-ay
diff -r1.1 -r0 pkgsrc/security/openssl/patches/patch-az
diff -r1.1 -r0 pkgsrc/security/openssl/patches/patch-ba
diff -r1.1 -r0 pkgsrc/security/openssl/patches/patch-bb
cvs diff -r1.143 -r1.144 pkgsrc/security/openssl/Makefile (expand / switch to unified diff)

--- pkgsrc/security/openssl/Makefile 2010/01/22 03:35:10 1.143
+++ pkgsrc/security/openssl/Makefile 2010/02/26 03:15:13 1.144
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.143 2010/01/22 03:35:10 taca Exp $ 1# $NetBSD: Makefile,v 1.144 2010/02/26 03:15:13 taca Exp $
2 2
3OPENSSL_SNAPSHOT?= # empty 3OPENSSL_SNAPSHOT?= # empty
4OPENSSL_STABLE?= # empty 4OPENSSL_STABLE?= # empty
5OPENSSL_VERS?= 0.9.8l 5OPENSSL_VERS?= 0.9.8m
6PKGREVISION= 1 
7 6
8.if empty(OPENSSL_SNAPSHOT) 7.if empty(OPENSSL_SNAPSHOT)
9DISTNAME= openssl-${OPENSSL_VERS} 8DISTNAME= openssl-${OPENSSL_VERS}
10MASTER_SITES= ftp://ftp.openssl.org/source/ \ 9MASTER_SITES= ftp://ftp.openssl.org/source/ \
11 ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/ \ 10 ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/ \
12 ftp://sunsite.uio.no/pub/security/openssl/source/ 11 ftp://sunsite.uio.no/pub/security/openssl/source/
13.else 12.else
14. if !empty(OPENSSL_STABLE:M[yY][eE][sS]) 13. if !empty(OPENSSL_STABLE:M[yY][eE][sS])
15DISTNAME= openssl-${OPENSSL_VERS:C/[a-z]$//}-stable-SNAP-${OPENSSL_SNAPSHOT} 14DISTNAME= openssl-${OPENSSL_VERS:C/[a-z]$//}-stable-SNAP-${OPENSSL_SNAPSHOT}
16PKGNAME= openssl-${OPENSSL_VERS}beta${OPENSSL_SNAPSHOT} 15PKGNAME= openssl-${OPENSSL_VERS}beta${OPENSSL_SNAPSHOT}
17MASTER_SITES= ftp://ftp.openssl.org/snapshot/ 16MASTER_SITES= ftp://ftp.openssl.org/snapshot/
18. else 17. else
19DISTNAME= openssl-SNAP-${OPENSSL_SNAPSHOT} 18DISTNAME= openssl-SNAP-${OPENSSL_SNAPSHOT}
@@ -114,18 +113,20 @@ PLIST_SHLIB= ${PLIST_OPSYS} @@ -114,18 +113,20 @@ PLIST_SHLIB= ${PLIST_OPSYS}
114.else 113.else
115PLIST_SHLIB= ${PKGDIR}/PLIST.shlib 114PLIST_SHLIB= ${PKGDIR}/PLIST.shlib
116.endif 115.endif
117PLIST_SRC= ${PLIST_SHLIB} 116PLIST_SRC= ${PLIST_SHLIB}
118PLIST_SRC+= ${PKGDIR}/PLIST.common 117PLIST_SRC+= ${PKGDIR}/PLIST.common
119PLIST_SUBST+= SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//} 118PLIST_SUBST+= SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//}
120PLIST_SUBST+= SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//} 119PLIST_SUBST+= SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//}
121 120
122PKG_SYSCONFSUBDIR= openssl 121PKG_SYSCONFSUBDIR= openssl
123CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \ 122CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \
124 ${PKG_SYSCONFDIR}/openssl.cnf 123 ${PKG_SYSCONFDIR}/openssl.cnf
125OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private 124OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private
126 125
 126INSTALLATION_DIRS+= share/examples/openssl
 127
127# Fix the path to perl in various scripts. 128# Fix the path to perl in various scripts.
128pre-configure: 129pre-configure:
129 cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5} 130 cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5}
130 131
131.include "../../mk/bsd.pkg.mk" 132.include "../../mk/bsd.pkg.mk"
cvs diff -r1.71 -r1.72 pkgsrc/security/openssl/distinfo (expand / switch to unified diff)

--- pkgsrc/security/openssl/distinfo 2010/01/22 03:35:10 1.71
+++ pkgsrc/security/openssl/distinfo 2010/02/26 03:15:13 1.72
@@ -1,18 +1,13 @@ @@ -1,18 +1,13 @@
1$NetBSD: distinfo,v 1.71 2010/01/22 03:35:10 taca Exp $ 1$NetBSD: distinfo,v 1.72 2010/02/26 03:15:13 taca Exp $
2 2
3SHA1 (openssl-0.9.8l.tar.gz) = d3fb6ec89532ab40646b65af179bb1770f7ca28f 3SHA1 (openssl-0.9.8m.tar.gz) = 2511c709a47f34d5fa6cd1a1c9cb1699bdffa912
4RMD160 (openssl-0.9.8l.tar.gz) = 9de81ec2583edcba729e62d50fd22c0a98a52903 4RMD160 (openssl-0.9.8m.tar.gz) = 0296af151993008526b4f2b3a6810e20c4ad3759
5Size (openssl-0.9.8l.tar.gz) = 4179422 bytes 5Size (openssl-0.9.8m.tar.gz) = 3767604 bytes
6SHA1 (patch-aa) = cb6942b0be960151c185e89af1e09050a6b18dff 6SHA1 (patch-aa) = b3899aebeea9bd9ead58771ca52ecec049589a55
7SHA1 (patch-ac) = 3f62d36e18c2b8f587322dac5b329207704f40ad 7SHA1 (patch-ac) = 6ff4a20440666f5c520837e10547091e1bee2208
8SHA1 (patch-ad) = bb86ac463fc4ab8b485df5f1a4fb9c13c1fc41c3 8SHA1 (patch-ad) = bb86ac463fc4ab8b485df5f1a4fb9c13c1fc41c3
9SHA1 (patch-ae) = 7a58f1765a3761321dcc8dafc5fe2e33207be480 9SHA1 (patch-ae) = 7a58f1765a3761321dcc8dafc5fe2e33207be480
10SHA1 (patch-af) = 81263ce9dc0e89293ac1fc298e1178253a0b0b1b 10SHA1 (patch-af) = 2610930b6b06397fa2e3955b3244c02193f5b7a6
11SHA1 (patch-ag) = 5f12c72b85e4b6c6a79dfcf87055e9e029fbd8c8 11SHA1 (patch-ag) = 5f12c72b85e4b6c6a79dfcf87055e9e029fbd8c8
12SHA1 (patch-ak) = 049250b9bd42e6f155145703135dab39a7ec17e0 12SHA1 (patch-ak) = 049250b9bd42e6f155145703135dab39a7ec17e0
13SHA1 (patch-al) = 076a606352bdeaeea1cc64f16be2ac1325882302 13SHA1 (patch-al) = 076a606352bdeaeea1cc64f16be2ac1325882302
14SHA1 (patch-ax) = ef0c657de2aa42baa365b9857583d1c55d0e7d1b 
15SHA1 (patch-ay) = 6d5de155e5508cd2237387626c8e1ff7ee603f8e 
16SHA1 (patch-az) = aa7ef7192d56979ba09aa1dab8a2cdf9868f9c4a 
17SHA1 (patch-ba) = b8ab55c0c6ab4b995cae18517609720f0803e11f 
18SHA1 (patch-bb) = a4092a65f52d3c9c85c9015901b2a5eeb11d0955 
cvs diff -r1.22 -r1.23 pkgsrc/security/openssl/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/openssl/patches/Attic/patch-aa 2010/01/15 04:55:30 1.22
+++ pkgsrc/security/openssl/patches/Attic/patch-aa 2010/02/26 03:15:13 1.23
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-aa,v 1.22 2010/01/15 04:55:30 taca Exp $ 1$NetBSD: patch-aa,v 1.23 2010/02/26 03:15:13 taca Exp $
2 2
3--- config.orig 2009-02-16 08:43:41.000000000 +0000 3--- config.orig 2009-10-15 12:58:00.000000000 +0000
4+++ config 4+++ config
5@@ -49,6 +49,7 @@ done 5@@ -49,6 +49,7 @@ done
6 # First get uname entries that we use below 6 # First get uname entries that we use below
7  7
8 MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown" 8 [ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
9+MACHINE_ARCH=`(uname -p) 2>/dev/null` || MACHINE_ARCH="unknown" 9+[ "$MACHINE_ARCH" ] || MACHINE_ARCH=`(uname -p) 2>/dev/null` || MACHINE_ARCH="unknown"
10 RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown" 10 [ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
11 SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown" 11 [ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown"
12 VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" 12 [ "$BUILD" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
13@@ -154,6 +155,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ 13@@ -154,6 +155,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
14 echo "mips4-sgi-irix64"; exit 0 14 echo "mips4-sgi-irix64"; exit 0
15 ;; 15 ;;
16  16
17+ Interix:*) 17+ Interix:*)
18+ echo "i386-pc-interix"; exit 0 18+ echo "i386-pc-interix"; exit 0
19+ ;; 19+ ;;
20+ 20+
21 Linux:[2-9].*) 21 Linux:[2-9].*)
22 echo "${MACHINE}-whatever-linux2"; exit 0 22 echo "${MACHINE}-whatever-linux2"; exit 0
23 ;; 23 ;;
24@@ -210,12 +215,16 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ 24@@ -210,12 +215,16 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
25 echo "${MACHINE}-whatever-freebsd"; exit 0 25 echo "${MACHINE}-whatever-freebsd"; exit 0
cvs diff -r1.37 -r1.38 pkgsrc/security/openssl/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/security/openssl/patches/Attic/patch-ac 2010/01/15 04:55:30 1.37
+++ pkgsrc/security/openssl/patches/Attic/patch-ac 2010/02/26 03:15:13 1.38
@@ -1,67 +1,67 @@ @@ -1,67 +1,67 @@
1$NetBSD: patch-ac,v 1.37 2010/01/15 04:55:30 taca Exp $ 1$NetBSD: patch-ac,v 1.38 2010/02/26 03:15:13 taca Exp $
2 2
3--- Configure.orig 2009-11-05 12:07:06.000000000 +0000 3--- Configure.orig 2009-11-09 14:14:26.000000000 +0000
4+++ Configure 4+++ Configure
5@@ -206,7 +206,7 @@ my %table=( 5@@ -212,7 +212,7 @@ my %table=(
6 "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 6 "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
7  7
8 #### Solaris x86 with Sun C setups 8 #### Solaris x86 with Sun C setups
9-"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 9-"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
10+"solaris-x86-cc","cc:-xO5 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 10+"solaris-x86-cc","cc:-xO5 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
11 "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 11 "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
12  12
13 #### SPARC Solaris with GNU C setups 13 #### SPARC Solaris with GNU C setups
14@@ -318,6 +318,7 @@ my %table=( 14@@ -324,6 +324,7 @@ my %table=(
15 # 15 #
16 "osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${no_asm}:dlfcn:alpha-osf1-shared:::.so", 16 "osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
17 "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so", 17 "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
18+"tru64-alpha-gcc", "gcc:-O3::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-Wl,-msym:.so", 18+"tru64-alpha-gcc", "gcc:-O3::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-Wl,-msym:.so",
19 "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-msym:.so", 19 "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
20  20
21 #### 21 ####
22@@ -380,6 +381,25 @@ my %table=( 22@@ -386,6 +387,25 @@ my %table=(
23 "BSD-ia64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 23 "BSD-ia64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
24 "BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 24 "BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
25  25
26+"NetBSD","gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 26+"NetBSD","gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
27+"NetBSD-alpha", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 27+"NetBSD-alpha", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
28+"NetBSD-arm", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 28+"NetBSD-arm", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
29+"NetBSD-arm32", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 29+"NetBSD-arm32", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
30+"NetBSD-m68000", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 30+"NetBSD-m68000", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
31+"NetBSD-m68k", "gcc:-DTERMIOS -DB_ENDIAN -O2 -m68020-40 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 31+"NetBSD-m68k", "gcc:-DTERMIOS -DB_ENDIAN -O2 -m68020-40 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
32+"NetBSD-mipseb", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 32+"NetBSD-mipseb", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
33+"NetBSD-mipsel", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 33+"NetBSD-mipsel", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
34+"NetBSD-ns32k", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 34+"NetBSD-ns32k", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
35+"NetBSD-powerpc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 35+"NetBSD-powerpc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
36+"NetBSD-sparc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 36+"NetBSD-sparc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
37+"NetBSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::(unknown):ULTRASPARC::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 37+"NetBSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::(unknown):ULTRASPARC::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
38+"NetBSD-vax", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 38+"NetBSD-vax", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
39+"NetBSD-x86-aout", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 39+"NetBSD-x86-aout", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
40+"NetBSD-x86-elf", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 40+"NetBSD-x86-elf", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
41+"NetBSD-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -DMD32_REG_T=int -O2::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 41+"NetBSD-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -DMD32_REG_T=int -O2::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
42+"Interix","gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared::-Wl,--image-base,0x5e000000:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 42+"Interix","gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared::-Wl,--image-base,0x5e000000:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
43+"DragonFly-i386", "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)", 43+"DragonFly-i386", "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)",
44+ 44+
45 "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 45 "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
46  46
47 "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", 47 "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
48@@ -808,6 +828,10 @@ PROCESS_ARGS: 48@@ -821,6 +841,10 @@ PROCESS_ARGS:
49 { 49 {
50 $libs.=$_." "; 50 $libs.=$_." ";
51 } 51 }
52+ elsif (/^-Wl,(.*)$/) 52+ elsif (/^-Wl,(.*)$/)
53+ { 53+ {
54+ $libs.=$_." "; 54+ $libs.=$_." ";
55+ } 55+ }
56 elsif (/^-[^-]/ or /^\+/) 56 elsif (/^-[^-]/ or /^\+/)
57 { 57 {
58 $flags.=$_." "; 58 $flags.=$_." ";
59@@ -1523,7 +1547,7 @@ while (<IN>) 59@@ -1566,7 +1590,7 @@ while (<IN>)
60 elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) 60 elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
61 { 61 {
62 my $sotmp = $1; 62 my $sotmp = $1;
63- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; 63- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
64+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/; 64+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
65 } 65 }
66 elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) 66 elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
67 { 67 {
cvs diff -r1.23 -r1.24 pkgsrc/security/openssl/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/security/openssl/patches/Attic/patch-af 2010/01/15 04:55:30 1.23
+++ pkgsrc/security/openssl/patches/Attic/patch-af 2010/02/26 03:15:14 1.24
@@ -1,83 +1,63 @@ @@ -1,83 +1,63 @@
1$NetBSD: patch-af,v 1.23 2010/01/15 04:55:30 taca Exp $ 1$NetBSD: patch-af,v 1.24 2010/02/26 03:15:14 taca Exp $
2 2
3--- Makefile.org.orig 2009-03-03 22:40:29.000000000 +0000 3--- Makefile.org.orig 2010-01-27 16:06:36.000000000 +0000
4+++ Makefile.org 4+++ Makefile.org
5@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl 5@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
6  6
7 # Do not edit this manually. Use Configure --openssldir=DIR do change this! 7 # Do not edit this manually. Use Configure --openssldir=DIR do change this!
8 OPENSSLDIR=/usr/local/ssl 8 OPENSSLDIR=/usr/local/ssl
9+EXAMPLEDIR=$(INSTALLTOP)/share/examples/openssl 9+EXAMPLEDIR=$(INSTALLTOP)/share/examples/openssl
10  10
11 # NO_IDEA - Define to build without the IDEA algorithm 11 # NO_IDEA - Define to build without the IDEA algorithm
12 # NO_RC4 - Define to build without the RC4 algorithm 12 # NO_RC4 - Define to build without the RC4 algorithm
13@@ -131,8 +132,8 @@ FIPSCANLIB= 13@@ -132,8 +133,8 @@ FIPSCANLIB=
14  14
15 BASEADDR= 15 BASEADDR=
16  16
17-DIRS= crypto fips ssl engines apps test tools 17-DIRS= crypto fips ssl engines apps test tools
18-SHLIBDIRS= crypto ssl fips 18-SHLIBDIRS= crypto ssl fips
19+DIRS= crypto ssl engines apps test tools # fips 19+DIRS= crypto ssl engines apps test tools # fips
20+SHLIBDIRS= crypto ssl # fips 20+SHLIBDIRS= crypto ssl # fips
21  21
22 # dirs in crypto to build 22 # dirs in crypto to build
23 SDIRS= \ 23 SDIRS= \
24@@ -152,7 +153,7 @@ TESTS = alltests 24@@ -153,7 +154,7 @@ TESTS = alltests
25  25
26 MAKEFILE= Makefile 26 MAKEFILE= Makefile
27  27
28-MANDIR=$(OPENSSLDIR)/man 28-MANDIR=$(OPENSSLDIR)/man
29+MANDIR=$(INSTALLTOP)/$(PKGMANDIR) 29+MANDIR=$(INSTALLTOP)/$(PKGMANDIR)
30 MAN1=1 30 MAN1=1
31 MAN3=3 31 MAN3=3
32 MANSUFFIX= 32 MANSUFFIX=
33@@ -168,6 +169,7 @@ SHARED_SSL=libssl$(SHLIB_EXT) 33@@ -169,6 +170,7 @@ SHARED_SSL=libssl$(SHLIB_EXT)
34 SHARED_FIPS= 34 SHARED_FIPS=
35 SHARED_LIBS= 35 SHARED_LIBS=
36 SHARED_LIBS_LINK_EXTS= 36 SHARED_LIBS_LINK_EXTS=
37+LIBRPATH=$(INSTALLTOP)/lib 37+LIBRPATH=$(INSTALLTOP)/lib
38 SHARED_LDFLAGS= 38 SHARED_LDFLAGS=
39  39
40 GENERAL= Makefile 40 GENERAL= Makefile
41@@ -200,7 +202,7 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESS 41@@ -615,7 +617,7 @@ dist:
42 CC='${CC}' CFLAG='${CFLAG}' \ 
43 AS='${CC}' ASFLAG='${CFLAG} -c' \ 
44 AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ 
45- SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \ 
46+ SDIRS='${SDIRS}' LIBRPATH='${LIBRPATH}' \ 
47 INSTALL_PREFIX='${INSTALL_PREFIX}' \ 
48 INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' \ 
49 MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \ 
50@@ -611,7 +613,7 @@ dist:  
51 dist_pem_h: 42 dist_pem_h:
52 (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 43 (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
53  44
54-install: all install_docs install_sw 45-install: all install_docs install_sw
55+install: install_docs install_sw 46+install: install_docs install_sw
56  47
57 install_sw: 48 install_sw:
58 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ 49 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
59@@ -619,9 +621,7 @@ install_sw: 50@@ -695,35 +697,53 @@ install_docs:
60 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \ 
61 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ 
62 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ 
63- $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ 
64- $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ 
65- $(INSTALL_PREFIX)$(OPENSSLDIR)/private 
66+ $(INSTALL_PREFIX)$(EXAMPLEDIR) 
67 @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ 
68 do \ 
69 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 
70@@ -691,35 +691,53 @@ install_docs: 
71 set -e; for i in doc/apps/*.pod; do \ 51 set -e; for i in doc/apps/*.pod; do \
72 fn=`basename $$i .pod`; \ 52 fn=`basename $$i .pod`; \
73 sec=`$(PERL) util/extract-section.pl 1 < $$i`; \ 53 sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
74- echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ 54- echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
75+ case "$$fn" in \ 55+ case "$$fn" in \
76+ CA.pl|openssl) ofn="$$fn" ;; \ 56+ CA.pl|openssl) ofn="$$fn" ;; \
77+ *) ofn="openssl_$$fn" ;; \ 57+ *) ofn="openssl_$$fn" ;; \
78+ esac; \ 58+ esac; \
79+ echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \ 59+ echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
80 (cd `$(PERL) util/dirname.pl $$i`; \ 60 (cd `$(PERL) util/dirname.pl $$i`; \
81 sh -c "$$pod2man \ 61 sh -c "$$pod2man \
82 --section=$$sec --center=OpenSSL \ 62 --section=$$sec --center=OpenSSL \
83 --release=$(VERSION) `basename $$i`") \ 63 --release=$(VERSION) `basename $$i`") \
File Deleted: pkgsrc/security/openssl/patches/Attic/patch-ax
File Deleted: pkgsrc/security/openssl/patches/Attic/patch-ay
File Deleted: pkgsrc/security/openssl/patches/Attic/patch-az
File Deleted: pkgsrc/security/openssl/patches/Attic/patch-ba
File Deleted: pkgsrc/security/openssl/patches/Attic/patch-bb