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

[Kurt Roeckx]

Author: kroeckx
Date: 2012-03-17 17:08:58 +0000 (Sat, 17 Mar 2012)
New Revision: 546

Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/pic.patch
Log:
Clean up pic patch some more.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2012-03-17 16:39:05 UTC (rev 545)
+++ openssl/trunk/debian/changelog	2012-03-17 17:08:58 UTC (rev 546)
@@ -7,8 +7,8 @@
       the new functions.
   * Disable modexp512-x86_64 and the new RSAX internal engine for now, the
     perl script to generate modexp512-x86_64 has some problems.
-  * pic.patch: upstream made OPENSSL_ia32cap_P hidden on amd64, no need to
-    access it PIC anymore.
+  * pic.patch: upstream made OPENSSL_ia32cap_P and OPENSSL_cpuid_setup
+    hidden on amd64, no need to access it PIC anymore.
   * pic.patch: Make OPENSSL_ia32cap_P hidden on i386 too (Closes: #663977)
   * Enable hardening using dpkg-buildflags (Closes: #653495)
 

Modified: openssl/trunk/debian/patches/pic.patch
===================================================================
--- openssl/trunk/debian/patches/pic.patch	2012-03-17 16:39:05 UTC (rev 545)
+++ openssl/trunk/debian/patches/pic.patch	2012-03-17 17:08:58 UTC (rev 546)
@@ -1,41 +1,3 @@
-Index: openssl-1.0.1/crypto/Makefile
-===================================================================
---- openssl-1.0.1.orig/crypto/Makefile	2011-12-10 02:37:55.000000000 +0100
-+++ openssl-1.0.1/crypto/Makefile	2012-03-17 14:03:25.000000000 +0100
-@@ -60,7 +60,7 @@
- 	echo "  #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
- 	echo '#endif' ) >buildinf.h
- 
--x86cpuid.s:	x86cpuid.pl perlasm/x86asm.pl
-+x86cpuid.S:	x86cpuid.pl perlasm/x86asm.pl
- 	$(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
- 
- applink.o:	$(TOP)/ms/applink.c
-@@ -72,7 +72,7 @@
- uplink-x86.s:	$(TOP)/ms/uplink-x86.pl
- 	$(PERL) $(TOP)/ms/uplink-x86.pl $(PERLASM_SCHEME) > $@
- 
--x86_64cpuid.s: x86_64cpuid.pl;	$(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
-+x86_64cpuid.S: x86_64cpuid.pl;	$(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
- ia64cpuid.s: ia64cpuid.S;	$(CC) $(CFLAGS) -E ia64cpuid.S > $@
- ppccpuid.s:	ppccpuid.pl;	$(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
- pariscid.s:	pariscid.pl;	$(PERL) pariscid.pl $(PERLASM_SCHEME) $@
-Index: openssl-1.0.1/crypto/x86_64cpuid.pl
-===================================================================
---- openssl-1.0.1.orig/crypto/x86_64cpuid.pl	2011-11-14 22:01:16.000000000 +0100
-+++ openssl-1.0.1/crypto/x86_64cpuid.pl	2012-03-17 14:03:25.000000000 +0100
-@@ -20,7 +20,11 @@
- .extern		OPENSSL_cpuid_setup
- .hidden		OPENSSL_cpuid_setup
- .section	.init
-+#ifdef OPENSSL_PIC
-+	call	OPENSSL_cpuid_setup\@PLT
-+#else
- 	call	OPENSSL_cpuid_setup
-+#endif
- 
- .hidden	OPENSSL_ia32cap_P
- .comm	OPENSSL_ia32cap_P,8,4
 Index: openssl-1.0.1/crypto/des/asm/desboth.pl
 ===================================================================
 --- openssl-1.0.1.orig/crypto/des/asm/desboth.pl	2001-10-24 23:20:56.000000000 +0200
@@ -77,19 +39,6 @@
  
  	&stack_pop(3);
  	&mov($L,&DWP(0,"ebx","",0));
-Index: openssl-1.0.1/crypto/rc4/Makefile
-===================================================================
---- openssl-1.0.1.orig/crypto/rc4/Makefile	2011-11-14 21:42:21.000000000 +0100
-+++ openssl-1.0.1/crypto/rc4/Makefile	2012-03-17 14:03:25.000000000 +0100
-@@ -44,7 +44,7 @@
- rc4-586.s:	asm/rc4-586.pl ../perlasm/x86asm.pl
- 	$(PERL) asm/rc4-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
- 
--rc4-x86_64.s: asm/rc4-x86_64.pl
-+rc4-x86_64.S: asm/rc4-x86_64.pl
- 	$(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@
- rc4-md5-x86_64.s:	asm/rc4-md5-x86_64.pl
- 	$(PERL) asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) > $@
 Index: openssl-1.0.1/crypto/perlasm/cbc.pl
 ===================================================================
 --- openssl-1.0.1.orig/crypto/perlasm/cbc.pl	2011-07-13 08:22:46.000000000 +0200
@@ -146,19 +95,6 @@
  
  	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
  	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
-Index: openssl-1.0.1/crypto/perlasm/x86_64-xlate.pl
-===================================================================
---- openssl-1.0.1.orig/crypto/perlasm/x86_64-xlate.pl	2012-03-13 20:19:31.000000000 +0100
-+++ openssl-1.0.1/crypto/perlasm/x86_64-xlate.pl	2012-03-17 14:03:25.000000000 +0100
-@@ -786,7 +786,7 @@
- 
-     chomp($line);
- 
--    $line =~ s|[#!].*$||;	# get rid of asm-style comments...
-+#    $line =~ s|[#!].*$||;	# get rid of asm-style comments...
-     $line =~ s|/\*.*\*/||;	# ... and C-style comments...
-     $line =~ s|^\s+||;		# ... and skip white spaces in beginning
- 
 Index: openssl-1.0.1/crypto/perlasm/x86gas.pl
 ===================================================================
 --- openssl-1.0.1.orig/crypto/perlasm/x86gas.pl	2011-12-09 20:16:35.000000000 +0100
@@ -189,19 +125,6 @@
  ___
      }
      elsif ($::coff)
-Index: openssl-1.0.1/crypto/aes/Makefile
-===================================================================
---- openssl-1.0.1.orig/crypto/aes/Makefile	2011-11-14 21:42:21.000000000 +0100
-+++ openssl-1.0.1/crypto/aes/Makefile	2012-03-17 14:03:25.000000000 +0100
-@@ -55,7 +55,7 @@
- aesni-x86.s:	asm/aesni-x86.pl ../perlasm/x86asm.pl
- 	$(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
- 
--aes-x86_64.s: asm/aes-x86_64.pl
-+aes-x86_64.S: asm/aes-x86_64.pl
- 	$(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@
- vpaes-x86_64.s:	asm/vpaes-x86_64.pl
- 	$(PERL) asm/vpaes-x86_64.pl $(PERLASM_SCHEME) > $@
 Index: openssl-1.0.1/crypto/x86cpuid.pl
 ===================================================================
 --- openssl-1.0.1.orig/crypto/x86cpuid.pl	2012-02-28 15:20:34.000000000 +0100