openssl-32: fix for parallel building

3 files changed, 29 insertions, 90 deletions

diff --git a/openssl-32/.md5sum b/openssl-32/.md5sum
index 13e0b7e7..b811621c 100644
--- a/openssl-32/.md5sum
+++ b/openssl-32/.md5sum
@@ -1,2 +1,3 @@
 2a0b82fe7740163a908a23c4f13f2690  openssl-1.0.2a-32bit_x86_64.patch
+278954b1b014f8a3f73b12d7230ef902  openssl-1.0.2d-parallel-build.patch
 38dd619b2e77cbac69b99f52a053d25a  openssl-1.0.2d.tar.gz
diff --git a/openssl-32/Pkgfile b/openssl-32/Pkgfile
index 0a14ba1d..065f91b1 100644
--- a/openssl-32/Pkgfile
+++ b/openssl-32/Pkgfile
@@ -6,7 +6,8 @@ name=openssl-32
 version=1.0.2d
 release=1
 source=(http://www.openssl.org/source/openssl-$version.tar.gz
-	openssl-1.0.2a-32bit_x86_64.patch)
+	openssl-1.0.2a-32bit_x86_64.patch
+	openssl-1.0.2d-parallel-build.patch)
 
 build() {
 	cd openssl-$version
@@ -16,7 +17,7 @@ build() {
 	rm Makefile
 
 	patch -p1 -i $SRC/openssl-1.0.2a-32bit_x86_64.patch
-	#patch -p1 -i $SRC/openssl-1.0.2a-parallel-build.patch
+	patch -p1 -i $SRC/openssl-1.0.2d-parallel-build.patch
 
 	# Disable fips and man pages
 	sed \
diff --git a/openssl-32/openssl-1.0.2a-parallel-build.patch b/openssl-32/openssl-1.0.2d-parallel-build.patch
index 931706f5..b7aa0ea8 100644
--- a/openssl-32/openssl-1.0.2a-parallel-build.patch
+++ b/openssl-32/openssl-1.0.2d-parallel-build.patch
@@ -1,6 +1,8 @@
-diff -urN openssl-1.0.2a.orig/crypto/Makefile openssl-1.0.2a/crypto/Makefile
---- openssl-1.0.2a.orig/crypto/Makefile	2015-03-19 08:31:02.000000000 -0500
-+++ openssl-1.0.2a/crypto/Makefile	2015-03-20 12:55:17.659125948 -0500
+https://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest
+https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
+
+--- openssl-1.0.2d/crypto/Makefile
++++ openssl-1.0.2d/crypto/Makefile
 @@ -85,11 +85,11 @@
  	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
  
@@ -42,27 +44,8 @@ diff -urN openssl-1.0.2a.orig/crypto/Makefile openssl-1.0.2a/crypto/Makefile
  
  lint:
  	@target=lint; $(RECURSIVE_MAKE)
-diff -urN openssl-1.0.2a.orig/crypto/objects/Makefile openssl-1.0.2a/crypto/objects/Makefile
---- openssl-1.0.2a.orig/crypto/objects/Makefile	2015-03-19 08:31:02.000000000 -0500
-+++ openssl-1.0.2a/crypto/objects/Makefile	2015-03-20 13:00:45.145803546 -0500
-@@ -44,11 +44,11 @@
- # objects.pl both reads and writes obj_mac.num
- obj_mac.h: objects.pl objects.txt obj_mac.num
- 	$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
--	@sleep 1; touch obj_mac.h; sleep 1
- 
--obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
-+# This doesn't really need obj_mac.h, but since that rule reads & writes
-+# obj_mac.num, we can't run in parallel with it.
-+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
- 	$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
--	@sleep 1; touch obj_xref.h; sleep 1
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-diff -urN openssl-1.0.2a.orig/engines/Makefile openssl-1.0.2a/engines/Makefile
---- openssl-1.0.2a.orig/engines/Makefile	2015-03-19 08:31:14.000000000 -0500
-+++ openssl-1.0.2a/engines/Makefile	2015-03-20 12:56:22.482462424 -0500
+--- openssl-1.0.2d/engines/Makefile
++++ openssl-1.0.2d/engines/Makefile
 @@ -72,7 +72,7 @@
  
  all:	lib subdirs
@@ -90,63 +73,33 @@ diff -urN openssl-1.0.2a.orig/engines/Makefile openssl-1.0.2a/engines/Makefile
  
  tags:
  	ctags $(SRC)
-diff -urN openssl-1.0.2a.orig/Makefile.org openssl-1.0.2a/Makefile.org
---- openssl-1.0.2a.orig/Makefile.org	2015-03-19 08:30:36.000000000 -0500
-+++ openssl-1.0.2a/Makefile.org	2015-03-20 12:51:38.909117504 -0500
+--- openssl-1.0.2d/Makefile.org
++++ openssl-1.0.2d/Makefile.org
 @@ -274,17 +274,17 @@
  build_libs: build_crypto build_ssl build_engines
  
  build_crypto:
 -	@dir=crypto; target=all; $(BUILD_ONE_CMD)
--build_ssl:
--	@dir=ssl; target=all; $(BUILD_ONE_CMD)
--build_engines:
--	@dir=engines; target=all; $(BUILD_ONE_CMD)
--build_apps:
--	@dir=apps; target=all; $(BUILD_ONE_CMD)
--build_tests:
--	@dir=test; target=all; $(BUILD_ONE_CMD)
--build_tools:
--	@dir=tools; target=all; $(BUILD_ONE_CMD)
 +	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
-+build_ssl: build_crypto
+ build_ssl: build_crypto
+-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
 +	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
-+build_engines: build_crypto
+ build_engines: build_crypto
+-	@dir=engines; target=all; $(BUILD_ONE_CMD)
 +	+@dir=engines; target=all; $(BUILD_ONE_CMD)
-+build_apps: build_libs
+ build_apps: build_libs
+-	@dir=apps; target=all; $(BUILD_ONE_CMD)
 +	+@dir=apps; target=all; $(BUILD_ONE_CMD)
-+build_tests: build_libs
+ build_tests: build_libs
+-	@dir=test; target=all; $(BUILD_ONE_CMD)
 +	+@dir=test; target=all; $(BUILD_ONE_CMD)
-+build_tools: build_libs
+ build_tools: build_libs
+-	@dir=tools; target=all; $(BUILD_ONE_CMD)
 +	+@dir=tools; target=all; $(BUILD_ONE_CMD)
  
  all_testapps: build_libs build_testapps
  build_testapps:
-@@ -536,9 +536,9 @@
- dist_pem_h:
- 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
- 
--install: all install_docs install_sw
-+install: install_docs install_sw
- 
--install_sw:
-+install_dirs:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -547,12 +547,19 @@
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
-+	@$(PERL) $(TOP)/util/mkdir-p.pl \
-+		$(INSTALL_PREFIX)$(MANDIR)/man1 \
-+		$(INSTALL_PREFIX)$(MANDIR)/man3 \
-+		$(INSTALL_PREFIX)$(MANDIR)/man5 \
-+		$(INSTALL_PREFIX)$(MANDIR)/man7
-+
-+install_sw: install_dirs
- 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
- 	do \
+@@ -555,7 +555,7 @@
  	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
  	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
  	done;
@@ -155,28 +108,13 @@ diff -urN openssl-1.0.2a.orig/Makefile.org openssl-1.0.2a/Makefile.org
  	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
  	do \
  		if [ -f "$$i" ]; then \
-@@ -636,12 +643,7 @@
- 		done; \
- 	done
- 
--install_docs:
--	@$(PERL) $(TOP)/util/mkdir-p.pl \
--		$(INSTALL_PREFIX)$(MANDIR)/man1 \
--		$(INSTALL_PREFIX)$(MANDIR)/man3 \
--		$(INSTALL_PREFIX)$(MANDIR)/man5 \
--		$(INSTALL_PREFIX)$(MANDIR)/man7
-+install_docs: install_dirs
- 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
- 	here="`pwd`"; \
- 	filecase=; \
-diff -urN openssl-1.0.2a.orig/Makefile.shared openssl-1.0.2a/Makefile.shared
---- openssl-1.0.2a.orig/Makefile.shared	2015-01-20 06:33:36.000000000 -0600
-+++ openssl-1.0.2a/Makefile.shared	2015-03-20 12:53:28.612454616 -0500
+--- openssl-1.0.2d/Makefile.shared
++++ openssl-1.0.2d/Makefile.shared
 @@ -105,6 +105,7 @@
      SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
      LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
      LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-+	[ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
++    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
      LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
      $${SHAREDCMD} $${SHAREDFLAGS} \
  	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
@@ -188,9 +126,8 @@ diff -urN openssl-1.0.2a.orig/Makefile.shared openssl-1.0.2a/Makefile.shared
  			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
  			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
  		fi; \
-diff -urN openssl-1.0.2a.orig/test/Makefile openssl-1.0.2a/test/Makefile
---- openssl-1.0.2a.orig/test/Makefile	2015-03-19 08:31:16.000000000 -0500
-+++ openssl-1.0.2a/test/Makefile	2015-03-20 12:59:51.712470878 -0500
+--- openssl-1.0.2d/test/Makefile
++++ openssl-1.0.2d/test/Makefile
 @@ -133,7 +133,7 @@
  tags:
  	ctags $(SRC)