Build and install shared libraries libcrypto.so.1 and libssl.so.1, too.

Submitted by:	Issei Suzuki <issei@jp.freebsd.org>

6 files changed, 78 insertions, 10 deletions

diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index 1c5467983ce6..ec5835514d83 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	openssl-0.9.4
-CATEGORIES=	security devel 
+CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \
 		ftp://ftp.openssl.org/source/ \
 		ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ \
@@ -17,6 +17,9 @@ MAINTAINER=	dirk@FreeBSD.org
 
 RESTRICTED=	"Cryptography"
 USE_PERL5=	yes
+ALL_TARGET=	freebsd-shared all
+SHLIBVER=	1
+MAKE_ENV+=	SHLIBVER=${SHLIBVER}
 
 .if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
 pre-fetch:
@@ -39,6 +42,11 @@ do-configure:
 	   ${RSAREF} -L${PREFIX}/lib
 
 post-install:
+.for i in libcrypto libssl
+	@${INSTALL_DATA} ${WRKSRC}/$i.so.${SHLIBVER} ${PREFIX}/lib
+	@${LN} -s $i.so.${SHLIBVER} ${PREFIX}/lib/$i.so
+.endfor
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/openssl
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/openssl
diff --git a/security/openssl-beta/files/patch-ab b/security/openssl-beta/files/patch-ab
index 242f51032255..b043ccd35bd2 100644
--- a/security/openssl-beta/files/patch-ab
+++ b/security/openssl-beta/files/patch-ab
@@ -1,11 +1,33 @@
---- Makefile.org.orig	Mon Mar 22 18:18:18 1999
-+++ Makefile.org	Wed Mar 24 17:25:25 1999
-@@ -149,7 +149,7 @@
+--- Makefile.org.orig	Sun Aug  8 12:29:52 1999
++++ Makefile.org	Sun Nov  7 18:33:37 1999
+@@ -164,7 +164,7 @@
  ONEDIRS=out tmp
- EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep
+ EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
  WDIRS=  windows
 -LIBS=   libcrypto.a libssl.a 
 +LIBS=   libcrypto.a libssl.a libRSAglue.a
  
  GENERAL=        Makefile
  BASENAME=       openssl
+@@ -187,6 +187,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; \
++	done;
++
++freebsd-shared:
++	for i in ${SHLIBDIRS}; do \
++	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} \
++		-Wl,-S,-soname=lib$$i.so.${SHLIBVER} \
++		-Wl,--whole-archive lib$$i.a ) || exit 1; \
++	rm -f lib$$i.a; (cd $$i ; ${MAKE} clean) || exit 1 ;\
++	done;
++	@set -x; \
++	for i in ${SHLIBDIRS}; do \
++	ln -s lib$$i.so.${SHLIBVER} lib$$i.so; \
+ 	done;
+ 
+ linux-shared:
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
index 170111ebcc6e..8457dbaaa473 100644
--- a/security/openssl-beta/pkg-plist
+++ b/security/openssl-beta/pkg-plist
@@ -52,7 +52,11 @@ include/openssl/x509_vfy.h
 include/openssl/x509v3.h
 lib/libRSAglue.a
 lib/libcrypto.a
+lib/libcrypto.so
+lib/libcrypto.so.1
 lib/libssl.a
+lib/libssl.so
+lib/libssl.so.1
 openssl/misc/CA.pl
 openssl/misc/CA.sh
 openssl/misc/c_hash
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 1c5467983ce6..ec5835514d83 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	openssl-0.9.4
-CATEGORIES=	security devel 
+CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \
 		ftp://ftp.openssl.org/source/ \
 		ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ \
@@ -17,6 +17,9 @@ MAINTAINER=	dirk@FreeBSD.org
 
 RESTRICTED=	"Cryptography"
 USE_PERL5=	yes
+ALL_TARGET=	freebsd-shared all
+SHLIBVER=	1
+MAKE_ENV+=	SHLIBVER=${SHLIBVER}
 
 .if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
 pre-fetch:
@@ -39,6 +42,11 @@ do-configure:
 	   ${RSAREF} -L${PREFIX}/lib
 
 post-install:
+.for i in libcrypto libssl
+	@${INSTALL_DATA} ${WRKSRC}/$i.so.${SHLIBVER} ${PREFIX}/lib
+	@${LN} -s $i.so.${SHLIBVER} ${PREFIX}/lib/$i.so
+.endfor
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/openssl
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/openssl
diff --git a/security/openssl/files/patch-ab b/security/openssl/files/patch-ab
index 242f51032255..b043ccd35bd2 100644
--- a/security/openssl/files/patch-ab
+++ b/security/openssl/files/patch-ab
@@ -1,11 +1,33 @@
---- Makefile.org.orig	Mon Mar 22 18:18:18 1999
-+++ Makefile.org	Wed Mar 24 17:25:25 1999
-@@ -149,7 +149,7 @@
+--- Makefile.org.orig	Sun Aug  8 12:29:52 1999
++++ Makefile.org	Sun Nov  7 18:33:37 1999
+@@ -164,7 +164,7 @@
  ONEDIRS=out tmp
- EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep
+ EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
  WDIRS=  windows
 -LIBS=   libcrypto.a libssl.a 
 +LIBS=   libcrypto.a libssl.a libRSAglue.a
  
  GENERAL=        Makefile
  BASENAME=       openssl
+@@ -187,6 +187,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; \
++	done;
++
++freebsd-shared:
++	for i in ${SHLIBDIRS}; do \
++	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} \
++		-Wl,-S,-soname=lib$$i.so.${SHLIBVER} \
++		-Wl,--whole-archive lib$$i.a ) || exit 1; \
++	rm -f lib$$i.a; (cd $$i ; ${MAKE} clean) || exit 1 ;\
++	done;
++	@set -x; \
++	for i in ${SHLIBDIRS}; do \
++	ln -s lib$$i.so.${SHLIBVER} lib$$i.so; \
+ 	done;
+ 
+ linux-shared:
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 170111ebcc6e..8457dbaaa473 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -52,7 +52,11 @@ include/openssl/x509_vfy.h
 include/openssl/x509v3.h
 lib/libRSAglue.a
 lib/libcrypto.a
+lib/libcrypto.so
+lib/libcrypto.so.1
 lib/libssl.a
+lib/libssl.so
+lib/libssl.so.1
 openssl/misc/CA.pl
 openssl/misc/CA.sh
 openssl/misc/c_hash