diff options
| -rw-r--r-- | security/openssl/Makefile | 1 | ||||
| -rw-r--r-- | security/openssl/files/patch-Makefile.org | 19 | ||||
| -rw-r--r-- | security/openssl/pkg-plist | 3 |
3 files changed, 17 insertions, 6 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index e95667836cba..33cbe3707703 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -11,6 +11,7 @@ PORTVERSION= 0.9.7 PORTREVISION!= date -v-1d +%Y%m%d .else PORTVERSION= 0.9.7e +PORTREVISION?= 1 .endif CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ diff --git a/security/openssl/files/patch-Makefile.org b/security/openssl/files/patch-Makefile.org index 558434fbd418..b6c708c533ca 100644 --- a/security/openssl/files/patch-Makefile.org +++ b/security/openssl/files/patch-Makefile.org @@ -1,5 +1,16 @@ --- Makefile.org.orig Tue Sep 28 22:52:14 2004 -+++ Makefile.org Tue Oct 26 18:08:14 2004 ++++ Makefile.org Fri Nov 5 18:21:09 2004 +@@ -175,8 +175,8 @@ + # we might set SHLIB_MARK to '$(SHARED_LIBS)'. + SHLIB_MARK= + +-DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps test tools +-SHLIBDIRS= fips crypto ssl ++DIRS= crypto ssl $(SHLIB_MARK) sigs apps test tools ++SHLIBDIRS= crypto ssl + + # dirs in crypto to build + SDIRS= objects \ @@ -194,7 +194,7 @@ MAKEFILE= Makefile @@ -9,17 +20,19 @@ MAN1=1 MAN3=3 MANSUFFIX= -@@ -305,8 +305,8 @@ +@@ -305,9 +305,9 @@ libs="$(LIBKRB5) $$libs"; \ fi; \ ( set -x; ${CC} ${SHARED_LDFLAGS} \ - -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - -Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +- -Wl,-Bsymbolic \ ++ -nodefaultlibs \ + -shared -o lib$$i.so.${SHLIBVER} \ + -Wl,-soname=lib$$i.so.${SHLIBVER} \ - -Wl,-Bsymbolic \ -Wl,--whole-archive lib$$i.a \ -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \ + libs="-l$$i $$libs"; \ @@ -795,7 +795,7 @@ install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist index 50ab97e0e6a7..c9495120642e 100644 --- a/security/openssl/pkg-plist +++ b/security/openssl/pkg-plist @@ -1,6 +1,5 @@ bin/c_rehash bin/openssl -bin/openssl_fips_fingerprint include/openssl/aes.h include/openssl/asn1.h include/openssl/asn1_mac.h @@ -25,8 +24,6 @@ include/openssl/ec.h include/openssl/engine.h include/openssl/err.h include/openssl/evp.h -include/openssl/fips.h -include/openssl/fips_rand.h include/openssl/hmac.h include/openssl/idea.h include/openssl/krb5_asn.h |