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

[Kurt Roeckx]

Author: kroeckx
Date: 2012-03-13 20:28:41 +0000 (Tue, 13 Mar 2012)
New Revision: 531

Removed:
   openssl/trunk/debian/patches/pkg-config.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
Log:
pkg-config.patch applied upstream, remove it.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2012-03-13 20:18:38 UTC (rev 530)
+++ openssl/trunk/debian/changelog	2012-03-13 20:28:41 UTC (rev 531)
@@ -3,6 +3,7 @@
   * New upstream version
     - Fixes CVE-2012-0884
     - Properly fix CVE-2011-4619
+    - pkg-config.patch applied upstream, remove it.
   * Enable assembler for all i386 arches.  The assembler does proper
     detection of CPU support, including cpuid support.
     This should fix a problem with AES 192 and 256 with the padlock

Deleted: openssl/trunk/debian/patches/pkg-config.patch
===================================================================
--- openssl/trunk/debian/patches/pkg-config.patch	2012-03-13 20:18:38 UTC (rev 530)
+++ openssl/trunk/debian/patches/pkg-config.patch	2012-03-13 20:28:41 UTC (rev 531)
@@ -1,34 +0,0 @@
-Index: openssl-1.0.0c/Makefile.org
-===================================================================
---- openssl-1.0.0c.orig/Makefile.org	2010-12-12 16:13:28.000000000 +0100
-+++ openssl-1.0.0c/Makefile.org	2010-12-12 17:01:49.000000000 +0100
-@@ -323,7 +323,8 @@
- 	    echo 'Description: OpenSSL cryptography library'; \
- 	    echo 'Version: '$(VERSION); \
- 	    echo 'Requires: '; \
--	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
-+	    echo 'Libs: -L$${libdir} -lcrypto'; \
-+	    echo 'Libs.private: $(EX_LIBS)'; \
- 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
- 
- libssl.pc: Makefile
-@@ -336,7 +337,8 @@
- 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
- 	    echo 'Version: '$(VERSION); \
- 	    echo 'Requires: '; \
--	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-+	    echo 'Libs: -L$${libdir} -lssl'; \
-+	    echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
- 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
- 
- openssl.pc: Makefile
-@@ -349,7 +351,8 @@
- 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
- 	    echo 'Version: '$(VERSION); \
- 	    echo 'Requires: '; \
--	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-+	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
-+	    echo 'Libs.private: $(EX_LIBS)'; \
- 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
- 
- Makefile: Makefile.org Configure config

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2012-03-13 20:18:38 UTC (rev 530)
+++ openssl/trunk/debian/patches/series	2012-03-13 20:28:41 UTC (rev 531)
@@ -9,7 +9,6 @@
 no-rpath.patch
 no-symbolic.patch
 pic.patch
-pkg-config.patch
 valgrind.patch
 rehash-crt.patch
 rehash_pod.patch