6 files changed, 49 insertions, 59 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index d12d6ef3bb86..e95667836cba 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	openssl
 PORTVERSION=	0.9.7
 PORTREVISION!=	date -v-1d +%Y%m%d
 .else
-PORTVERSION=	0.9.7d
-PORTREVISION=	1
+PORTVERSION=	0.9.7e
 .endif
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/%SUBDIR%/ \
@@ -50,6 +49,7 @@ OPENSSL_SHLIBVER?=	3
 
 MAKE_ENV+=		MANPREFIX=${MANPREFIX}
 NOPRECIOUSMAKEVARS=	Too many _MLINKS for fetch
+USE_REINPLACE=		yes
 USE_PERL5_BUILD=	yes
 CFLAGS+=		-Wl,-rpath,${LOCALBASE}/lib
 
@@ -854,11 +854,12 @@ MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=-Bforcearchive
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive
 .endif
 
+EXTRACONFIGURE+=	no-fips
 .if defined(NOSHARED)
 PLIST_SUB+=	SHARED="@comment "
 .else
 PLIST_SUB+=	SHARED=""
-ALL_TARGET=	freebsd-shared all
+EXTRACONFIGURE+=	shared
 MAKE_ENV+=	SHLIBVER=${OPENSSL_SHLIBVER}
 PLIST_SUB+=	SHLIBVER=${OPENSSL_SHLIBVER}
 INSTALLS_SHLIB=	yes
@@ -889,8 +890,8 @@ PLIST_SUB+=	NOBASE=""
 .endif
 
 .if defined(BATCH) || defined(OPENSSL_WITH_386)
-.if ${MACHINE_ARCH} == "i386"
-EXTRACONFIGURE=	386
+.if ${ARCH} == "i386"
+EXTRACONFIGURE+=	386
 .endif
 .endif
 
@@ -900,6 +901,13 @@ do-configure:
 	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
 	./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
 	-L${PREFIX}/lib ${EXTRACONFIGURE}
+	@${REINPLACE_CMD} \
+		-e 's|^FIPS_DES_ENC=|#FIPS_DES_ENC=|' \
+		-e 's|^FIPS_SHA1_ASM_OBJ=|#FIPS_SHA1_ASM_OBJ=|' \
+		-e 's|^SHLIB_EXT=.*$$|SHLIB_EXT=.so.$(SHLIBVER)|' \
+		-e 's|^SHARED_LIBS_LINK_EXTS=.*$$|SHARED_LIBS_LINK_EXTS=.so|' \
+		-e 's|^SHLIBDIRS= fips|SHLIBDIRS=|' \
+		${WRKSRC}/Makefile
 
 post-install:
 .if !defined(NOSHARED)
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index aeac780cbb33..3c26ca861da5 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (openssl-0.9.7d.tar.gz) = 1b49e90fc8a75c3a507c0a624529aca5
-SIZE (openssl-0.9.7d.tar.gz) = 2798433
+MD5 (openssl-0.9.7e.tar.gz) = a8777164bca38d84e5eb2b1535223474
+SIZE (openssl-0.9.7e.tar.gz) = 3043231
diff --git a/security/openssl/files/patch-Makefile.org b/security/openssl/files/patch-Makefile.org
index 4cddcac98e37..558434fbd418 100644
--- a/security/openssl/files/patch-Makefile.org
+++ b/security/openssl/files/patch-Makefile.org
@@ -1,47 +1,27 @@
---- Makefile.org.orig	Fri Mar 12 22:33:04 2004
-+++ Makefile.org	Mon Jul 19 06:16:00 2004
-@@ -191,7 +191,7 @@
- MAKEFILE= Makefile.ssl
- MAKE=     make -f Makefile.ssl
+--- Makefile.org.orig	Tue Sep 28 22:52:14 2004
++++ Makefile.org	Tue Oct 26 18:08:14 2004
+@@ -194,7 +194,7 @@
+ 
+ MAKEFILE= Makefile
  
 -MANDIR=$(OPENSSLDIR)/man
 +MANDIR=$(MANPREFIX)/man
  MAN1=1
  MAN3=3
  MANSUFFIX=
-@@ -275,6 +275,21 @@
- 
- build-shared: clean-shared do_$(SHLIB_TARGET) link-shared
- 
-+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}  -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 ;\
-+	done;
-+	@set -x; \
-+	for i in ${SHLIBDIRS}; do \
-+	ln -s lib$$i.so.${SHLIBVER} lib$$i.so; \
-+	done;
-+
- do_bsd-gcc-shared: do_gnu-shared
- do_linux-shared: do_gnu-shared
- do_gnu-shared:
-@@ -596,7 +611,7 @@
- 	@false
- 
- libclean:
--	rm -f *.map *.so *.so.* engines/*.so *.a */lib */*/lib
-+	rm -f *.map *.So *.So.* engines/*.so *.a */lib */*/lib
- 
- clean:	libclean
- 	rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
-@@ -773,7 +788,7 @@
- install: all install_docs
+@@ -305,8 +305,8 @@
+ 		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} \
++		-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; \
+@@ -795,7 +795,7 @@
+ install_sw:
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
 -		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
@@ -49,10 +29,10 @@
  		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
  		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
  		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
-@@ -833,8 +848,8 @@
- 			sed -e '1,/^$$/d' doc/openssl-shared.txt; \
+@@ -867,8 +867,8 @@
+ 			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
  		fi; \
- 	fi
+ 	done;
 -	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
diff --git a/security/openssl/files/patch-ak b/security/openssl/files/patch-ak
index cdc35edc1a3a..77e810e497c6 100644
--- a/security/openssl/files/patch-ak
+++ b/security/openssl/files/patch-ak
@@ -1,6 +1,6 @@
---- apps/Makefile.ssl.orig	Tue Dec 24 11:50:16 2002
-+++ apps/Makefile.ssl	Thu Jan  2 17:58:03 2003
-@@ -111,7 +111,7 @@
+--- apps/Makefile.orig	Tue Aug 10 11:09:07 2004
++++ apps/Makefile	Tue Oct 26 07:00:51 2004
+@@ -112,7 +112,7 @@
  	 done
  	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
  	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
diff --git a/security/openssl/files/patch-apps-dgst.c b/security/openssl/files/patch-apps-dgst.c
index 25fbf96d2c7f..2ada86741428 100644
--- a/security/openssl/files/patch-apps-dgst.c
+++ b/security/openssl/files/patch-apps-dgst.c
@@ -1,11 +1,11 @@
---- apps/dgst.c.orig	Sat Dec 27 15:40:56 2003
-+++ apps/dgst.c	Wed Mar 17 13:59:05 2004
-@@ -349,7 +349,7 @@
+--- apps/dgst.c.orig	Thu Aug  5 20:10:46 2004
++++ apps/dgst.c	Tue Oct 26 07:02:30 2004
+@@ -363,7 +363,7 @@
  				{
- 				size_t len = strlen(name)+strlen(argv[i])+5;
+ 				size_t len = strlen(name)+strlen(argv[i])+(hmac_key ? 5 : 0)+5;
  				tmp=tofree=OPENSSL_malloc(len);
--				BIO_snprintf(tmp,len,"%s(%s)= ",name,argv[i]);
-+				BIO_snprintf(tmp,len,"%s(%s) = ",name,argv[i]);
+-				BIO_snprintf(tmp,len,"%s%s(%s)= ",
++				BIO_snprintf(tmp,len,"%s%s(%s) = ",
+ 							 hmac_key ? "HMAC-" : "",name,argv[i]);
  				}
  			else
- 				tmp="";
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 05e4b6daaee0..50ab97e0e6a7 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -1,5 +1,6 @@
 bin/c_rehash
 bin/openssl
+bin/openssl_fips_fingerprint
 include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
@@ -24,6 +25,8 @@ 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
@@ -84,7 +87,6 @@ libdata/pkgconfig/openssl.pc
 @dirrm include/openssl
 @dirrm libdata/pkgconfig
 %%NOBASE%%@dirrm openssl/certs
-%%NOBASE%%@dirrm openssl/lib
 %%MANDIR%%@dirrm openssl/man/man1
 %%MANDIR%%@dirrm openssl/man/man3
 %%MANDIR%%@dirrm openssl/man/man5