diff options
Diffstat (limited to 'security/openssl/patches/patch-af')
| -rw-r--r-- | security/openssl/patches/patch-af | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af index b209050cfcc..c8192041cf8 100644 --- a/security/openssl/patches/patch-af +++ b/security/openssl/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.23 2010/01/15 04:55:30 taca Exp $ +$NetBSD: patch-af,v 1.24 2010/02/26 03:15:14 taca Exp $ ---- Makefile.org.orig 2009-03-03 22:40:29.000000000 +0000 +--- Makefile.org.orig 2010-01-27 16:06:36.000000000 +0000 +++ Makefile.org @@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl @@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.23 2010/01/15 04:55:30 taca Exp $ # NO_IDEA - Define to build without the IDEA algorithm # NO_RC4 - Define to build without the RC4 algorithm -@@ -131,8 +132,8 @@ FIPSCANLIB= +@@ -132,8 +133,8 @@ FIPSCANLIB= BASEADDR= @@ -21,7 +21,7 @@ $NetBSD: patch-af,v 1.23 2010/01/15 04:55:30 taca Exp $ # dirs in crypto to build SDIRS= \ -@@ -152,7 +153,7 @@ TESTS = alltests +@@ -153,7 +154,7 @@ TESTS = alltests MAKEFILE= Makefile @@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.23 2010/01/15 04:55:30 taca Exp $ MAN1=1 MAN3=3 MANSUFFIX= -@@ -168,6 +169,7 @@ SHARED_SSL=libssl$(SHLIB_EXT) +@@ -169,6 +170,7 @@ SHARED_SSL=libssl$(SHLIB_EXT) SHARED_FIPS= SHARED_LIBS= SHARED_LIBS_LINK_EXTS= @@ -38,16 +38,7 @@ $NetBSD: patch-af,v 1.23 2010/01/15 04:55:30 taca Exp $ SHARED_LDFLAGS= GENERAL= Makefile -@@ -200,7 +202,7 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESS - CC='${CC}' CFLAG='${CFLAG}' \ - AS='${CC}' ASFLAG='${CFLAG} -c' \ - AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ -- SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \ -+ SDIRS='${SDIRS}' LIBRPATH='${LIBRPATH}' \ - INSTALL_PREFIX='${INSTALL_PREFIX}' \ - INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' \ - MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \ -@@ -611,7 +613,7 @@ dist: +@@ -615,7 +617,7 @@ dist: dist_pem_h: (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) @@ -56,18 +47,7 @@ $NetBSD: patch-af,v 1.23 2010/01/15 04:55:30 taca Exp $ install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ -@@ -619,9 +621,7 @@ install_sw: - $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \ - $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ - $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ -- $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ -- $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ -- $(INSTALL_PREFIX)$(OPENSSLDIR)/private -+ $(INSTALL_PREFIX)$(EXAMPLEDIR) - @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ -@@ -691,35 +691,53 @@ install_docs: +@@ -695,35 +697,53 @@ install_docs: set -e; for i in doc/apps/*.pod; do \ fn=`basename $$i .pod`; \ sec=`$(PERL) util/extract-section.pl 1 < $$i`; \ |