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

[Kurt Roeckx]

Author: kroeckx
Date: 2011-04-02 11:43:46 +0000 (Sat, 02 Apr 2011)
New Revision: 487

Removed:
   openssl/trunk/debian/patches/no-sslv2.diff
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
   openssl/trunk/debian/rules
Log:
Revert ssl2 changes, we can't build the package without the defines.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2011-04-02 11:11:43 UTC (rev 486)
+++ openssl/trunk/debian/changelog	2011-04-02 11:43:46 UTC (rev 487)
@@ -2,7 +2,6 @@
 
   * Make libssl-doc Replaces/Breaks with old libssl-dev packages
     (Closes: #607609)
-  * Remove ssl2.h from libssl-dev now that it's disabled.
 
  -- Kurt Roeckx <kurt at roeckx.be>  Sat, 02 Apr 2011 12:50:10 +0200
 

Deleted: openssl/trunk/debian/patches/no-sslv2.diff
===================================================================
--- openssl/trunk/debian/patches/no-sslv2.diff	2011-04-02 11:11:43 UTC (rev 486)
+++ openssl/trunk/debian/patches/no-sslv2.diff	2011-04-02 11:43:46 UTC (rev 487)
@@ -1,14 +0,0 @@
-Index: openssl-1.0.0c/ssl/ssl.h
-===================================================================
---- openssl-1.0.0c.orig/ssl/ssl.h	2011-04-02 10:57:15.000000000 +0000
-+++ openssl-1.0.0c/ssl/ssl.h	2011-04-02 11:03:51.000000000 +0000
-@@ -1187,7 +1187,9 @@
- }
- #endif
- 
-+#ifndef OPENSSL_NO_SSL2
- #include <openssl/ssl2.h>
-+#endif
- #include <openssl/ssl3.h>
- #include <openssl/tls1.h> /* This is mostly sslv3 with a few tweaks */
- #include <openssl/dtls1.h> /* Datagram TLS */

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2011-04-02 11:11:43 UTC (rev 486)
+++ openssl/trunk/debian/patches/series	2011-04-02 11:43:46 UTC (rev 487)
@@ -17,4 +17,3 @@
 stddef.patch
 version-script.patch
 gnu_source.patch
-no-sslv2.diff

Modified: openssl/trunk/debian/rules
===================================================================
--- openssl/trunk/debian/rules	2011-04-02 11:11:43 UTC (rev 486)
+++ openssl/trunk/debian/rules	2011-04-02 11:43:46 UTC (rev 487)
@@ -123,10 +123,6 @@
 	install debian/copyright debian/libssl-dev/usr/share/doc/libssl-dev/
 	install debian/changelog debian/libssl-dev/usr/share/doc/libssl-dev/changelog.Debian
 
-
-	# Remove ssl2.h, SSL2 is disabled.
-	rm debian/tmp/usr/include/openssl/ssl2.h
-
 	dh_installdocs -a CHANGES.SSLeay README NEWS debian/README.optimization
 	dh_installexamples -a
 	dh_installchangelogs -a CHANGES