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

Thu Apr 21 21:33:42 UTC 2016

Author: kroeckx
Date: 2016-04-21 21:33:42 +0000 (Thu, 21 Apr 2016)
New Revision: 770

Added:
   openssl/trunk/debian/libssl1.0.2-udeb.dirs
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/control
   openssl/trunk/debian/patches/debian-targets.patch
   openssl/trunk/debian/rules
Log:
Use assembler of arm64
Add a udeb for libssl


Modified: openssl/trunk/debian/changelog
===================================================================

--- openssl/trunk/debian/changelog	2016-03-01 18:32:33 UTC (rev 769)
+++ openssl/trunk/debian/changelog	2016-04-21 21:33:42 UTC (rev 770)
@@ -1,3 +1,13 @@
+openssl (1.0.2g-2) unstable; urgency=medium
+
+  * Use assembler of arm64 (Closes: #794326)
+    Patch from Riku Voipio <riku.voipio at iki.fi>
+  * Add a udeb for libssl, based on similar changes done in Ubuntu
+    starting in version 0.9.8o-4ubuntu1 (Closes: #802591)
+    Patch from Margarita Manterola <marga at google.com>
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Thu, 21 Apr 2016 23:13:13 +0200
+
 openssl (1.0.2g-1) unstable; urgency=high
 
   * New upstream version

Modified: openssl/trunk/debian/control
===================================================================
--- openssl/trunk/debian/control	2016-03-01 18:32:33 UTC (rev 769)
+++ openssl/trunk/debian/control	2016-04-21 21:33:42 UTC (rev 770)
@@ -55,6 +55,17 @@
  It contains a version of the libcrypto shared library for use with the
  Debian Installer. Do not install it on a normal system.
 
+Package: libssl1.0.2-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ssl shared library - udeb
+ libssl shared library.
+ .
+ Do not install it on a normal system.
+
 Package: libssl-dev
 Section: libdevel
 Priority: optional

Added: openssl/trunk/debian/libssl1.0.2-udeb.dirs
===================================================================
--- openssl/trunk/debian/libssl1.0.2-udeb.dirs	                        (rev 0)
+++ openssl/trunk/debian/libssl1.0.2-udeb.dirs	2016-04-21 21:33:42 UTC (rev 770)
@@ -0,0 +1 @@
+usr/lib

Modified: openssl/trunk/debian/patches/debian-targets.patch
===================================================================
--- openssl/trunk/debian/patches/debian-targets.patch	2016-03-01 18:32:33 UTC (rev 769)
+++ openssl/trunk/debian/patches/debian-targets.patch	2016-04-21 21:33:42 UTC (rev 770)
@@ -1,8 +1,8 @@
-Index: openssl-1.0.2f/Configure
+Index: openssl-1.0.2g/Configure
 ===================================================================
---- openssl-1.0.2f.orig/Configure
-+++ openssl-1.0.2f/Configure
-@@ -127,6 +127,10 @@ my $clang_devteam_warn = "-Wno-unused-pa
+--- openssl-1.0.2g.orig/Configure
++++ openssl-1.0.2g/Configure
+@@ -131,6 +131,10 @@ my $clang_devteam_warn = "-Wno-unused-pa
  # Warn that "make depend" should be run?
  my $warn_make_depend = 0;
  
@@ -13,7 +13,7 @@
  my $strict_warnings = 0;
  
  my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
-@@ -363,6 +367,55 @@ my %table=(
+@@ -367,6 +371,55 @@ my %table=(
  "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
  "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",
  
@@ -21,7 +21,7 @@
 +"debian-alpha","gcc:${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:${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:${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-arm64","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-arm64","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-armel","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-armhf","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-amd64", "gcc:-m64 -DL_ENDIAN ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::",

Modified: openssl/trunk/debian/rules
===================================================================
--- openssl/trunk/debian/rules	2016-03-01 18:32:33 UTC (rev 769)
+++ openssl/trunk/debian/rules	2016-04-21 21:33:42 UTC (rev 770)
@@ -139,6 +139,7 @@
 	mv debian/tmp/usr/lib/ssl/{certs,openssl.cnf,private} debian/tmp/etc/ssl/
 	ln -s /etc/ssl/{certs,openssl.cnf,private} debian/tmp/usr/lib/ssl/
 	cp -pf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcrypto.so.* debian/libcrypto1.0.2-udeb/usr/lib/
+	cp -pf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so.* debian/libssl1.0.2-udeb/usr/lib/
 	cp -auv lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 	for opt in $(OPTS); do set -xe; mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt; cp -auv $$opt/lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt/; done
 	mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl
@@ -162,6 +163,7 @@
 	dh_perl -a -d
 	dpkg-gensymbols -Pdebian/libssl1.0.2/ -plibssl1.0.2 -c4
 	dh_makeshlibs -a -V "libssl1.0.2" --add-udeb="libcrypto1.0.2-udeb" -Xengines
+	sed -i '/^udeb: libssl/s/libcrypto1.0.2-udeb/libssl1.0.2-udeb/' debian/libssl1.0.2/DEBIAN/shlibs
 	dh_shlibdeps -a -L libssl1.0.2 -l debian/libssl1.0.2/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_gencontrol -a
 	dh_installdeb -a


