pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/openssl Rename all remaining patch-?? files u...
details: https://anonhg.NetBSD.org/pkgsrc/rev/daf4464b8c10
branches: trunk
changeset: 632634:daf4464b8c10
user: he <he%pkgsrc.org@localhost>
date: Wed Apr 02 12:11:35 2014 +0000
description:
Rename all remaining patch-?? files using the newer naming convention.
Add a fix for CVE-2014-0076:
Fix for the attack described in the paper "Recovering OpenSSL
ECDSA Nonces Using the FLUSH+RELOAD Cache Side-channel Attack"
by Yuval Yarom and Naomi Benger. Details can be obtained from:
http://eprint.iacr.org/2014/140
Thanks to Yuval Yarom and Naomi Benger for discovering this
flaw and to Yuval Yarom for supplying a fix.
Fix from culled from
http://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=2198be3483259de374f91e57d247d0fc667aef29
Bump PKGREVISION.
diffstat:
security/openssl/Makefile | 3 +-
security/openssl/distinfo | 19 +-
security/openssl/patches/patch-Configure | 81 +++++++++++++
security/openssl/patches/patch-Makefile.org | 106 ++++++++++++++++++
security/openssl/patches/patch-Makefile.shared | 69 +++++++++++
security/openssl/patches/patch-aa | 84 --------------
security/openssl/patches/patch-ac | 81 -------------
security/openssl/patches/patch-ad | 32 -----
security/openssl/patches/patch-ae | 25 ----
security/openssl/patches/patch-af | 104 -----------------
security/openssl/patches/patch-ag | 67 -----------
security/openssl/patches/patch-ak | 22 ---
security/openssl/patches/patch-apps_Makefile | 34 +++++
security/openssl/patches/patch-config | 86 ++++++++++++++
security/openssl/patches/patch-crypto_bn_bn.h | 36 ++++++
security/openssl/patches/patch-crypto_bn_bn__lib.c | 62 ++++++++++
security/openssl/patches/patch-crypto_bn_bn__prime.pl | 22 +++
security/openssl/patches/patch-crypto_ec_ec2__mult.c | 58 +++++++++
security/openssl/patches/patch-tools_Makefile | 27 ++++
19 files changed, 594 insertions(+), 424 deletions(-)
diffs (truncated from 1111 to 300 lines):
diff -r e3fceef971c0 -r daf4464b8c10 security/openssl/Makefile
--- a/security/openssl/Makefile Wed Apr 02 12:05:00 2014 +0000
+++ b/security/openssl/Makefile Wed Apr 02 12:11:35 2014 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.185 2014/03/13 11:08:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.186 2014/04/02 12:11:35 he Exp $
DISTNAME= openssl-1.0.1f
+PKGREVISION= 1
MASTER_SITES= http://ftp.openssl.org/source/
SVR4_PKGNAME= ossl
CATEGORIES= security
diff -r e3fceef971c0 -r daf4464b8c10 security/openssl/distinfo
--- a/security/openssl/distinfo Wed Apr 02 12:05:00 2014 +0000
+++ b/security/openssl/distinfo Wed Apr 02 12:11:35 2014 +0000
@@ -1,16 +1,18 @@
-$NetBSD: distinfo,v 1.102 2014/01/14 21:51:00 bsiegert Exp $
+$NetBSD: distinfo,v 1.103 2014/04/02 12:11:35 he Exp $
SHA1 (openssl-1.0.1f.tar.gz) = 9ef09e97dfc9f14ac2c042f3b7e301098794fc0f
RMD160 (openssl-1.0.1f.tar.gz) = db8c07f8753fab2b76118d4c18175290356ed144
Size (openssl-1.0.1f.tar.gz) = 4509212 bytes
-SHA1 (patch-aa) = 4e759762074b73f7f0f4c24d5b56d1156a4bfe6e
-SHA1 (patch-ac) = ecdafa378e73bd2d6789c985ea28ef4ab2126aa6
-SHA1 (patch-ad) = bb86ac463fc4ab8b485df5f1a4fb9c13c1fc41c3
-SHA1 (patch-ae) = 7a58f1765a3761321dcc8dafc5fe2e33207be480
-SHA1 (patch-af) = f305134acfaa17e6a039630d916fbda4900adc85
-SHA1 (patch-ag) = b407200455878a8a151fc9b4f771fe17552d04fc
-SHA1 (patch-ak) = 049250b9bd42e6f155145703135dab39a7ec17e0
+SHA1 (patch-Configure) = ecdafa378e73bd2d6789c985ea28ef4ab2126aa6
+SHA1 (patch-Makefile.org) = 8780f8829b8a010d4283f00740c264a4dc15c7c6
+SHA1 (patch-Makefile.shared) = 1b47a1d3d95391217b15663d3558545780263fbb
+SHA1 (patch-apps_Makefile) = e575ccead86bb39205260b03c00a88fa4d21a906
+SHA1 (patch-config) = 3d33888b6ed4b9e3f6dfc2d3b6bb304e48d1360a
+SHA1 (patch-crypto_bn_bn.h) = e489574748de97c9f1c8724d599d1a345188c0d0
+SHA1 (patch-crypto_bn_bn__lib.c) = 8febe2b833f3adb2224aa723c29649660ff2681a
+SHA1 (patch-crypto_bn_bn__prime.pl) = 049250b9bd42e6f155145703135dab39a7ec17e0
SHA1 (patch-crypto_dso_dso__dlfcn.c) = d5d6ca9a517151357efecb6aa9a5f528a5014290
+SHA1 (patch-crypto_ec_ec2__mult.c) = 3df4d00049712722816c715a783f2cdc17e22983
SHA1 (patch-doc_apps_cms.pod) = 24792a0db2d8566e0f8b52833de300f538f6a92e
SHA1 (patch-doc_apps_smine.pod) = 277aee087892f867402ea73bae10383fe24d6e08
SHA1 (patch-doc_ssl_SSL__COMP__add__compression__method.pod) = f3fcbe0eae26ac8e24fe937e529ea0dba6ea1639
@@ -31,3 +33,4 @@
SHA1 (patch-doc_ssl_SSL__shutdown.pod) = 21682f3385a66ba8f0ebd11bb9bb3c6198352783
SHA1 (patch-doc_ssl_SSL__write.pod) = 67efd6d0de0a0db34c18c62e4a939c0ea49442ca
SHA1 (patch-engines_ccgost_Makefile) = 08999f0f40969883482ad9ffc1aa9959ed7d402c
+SHA1 (patch-tools_Makefile) = d67f3ea397674adbe3360e4df9c2e417dbcab56a
diff -r e3fceef971c0 -r daf4464b8c10 security/openssl/patches/patch-Configure
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssl/patches/patch-Configure Wed Apr 02 12:11:35 2014 +0000
@@ -0,0 +1,81 @@
+$NetBSD: patch-Configure,v 1.1 2014/04/02 12:11:35 he Exp $
+
+* Avoid -fast on Solaris, creates non-portable packages which depend on
+ host-specific CPU features.
+* Add GNU/kFreeBSD support.
+
+--- Configure.orig 2013-02-11 15:26:04.000000000 +0000
++++ Configure
+@@ -225,8 +225,8 @@ my %table=(
+ "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared
-static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
+
+ #### Solaris x86 with Sun C setups
+-"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)",
+-"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}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
++"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)",
++"solaris64-x86_64-cc","cc:-xO5 -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT
DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
+
+ #### SPARC Solaris with GNU C setups
+ "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -338,6 +338,7 @@ my %table=(
+ #
+ "osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
+ "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
++"tru64-alpha-gcc", "gcc:-O3::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-Wl,-msym:.so",
+ "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
+
+ ####
+@@ -422,6 +423,28 @@ my %table=(
+ "BSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2
BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "BSD-ia64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "BSD-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT
DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD","gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-alpha", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-arm", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-arm32", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-m68000", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-m68k", "gcc:-DTERMIOS -DB_ENDIAN -O2 -m68020-40 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-mipseb", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-mipsel", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-ns32k", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-powerpc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-sparc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"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:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-vax", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-x86-aout", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"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)",
++"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}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"Interix","gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared::-Wl,--image-base,0x5e000000:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"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)",
++"DragonFly-x86_64", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT
DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"GNU/kFreeBSD-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIOS -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT
DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"GNU/kFreeBSD-i386", "gcc:-DL_ENDIAN -DTERMIOS -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
+
+ "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)",
+
+@@ -865,13 +888,13 @@ PROCESS_ARGS:
+ # The check for the option is there so scripts aren't
+ # broken
+ }
+- elsif (/^[-+]/)
++ elsif (/^[-+\/]/)
+ {
+ if (/^-[lL](.*)$/ or /^-Wl,/)
+ {
+ $libs.=$_." ";
+ }
+- elsif (/^-[^-]/ or /^\+/)
++ elsif (/^-[^-]/ or /^\+/ or /^\//)
+ {
+ $_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
+ $flags.=$_." ";
+@@ -1674,7 +1697,7 @@ while (<IN>)
+ elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
+ {
+ my $sotmp = $1;
+- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
++ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
+ }
+ elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
+ {
diff -r e3fceef971c0 -r daf4464b8c10 security/openssl/patches/patch-Makefile.org
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssl/patches/patch-Makefile.org Wed Apr 02 12:11:35 2014 +0000
@@ -0,0 +1,106 @@
+$NetBSD: patch-Makefile.org,v 1.1 2014/04/02 12:11:35 he Exp $
+
+Adjust build procedure.
+
+--- Makefile.org.orig 2013-02-11 15:26:04.000000000 +0000
++++ Makefile.org
+@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
+
+ # Do not edit this manually. Use Configure --openssldir=DIR do change this!
+ OPENSSLDIR=/usr/local/ssl
++EXAMPLEDIR=$(INSTALLTOP)/share/examples/openssl
+
+ # NO_IDEA - Define to build without the IDEA algorithm
+ # NO_RC4 - Define to build without the RC4 algorithm
+@@ -157,7 +158,7 @@ TESTS = alltests
+
+ MAKEFILE= Makefile
+
+-MANDIR=$(OPENSSLDIR)/man
++MANDIR=$(INSTALLTOP)/$(PKGMANDIR)
+ MAN1=1
+ MAN3=3
+ MANSUFFIX=
+@@ -174,6 +175,7 @@ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
+ SHARED_SSL=libssl$(SHLIB_EXT)
+ SHARED_LIBS=
+ SHARED_LIBS_LINK_EXTS=
++LIBRPATH=$(INSTALLTOP)/lib
+ SHARED_LDFLAGS=
+
+ GENERAL= Makefile
+@@ -537,7 +539,7 @@ dist:
+ dist_pem_h:
+ (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+
+-install: all install_docs install_sw
++install: install_docs install_sw
+
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+@@ -642,41 +644,56 @@ install_docs:
+ @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ here="`pwd`"; \
+ filecase=; \
+- if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
+- filecase=-i; \
+- fi; \
+ set -e; for i in doc/apps/*.pod; do \
+ fn=`basename $$i .pod`; \
+ sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
+- echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
++ case "$$fn" in \
++ CA.pl|openssl) ofn="$$fn" ;; \
++ *) ofn="openssl_$$fn" ;; \
++ esac; \
++ echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
+ (cd `$(PERL) util/dirname.pl $$i`; \
+ sh -c "$$pod2man \
+ --section=$$sec --center=OpenSSL \
+ --release=$(VERSION) `basename $$i`") \
+- > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
++ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
+ $(PERL) util/extract-names.pl < $$i | \
+ (grep -v $$filecase "^$$fn\$$"; true) | \
+ (grep -v "[ ]"; true) | \
+ (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
+ while read n; do \
+- PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
++ case "$$n" in \
++ CA.pl|openssl) on="$$n" ;; \
++ *) on="openssl_$$n" ;; \
++ esac; \
++ PLATFORM=$(PLATFORM) $$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
+ done); \
+ done; \
+ set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+ fn=`basename $$i .pod`; \
+ sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
+- echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
++ case "$$fn" in \
++ ui*) ofn="openssl_$$fn" ;; \
++ [A-Z]*|*_*) ofn="$$fn" ;; \
++ *) ofn="openssl_$$fn" ;; \
++ esac; \
++ echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
+ (cd `$(PERL) util/dirname.pl $$i`; \
+ sh -c "$$pod2man \
+ --section=$$sec --center=OpenSSL \
+ --release=$(VERSION) `basename $$i`") \
+- > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
++ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
+ $(PERL) util/extract-names.pl < $$i | \
+ (grep -v $$filecase "^$$fn\$$"; true) | \
+ (grep -v "[ ]"; true) | \
+ (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
+ while read n; do \
+- PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
++ case "$$n" in \
++ ui*) on="openssl_$$n" ;; \
++ [A-Z]*|*_*) on="$$n" ;; \
++ *) on="openssl_$$n" ;; \
++ esac; \
++ PLATFORM=$(PLATFORM) $$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
+ done); \
+ done
+
diff -r e3fceef971c0 -r daf4464b8c10 security/openssl/patches/patch-Makefile.shared
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssl/patches/patch-Makefile.shared Wed Apr 02 12:11:35 2014 +0000
@@ -0,0 +1,69 @@
+$NetBSD: patch-Makefile.shared,v 1.1 2014/04/02 12:11:35 he Exp $
+
+Adjust build procedure.
+
+--- Makefile.shared.orig 2010-08-21 11:37:17.000000000 +0000
++++ Makefile.shared
+@@ -315,6 +315,11 @@ link_o.alpha-osf1:
+ @ if $(DETECT_GNU_LD); then \
+ $(DO_GNU_SO); \
+ else \
++ if ($(CC) -v 2>&1 | grep gcc) > /dev/null; then \
++ WL="-Wl,"; DELIM=","; \
++ else \
++ WL=""; DELIM=" "; \
++ fi; \
+ SHLIB=lib$(LIBNAME).so; \
+ SHLIB_SUFFIX=; \
+ SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
+@@ -324,11 +329,11 @@ link_o.alpha-osf1:
+ SHLIB_HIST="$(LIBVERSION)"; \
+ fi; \
+ SHLIB_SOVER=; \
+- ALLSYMSFLAGS='-all'; \
+- NOALLSYMSFLAGS='-none'; \
++ ALLSYMSFLAGS="$${WL}-all"; \
++ NOALLSYMSFLAGS="$${WL}-none"; \
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
+ if [ -n "$$SHLIB_HIST" ]; then \
+- SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
++ SHAREDFLAGS="$$SHAREDFLAGS $${WL}-set_version$${DELIM}$$SHLIB_HIST"; \
+ fi; \
+ fi; \
+ $(LINK_SO_O)
+@@ -336,6 +341,11 @@ link_a.alpha-osf1:
+ @ if $(DETECT_GNU_LD); then \
+ $(DO_GNU_SO); \
+ else \
++ if ($(CC) -v 2>&1 | grep gcc) > /dev/null; then \
++ WL="-Wl,"; DELIM=","; \
++ else \
++ WL=""; DELIM=" "; \
++ fi; \
+ SHLIB=lib$(LIBNAME).so; \
+ SHLIB_SUFFIX=; \
+ SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
+@@ -345,11 +355,11 @@ link_a.alpha-osf1:
+ SHLIB_HIST="$(LIBVERSION)"; \
+ fi; \
+ SHLIB_SOVER=; \
+- ALLSYMSFLAGS='-all'; \
+- NOALLSYMSFLAGS='-none'; \
++ ALLSYMSFLAGS="$${WL}-all"; \
++ NOALLSYMSFLAGS="$${WL}-none"; \
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
Home |
Main Index |
Thread Index |
Old Index