aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2001-04-23 02:42:35 +0800
committersobomax <sobomax@FreeBSD.org>2001-04-23 02:42:35 +0800
commit90a97c3134fd57270f52a001dbd311dca06c9c38 (patch)
treea3db49902f0662fe1a3afdd2cc83aab87d375617 /security
parentfea585c7058c7967520ddbff5e19f3078818587f (diff)
downloadfreebsd-ports-gnome-90a97c3134fd57270f52a001dbd311dca06c9c38.tar.gz
freebsd-ports-gnome-90a97c3134fd57270f52a001dbd311dca06c9c38.tar.zst
freebsd-ports-gnome-90a97c3134fd57270f52a001dbd311dca06c9c38.zip
1. In addition to OSVERSION test, check for existence of /usr/lib/libssl.a
and don't mark BROKEN if it doesn't exist. 2. Provide a workaround for inability of recent gcc to link shared library when -Wl,-whole-archive ld(1) option is used. This should make possible to build the port on recent -stable or -current.
Diffstat (limited to 'security')
-rw-r--r--security/openssl-beta/Makefile2
-rw-r--r--security/openssl-beta/files/patch-ab13
-rw-r--r--security/openssl/Makefile2
-rw-r--r--security/openssl/files/patch-ab13
4 files changed, 18 insertions, 12 deletions
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index f5712e07f07f..154d21347264 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= http://www.openssl.org/source/ \
MAINTAINER= ports@FreeBSD.org
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 400014
+.if ${OSVERSION} >= 400014 && exists(/usr/lib/libssl.a)
FORBIDDEN= "OpenSSL is already in the base system"
.endif
diff --git a/security/openssl-beta/files/patch-ab b/security/openssl-beta/files/patch-ab
index 8ad463b64eed..8fbe55b661f0 100644
--- a/security/openssl-beta/files/patch-ab
+++ b/security/openssl-beta/files/patch-ab
@@ -1,6 +1,9 @@
---- Makefile.org.orig Sun Aug 8 12:29:52 1999
-+++ Makefile.org Sun Nov 7 18:33:37 1999
-@@ -164,7 +164,7 @@
+
+$FreeBSD$
+
+--- Makefile.org.orig Thu Mar 16 21:46:20 2000
++++ Makefile.org Sun Apr 22 19:50:06 2001
+@@ -165,7 +165,7 @@
ONEDIRS=out tmp
EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS
WDIRS= windows
@@ -9,7 +12,7 @@
GENERAL= Makefile
BASENAME= openssl
-@@ -187,6 +187,21 @@
+@@ -189,6 +189,21 @@
do \
(cd $$i && echo "making all in $$i..." && \
$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
@@ -20,7 +23,7 @@
+ rm -f lib$$i.a lib$$i.so \
+ lib$$i.so.${SHLIBVER}; \
+ ${MAKE} CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='-fPIC ${CFLAG}' SDIRS='${SDIRS}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' DIRS=$$i clean all || exit 1; \
-+ ( set -x; ${CC} -shared -o lib$$i.so.${SHLIBVER} \
++ ( set -x; ${CC} -nodefaultlibs -shared -o lib$$i.so.${SHLIBVER} \
+ -Wl,-S,-soname=lib$$i.so.${SHLIBVER} \
+ -Wl,${WHOLE_ARCHIVE_FLAG} lib$$i.a ) || exit 1; \
+ rm -f lib$$i.a; (cd $$i ; ${MAKE} clean) || exit 1 ;\
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index f5712e07f07f..154d21347264 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= http://www.openssl.org/source/ \
MAINTAINER= ports@FreeBSD.org
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 400014
+.if ${OSVERSION} >= 400014 && exists(/usr/lib/libssl.a)
FORBIDDEN= "OpenSSL is already in the base system"
.endif
diff --git a/security/openssl/files/patch-ab b/security/openssl/files/patch-ab
index 8ad463b64eed..8fbe55b661f0 100644
--- a/security/openssl/files/patch-ab
+++ b/security/openssl/files/patch-ab
@@ -1,6 +1,9 @@
---- Makefile.org.orig Sun Aug 8 12:29:52 1999
-+++ Makefile.org Sun Nov 7 18:33:37 1999
-@@ -164,7 +164,7 @@
+
+$FreeBSD$
+
+--- Makefile.org.orig Thu Mar 16 21:46:20 2000
++++ Makefile.org Sun Apr 22 19:50:06 2001
+@@ -165,7 +165,7 @@
ONEDIRS=out tmp
EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS
WDIRS= windows
@@ -9,7 +12,7 @@
GENERAL= Makefile
BASENAME= openssl
-@@ -187,6 +187,21 @@
+@@ -189,6 +189,21 @@
do \
(cd $$i && echo "making all in $$i..." && \
$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
@@ -20,7 +23,7 @@
+ rm -f lib$$i.a lib$$i.so \
+ lib$$i.so.${SHLIBVER}; \
+ ${MAKE} CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='-fPIC ${CFLAG}' SDIRS='${SDIRS}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' DIRS=$$i clean all || exit 1; \
-+ ( set -x; ${CC} -shared -o lib$$i.so.${SHLIBVER} \
++ ( set -x; ${CC} -nodefaultlibs -shared -o lib$$i.so.${SHLIBVER} \
+ -Wl,-S,-soname=lib$$i.so.${SHLIBVER} \
+ -Wl,${WHOLE_ARCHIVE_FLAG} lib$$i.a ) || exit 1; \
+ rm -f lib$$i.a; (cd $$i ; ${MAKE} clean) || exit 1 ;\
generated by cgit (git 2.34.1) at 2024-12-25 19:07:25 +0800