[Pkg-openssl-devel] Bug#823774: openssl: please drop i686/cmov flavour

[Aurelien Jarno]

Package: openssl
Version: 1.0.2h-1
Severity: normal

Dear Maintainer,

Now that GCC defaults to i686, there is no real point in building an
i686 flavor. In addition the i686/cmov directory is debian specific, and
in the long term we would like to get rid of the patch in the libc.

The patch below should do it, but you probably know the package better
than I do.

Thanks,
Aurelien


diff -Nru openssl-1.0.2h/debian/libssl1.0.2.files openssl-1.0.2h/debian/libssl1.0.2.files
--- openssl-1.0.2h/debian/libssl1.0.2.files	2015-09-06 17:59:08.000000000 +0200
+++ openssl-1.0.2h/debian/libssl1.0.2.files	2016-05-08 17:00:46.000000000 +0200
@@ -1,4 +1,3 @@
 usr/lib/*/*.so.*.*.*
 usr/lib/*/*/*.so.*.*.*
-usr/lib/*/i686/cmov/*.so.*.*.*
 usr/lib/*/openssl-1.0.2/engines
diff -Nru openssl-1.0.2h/debian/rules openssl-1.0.2h/debian/rules
--- openssl-1.0.2h/debian/rules	2016-04-21 23:42:56.000000000 +0200
+++ openssl-1.0.2h/debian/rules	2016-05-08 16:57:03.000000000 +0200
@@ -28,7 +28,6 @@
 
 CONFARGS  = --prefix=/usr --openssldir=/usr/lib/ssl --libdir=lib/$(DEB_HOST_MULTIARCH) no-idea no-mdc2 no-rc5 no-zlib  enable-tlsext no-ssl2 no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
 OPT_alpha = ev4 ev5
-OPT_i386  = i686/cmov
 ARCHOPTS  = OPT_$(DEB_HOST_ARCH)
 OPTS      = $($(ARCHOPTS))
 WANTED_LIBC_VERSION = 2.3.1-10


-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.5.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)