On Mon, Jul 30, 2012 at 08:46:13PM +0200, Kurt Roeckx wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian....@packages.debian.org
> Usertags: unblock
>
> Please unblock openssl/1.0.1c-4
Here is the debdiff between the versions:
diff -Nru openssl-1.0.1c/debian/changelog openssl-1.0.1c/debian/changelog
--- openssl-1.0.1c/debian/changelog 2012-06-06 18:30:06.000000000 +0200
+++ openssl-1.0.1c/debian/changelog 2012-07-29 14:33:38.000000000 +0200
@@ -1,3 +1,17 @@
+openssl (1.0.1c-4) unstable; urgency=low
+
+ * Fix the configure rules for alpha (Closes: #672710)
+ * Switch the postinst to sh again, there never was a reason to
+ switch it to bash (Closes: #676398)
+ * Fix pic.patch to not use #ifdef in x86cpuid.s, only .S files are
+ preprocessed. We generate the file again for pic anyway.
+ (Closes: #677468)
+ * Drop Breaks against openssh as it was only for upgrades
+ between versions that were only in testing/unstable.
+ (Closes: #668600)
+
+ -- Kurt Roeckx <k...@roeckx.be> Tue, 17 Jul 2012 11:49:19 +0200
+
openssl (1.0.1c-3) unstable; urgency=low
* Disable padlock engine again, causes problems for hosts not supporting it.
diff -Nru openssl-1.0.1c/debian/control openssl-1.0.1c/debian/control
--- openssl-1.0.1c/debian/control 2012-04-27 01:12:34.000000000 +0200
+++ openssl-1.0.1c/debian/control 2012-07-29 14:33:20.000000000 +0200
@@ -33,7 +33,6 @@
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: openssh-client (<< 1:5.9p1-4), openssh-server (<< 1:5.9p1-4)
Description: SSL shared libraries
libssl and libcrypto shared libraries needed by programs like
apache-ssl, telnet-ssl and openssh.
diff -Nru openssl-1.0.1c/debian/libssl1.0.0.postinst
openssl-1.0.1c/debian/libssl1.0.0.postinst
--- openssl-1.0.1c/debian/libssl1.0.0.postinst 2010-12-13 20:29:43.000000000
+0100
+++ openssl-1.0.1c/debian/libssl1.0.0.postinst 2012-07-17 11:48:50.000000000
+0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
. /usr/share/debconf/confmodule
diff -Nru openssl-1.0.1c/debian/patches/debian-targets.patch
openssl-1.0.1c/debian/patches/debian-targets.patch
--- openssl-1.0.1c/debian/patches/debian-targets.patch 2012-03-19
19:54:51.000000000 +0100
+++ openssl-1.0.1c/debian/patches/debian-targets.patch 2012-07-17
11:45:53.000000000 +0200
@@ -18,7 +18,7 @@
"tru64-alpha-cc", "cc:-std1 -tune host -fast
-readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG
RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
+# Debian GNU/* (various architectures)
-+"debian-alpha","gcc:-DTERMIO
$debian_cflag::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1
DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-alpha","gcc:-DTERMIO
${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1
DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debian-alpha-ev4","gcc:-DTERMIO ${debian_cflags}
-mcpu=ev4::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1
DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debian-alpha-ev5","gcc:-DTERMIO ${debian_cflags}
-mcpu=ev5::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1
DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debian-armeb","gcc:-DB_ENDIAN -DTERMIO
${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT
DES_UNROLL
BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff -Nru openssl-1.0.1c/debian/patches/pic.patch
openssl-1.0.1c/debian/patches/pic.patch
--- openssl-1.0.1c/debian/patches/pic.patch 2012-03-17 18:07:31.000000000
+0100
+++ openssl-1.0.1c/debian/patches/pic.patch 2012-07-29 14:15:31.000000000
+0200
@@ -1,7 +1,7 @@
-Index: openssl-1.0.1/crypto/des/asm/desboth.pl
+Index: openssl-1.0.1c/crypto/des/asm/desboth.pl
===================================================================
---- openssl-1.0.1.orig/crypto/des/asm/desboth.pl 2001-10-24
23:20:56.000000000 +0200
-+++ openssl-1.0.1/crypto/des/asm/desboth.pl 2012-03-17 14:03:25.000000000
+0100
+--- openssl-1.0.1c.orig/crypto/des/asm/desboth.pl 2001-10-24
23:20:56.000000000 +0200
++++ openssl-1.0.1c/crypto/des/asm/desboth.pl 2012-07-29 14:15:26.000000000
+0200
@@ -16,6 +16,11 @@
&push("edi");
@@ -39,10 +39,10 @@
&stack_pop(3);
&mov($L,&DWP(0,"ebx","",0));
-Index: openssl-1.0.1/crypto/perlasm/cbc.pl
+Index: openssl-1.0.1c/crypto/perlasm/cbc.pl
===================================================================
---- openssl-1.0.1.orig/crypto/perlasm/cbc.pl 2011-07-13 08:22:46.000000000
+0200
-+++ openssl-1.0.1/crypto/perlasm/cbc.pl 2012-03-17 14:03:25.000000000
+0100
+--- openssl-1.0.1c.orig/crypto/perlasm/cbc.pl 2011-07-13 08:22:46.000000000
+0200
++++ openssl-1.0.1c/crypto/perlasm/cbc.pl 2012-07-29 14:15:26.000000000
+0200
@@ -122,7 +122,11 @@
&mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
&mov(&DWP($data_off+4,"esp","",0), "ebx"); #
@@ -95,10 +95,10 @@
&mov("eax", &DWP($data_off,"esp","",0)); # get return
&mov("ebx", &DWP($data_off+4,"esp","",0)); #
-Index: openssl-1.0.1/crypto/perlasm/x86gas.pl
+Index: openssl-1.0.1c/crypto/perlasm/x86gas.pl
===================================================================
---- openssl-1.0.1.orig/crypto/perlasm/x86gas.pl 2011-12-09
20:16:35.000000000 +0100
-+++ openssl-1.0.1/crypto/perlasm/x86gas.pl 2012-03-17 14:03:25.000000000
+0100
+--- openssl-1.0.1c.orig/crypto/perlasm/x86gas.pl 2011-12-09
20:16:35.000000000 +0100
++++ openssl-1.0.1c/crypto/perlasm/x86gas.pl 2012-07-29 14:15:26.000000000
+0200
@@ -161,6 +161,7 @@
if ($::macosx) { push (@out,"$tmp,2\n"); }
elsif ($::elf) { push (@out,"$tmp,4\n"); }
@@ -107,11 +107,13 @@
}
push(@out,$initseg) if ($initseg);
}
-@@ -218,7 +219,17 @@
+@@ -218,8 +219,23 @@
elsif ($::elf)
{ $initseg.=<<___;
.section .init
-+#ifdef OPENSSL_PIC
++___
++ if ($::pic)
++ { $initseg.=<<___;
+ pushl %ebx
+ call .pic_point0
+.pic_point0:
@@ -119,16 +121,20 @@
+ addl \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
+ call $f\@PLT
+ popl %ebx
-+#else
++___
++ }
++ else
++ { $initseg.=<<___;
call $f
-+#endif
___
++ }
}
elsif ($::coff)
-Index: openssl-1.0.1/crypto/x86cpuid.pl
+ { $initseg.=<<___; # applies to both Cygwin and Mingw
+Index: openssl-1.0.1c/crypto/x86cpuid.pl
===================================================================
---- openssl-1.0.1.orig/crypto/x86cpuid.pl 2012-02-28 15:20:34.000000000
+0100
-+++ openssl-1.0.1/crypto/x86cpuid.pl 2012-03-17 14:13:56.000000000 +0100
+--- openssl-1.0.1c.orig/crypto/x86cpuid.pl 2012-02-28 15:20:34.000000000
+0100
++++ openssl-1.0.1c/crypto/x86cpuid.pl 2012-07-29 14:15:26.000000000 +0200
@@ -8,6 +8,8 @@
for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120809203308.ga10...@roeckx.be
