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

[Kurt Roeckx]

Author: kroeckx
Date: 2010-11-16 18:06:29 +0000 (Tue, 16 Nov 2010)
New Revision: 462

Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/engines-path.patch
Log:
Re-add the engines.  Patch by Joerg Schneider. (Closes: #603693)


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2010-11-16 18:02:30 UTC (rev 461)
+++ openssl/trunk/debian/changelog	2010-11-16 18:06:29 UTC (rev 462)
@@ -1,6 +1,7 @@
-openssl (0.9.8o-3) unstable; urgency=low
+openssl (0.9.8o-3) unstable; urgency=high
 
   * Fix TLS extension parsing race condition (CVE-2010-3864) (Closes: #603709)
+  * Re-add the engines.  Patch by Joerg Schneider. (Closes: #603693)
 
  -- Kurt Roeckx <kurt at roeckx.be>  Tue, 16 Nov 2010 19:01:06 +0100
 

Modified: openssl/trunk/debian/patches/engines-path.patch
===================================================================
--- openssl/trunk/debian/patches/engines-path.patch	2010-11-16 18:02:30 UTC (rev 461)
+++ openssl/trunk/debian/patches/engines-path.patch	2010-11-16 18:06:29 UTC (rev 462)
@@ -15,6 +15,15 @@
 ===================================================================
 --- openssl-0.9.8m.orig/engines/Makefile	2009-11-10 01:53:02.000000000 +0000
 +++ openssl-0.9.8m/engines/Makefile	2010-02-27 00:45:03.000000000 +0000
+@@ -92,7 +92,7 @@
+ 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+ 	@if [ -n "$(SHARED_LIBS)" ]; then \
+ 		set -e; \
+-		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines; \
++		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines; \
+ 		for l in $(LIBNAMES); do \
+ 			( echo installing $$l; \
+ 			  if [ "$(PLATFORM)" != "Cygwin" ]; then \
 @@ -101,13 +101,13 @@
  				*DSO_DL*)	sfx="sl";;	\
  				*)		sfx="bad";;	\
@@ -23,12 +32,13 @@
 +				cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
  			  else \
  			  	sfx="so"; \
- 				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
+-				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
++				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
  			  fi; \
 -			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
 -			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
 +			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
-+			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
++			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx ); \
  		done; \
  	fi