diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2006-05-07 19:27:13 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2006-05-07 19:27:13 +0000 |
| commit | c9e694206d49ee0f491e398ec7172aa2f587b4e9 (patch) | |
| tree | 8002d312f805afc0ba38f4b3b2a116cba7027bb4 /security/openssl | |
| parent | 6e3f112b7ce5febc5d93cf8d1c6f78661462cd20 (diff) | |
| download | ports-c9e694206d49ee0f491e398ec7172aa2f587b4e9.tar.gz ports-c9e694206d49ee0f491e398ec7172aa2f587b4e9.zip | |
Notes
Diffstat (limited to 'security/openssl')
| -rw-r--r-- | security/openssl/Makefile | 5 | ||||
| -rw-r--r-- | security/openssl/distinfo | 12 | ||||
| -rw-r--r-- | security/openssl/files/patch-Makefile.org | 26 |
3 files changed, 21 insertions, 22 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 52062990de28..652e98da6823 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -19,10 +19,10 @@ PORTVERSION= 0.9.8 PORTREVISION!= date -v-1d +%Y%m%d .else .if !defined(WITH_OPENSSL_BETA) && ( defined(WITH_OPENSSL_097) || defined(WITH_OPENSSL_STABLE) ) -PORTVERSION= 0.9.7i +PORTVERSION= 0.9.7j PORTREVISION?= 0 .else -PORTVERSION= 0.9.8a +PORTVERSION= 0.9.8b PORTREVISION?= 0 .endif .endif @@ -73,7 +73,6 @@ CONFLICTS?= openssl-beta-0.* openssl-stable-0.* MAKE_ENV+= MANPREFIX=${MANPREFIX} NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch NOPRECIOUSSOFTMAKEVARS= Too many _MLINKS for fetch -USE_REINPLACE= yes USE_PERL5_BUILD= yes CFLAGS+= -Wl,-rpath,${LOCALBASE}/lib diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 5f560ecce51a..59f4f88c7a55 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,6 +1,6 @@ -MD5 (openssl-0.9.8a.tar.gz) = 1d16c727c10185e4d694f87f5e424ee1 -SHA256 (openssl-0.9.8a.tar.gz) = 30f8f61fb1316f4fb51410c740b4879b8e26b417c8d870e486144b10b8041c73 -SIZE (openssl-0.9.8a.tar.gz) = 3271435 -MD5 (openssl-0.9.7i.tar.gz) = f69d82b206ff8bff9d0e721f97380b9e -SHA256 (openssl-0.9.7i.tar.gz) = 2fdd9235fc08c4353875d0981741947f2fa9f8835f04d97c30461cc14a986dd0 -SIZE (openssl-0.9.7i.tar.gz) = 3280907 +MD5 (openssl-0.9.8b.tar.gz) = 12cedbeb6813a0d7919dbf1f82134b86 +SHA256 (openssl-0.9.8b.tar.gz) = 69efed6275942f9312de61cf69aaef12b06c12f6b10f319672ce026a756f65c0 +SIZE (openssl-0.9.8b.tar.gz) = 3279283 +MD5 (openssl-0.9.7j.tar.gz) = 79dd939266b069e7aca587e6ab16a055 +SHA256 (openssl-0.9.7j.tar.gz) = 65a6e88c3397cb68d19dbb576ecf9f9d8dc41423aa9ac3025cd29e3987274460 +SIZE (openssl-0.9.7j.tar.gz) = 3290510 diff --git a/security/openssl/files/patch-Makefile.org b/security/openssl/files/patch-Makefile.org index dbb9b9c8c6b5..bc2bc7bcf30b 100644 --- a/security/openssl/files/patch-Makefile.org +++ b/security/openssl/files/patch-Makefile.org @@ -1,15 +1,15 @@ ---- Makefile.org.orig Tue Mar 15 10:46:13 2005 -+++ Makefile.org Wed Mar 23 11:03:41 2005 -@@ -175,7 +175,7 @@ +--- Makefile.org.orig Mon Apr 24 15:32:57 2006 ++++ Makefile.org Sun May 7 21:18:14 2006 +@@ -194,7 +194,7 @@ # we might set SHLIB_MARK to '$(SHARED_LIBS)'. SHLIB_MARK= --DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps test tools -+DIRS= crypto ssl $(SHLIB_MARK) sigs apps test tools +-DIRS= crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools ++DIRS= crypto ssl $(SHLIB_MARK) apps test tools SHLIBDIRS= crypto ssl # dirs in crypto to build -@@ -194,7 +194,7 @@ +@@ -213,7 +213,7 @@ MAKEFILE= Makefile @@ -18,10 +18,10 @@ MAN1=1 MAN3=3 MANSUFFIX= -@@ -305,9 +305,9 @@ +@@ -316,9 +316,9 @@ libs="$(LIBKRB5) $$libs"; \ fi; \ - ( set -x; ${CC} ${SHARED_LDFLAGS} \ + ( set -x; $${FIPSLD:-${CC}} ${SHARED_LDFLAGS} \ - -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - -Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - -Wl,-Bsymbolic \ @@ -29,9 +29,9 @@ + -shared -o lib$$i.so.${SHLIBVER} \ + -Wl,-soname=lib$$i.so.${SHLIBVER} \ -Wl,--whole-archive lib$$i.a \ - -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \ + -Wl,--no-whole-archive $$libs ${EX_LIBS} ) || exit 1; \ libs="-l$$i $$libs"; \ -@@ -803,7 +803,7 @@ +@@ -784,7 +784,7 @@ install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ @@ -40,10 +40,10 @@ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ -@@ -875,8 +875,8 @@ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ +@@ -847,8 +847,8 @@ + sed -e '1,/^$$/d' doc/openssl-shared.txt; \ fi; \ - done; + fi - cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc + cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/libdata/pkgconfig |