[Pkg-openssl-changes] r836 - in openssl/trunk/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2016-09-22 17:40:46 +0000 (Thu, 22 Sep 2016)
New Revision: 836

Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/engines-path.patch
Log:
Update engines-path.patch


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2016-09-22 17:35:49 UTC (rev 835)
+++ openssl/trunk/debian/changelog	2016-09-22 17:40:46 UTC (rev 836)
@@ -12,9 +12,11 @@
     - Fix CVE-2016-6303
     - Fix CVE-2016-6304
     - Fix CVE-2016-6306
-  - Drop ca.patch, option is now documented upstream
+  * Drop ca.patch, option is now documented upstream
+  * Update engines-path.patch to also update the libcrypto.pc, now that that
+    has an enginesdir in it.
 
- -- Kurt Roeckx <kurt at roeckx.be>  Thu, 22 Sep 2016 18:56:37 +0200
+ -- Kurt Roeckx <kurt at roeckx.be>  Thu, 22 Sep 2016 19:39:36 +0200
 
 openssl (1.0.2h-2) unstable; urgency=medium
 

Modified: openssl/trunk/debian/patches/engines-path.patch
===================================================================
--- openssl/trunk/debian/patches/engines-path.patch	2016-09-22 17:35:49 UTC (rev 835)
+++ openssl/trunk/debian/patches/engines-path.patch	2016-09-22 17:40:46 UTC (rev 836)
@@ -1,8 +1,17 @@
-Index: openssl-1.0.2~beta3/Makefile.org
+Index: openssl-1.0.2i/Makefile.org
 ===================================================================
---- openssl-1.0.2~beta3.orig/Makefile.org
-+++ openssl-1.0.2~beta3/Makefile.org
-@@ -541,7 +541,7 @@ install: all install_docs install_sw
+--- openssl-1.0.2i.orig/Makefile.org
++++ openssl-1.0.2i/Makefile.org
+@@ -368,7 +368,7 @@ libcrypto.pc: Makefile
+ 	    echo 'exec_prefix=$${prefix}'; \
+ 	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ 	    echo 'includedir=$${prefix}/include'; \
+-	    echo 'enginesdir=$${libdir}/engines'; \
++	    echo 'enginesdir=$${libdir}/openssl-1.0.2/engines'; \
+ 	    echo ''; \
+ 	    echo 'Name: OpenSSL-libcrypto'; \
+ 	    echo 'Description: OpenSSL cryptography library'; \
+@@ -536,7 +536,7 @@ install: all install_docs install_sw
  install_sw:
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
@@ -11,10 +20,10 @@
  		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
  		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-Index: openssl-1.0.2~beta3/engines/Makefile
+Index: openssl-1.0.2i/engines/Makefile
 ===================================================================
---- openssl-1.0.2~beta3.orig/engines/Makefile
-+++ openssl-1.0.2~beta3/engines/Makefile
+--- openssl-1.0.2i.orig/engines/Makefile
++++ openssl-1.0.2i/engines/Makefile
 @@ -107,13 +107,13 @@ install:
  	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
  	@if [ -n "$(SHARED_LIBS)" ]; then \
@@ -45,11 +54,11 @@
  		done; \
  	fi
  	@target=install; $(RECURSIVE_MAKE)
-Index: openssl-1.0.2~beta3/Configure
+Index: openssl-1.0.2i/Configure
 ===================================================================
---- openssl-1.0.2~beta3.orig/Configure
-+++ openssl-1.0.2~beta3/Configure
-@@ -1893,7 +1893,7 @@ while (<IN>)
+--- openssl-1.0.2i.orig/Configure
++++ openssl-1.0.2i/Configure
+@@ -1969,7 +1969,7 @@ while (<IN>)
  		}
  	elsif	(/^#define\s+ENGINESDIR/)
  		{
@@ -58,10 +67,10 @@
  		$foo =~ s/\\/\\\\/g;
  		print OUT "#define ENGINESDIR \"$foo\"\n";
  		}
-Index: openssl-1.0.2~beta3/engines/ccgost/Makefile
+Index: openssl-1.0.2i/engines/ccgost/Makefile
 ===================================================================
---- openssl-1.0.2~beta3.orig/engines/ccgost/Makefile
-+++ openssl-1.0.2~beta3/engines/ccgost/Makefile
+--- openssl-1.0.2i.orig/engines/ccgost/Makefile
++++ openssl-1.0.2i/engines/ccgost/Makefile
 @@ -47,7 +47,7 @@ install:
  		pfx=lib; \
  		if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \