gentoo resync : 19.05.2018

3 files changed, 0 insertions, 122 deletions

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index f16067ea6eeb..42cf256d82ab 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,5 +1,3 @@
-AUX fix_libressl_check.patch 1623 BLAKE2B da42629b930ecb956f8cc48b60ccbf4fe2f250cbd66a6cc93e0bf88bbd634c3d7bb8be40f1c9f19d011aadebc5cba60f3ca6fcbbaf2a7312d7daaa0e56e9c302 SHA512 0d834c62623e312b37e5908dbe6738efc726ae036bb7576cd25cb88156519dee17e35711ae4d583aeb4ea17e7220ff3210334c78d1e314fa0b972025250194fd
-AUX gtk_not_required_4_2_5.patch 3495 BLAKE2B fa99e1ad8695795dd1c8d1a1fc0041fa7138d82fee98d98ef359141dc03d18cbeeaae4f1ad151f19b15ed1de37c387aeadcb3d69b6f79791a650e243faf2710d SHA512 9c5e1b614bb4230b67e1c11fed3693c1aae0b982ca7c5a26678ee6af7da48d0ef2eef479335d498ea5f75408a2a957763a611367aa39585c50ed2556aa09232b
 DIST eid-mw-4.3.6.tar.gz 7515482 BLAKE2B 8895564736be83ad2f9797a6cfcbc6cb50a928c36508b9ddcf8e9032d7b4de9284745d711a7664edba106ad005a63eb1fddb5c1e639305b4af12f49ab8dbc61c SHA512 336181c21896bec0e7a0a67f5bc739fdc63ca7b17eb6fefa98b6d468810fcdb52ecb6a64f267cdcfc063a2ef599d033064ec90b6bb41ec7ceccc2ca8e829a82b
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
 EBUILD eid-mw-4.3.6.ebuild 2376 BLAKE2B 83e666feb86ac93a1a3e4d3047cf871e6c62f04158767c6006c56d264c3327dabcb4059284857451431e22ac092aed3e5e47a4b9b6438f72dabec47d45008c58 SHA512 254c74676ceee8b5d7f3ccfe6efbc77fc3ce0a663f824ae91eb48a604354918da30b2c9ef48c4ffbe5cbab681c582bda94c1e8abf976898d8ba3513acca5d03b
diff --git a/app-crypt/eid-mw/files/fix_libressl_check.patch b/app-crypt/eid-mw/files/fix_libressl_check.patch
deleted file mode 100644
index 5476e3e4aaff..000000000000
--- a/app-crypt/eid-mw/files/fix_libressl_check.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 53289f71c53f3aa8047b34d6db9b0ca2ac35f4cb
-Author: Cédric Krier <ced@b2ck.com>
-Date:   Wed Jun 7 11:29:13 2017 +0200
-
-    Fix OpenSSL version check for LibreSSL
-
-diff --git a/plugins_tools/eid-viewer/certhelpers.c b/plugins_tools/eid-viewer/certhelpers.c
-index de9f8bf4..1e3d1ee1 100644
---- a/plugins_tools/eid-viewer/certhelpers.c
-+++ b/plugins_tools/eid-viewer/certhelpers.c
-@@ -12,7 +12,7 @@
- 
- #include "backend.h"
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_get0_extensions(ce) ((ce)->cert_info->extensions)
- #define ASN1_STRING_get0_data ASN1_STRING_data
- #endif
-diff --git a/plugins_tools/eid-viewer/verify.c b/plugins_tools/eid-viewer/verify.c
-index 04016a44..f144d2cb 100644
---- a/plugins_tools/eid-viewer/verify.c
-+++ b/plugins_tools/eid-viewer/verify.c
-@@ -22,7 +22,7 @@
- #endif
- // All valid OCSP URLs should have the following as their prefix:
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_get0_extensions(ce) ((ce)->cert_info->extensions)
- 
- #define X509_get0_tbs_sigalg(ci) ((ci)->sig_alg)
-diff --git a/tests/unit/sign.c b/tests/unit/sign.c
-index 31a1ab7a..0e0e3011 100644
---- a/tests/unit/sign.c
-+++ b/tests/unit/sign.c
-@@ -37,7 +37,7 @@
- #include <openssl/rsa.h>
- #include <openssl/engine.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
- 	if(!r || !n || !e) {
- 		return 0;
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch
deleted file mode 100644
index a1680c2353d0..000000000000
--- a/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 393ecb3..0e14661 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc
- 
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
- 
- xpipackage:
- 	$(MAKE) -C plugins_tools/xpi xpipackage
-diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index 02e4e36..86d607b 100644
---- a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \
- 	dialogs/dialogsgtk/single_dialog.c
- endif
- 
--libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
- 
- if P11KIT
- dist_p11kitcf_DATA = beid.module
-@@ -176,30 +175,4 @@ install-exec-hook:
- 		$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
- endif
- 
--beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
--beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_askpin_LDADD = @GTK_LIBS@
--
--beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
--beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_changepin_LDADD = @GTK_LIBS@
--
--beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
--beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_badpin_LDADD = @GTK_LIBS@
--
--beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
--beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_askaccess_LDADD = @GTK_LIBS@
--
--beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
--beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_spr_askpin_LDADD = @GTK_LIBS@
--
--beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
--beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_spr_changepin_LDADD = @GTK_LIBS@
--
- pkgconfig_DATA=libbeidpkcs11.pc
--
--SUBDIRS = dialogs/dialogsgtk/po
-diff --git a/configure.ac b/configure.ac
-index 9bf10f9..f0120b1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,14 +59,6 @@ fi
- 
- AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
- 
--if test "$have_gtk" = "no"
--then
--	AC_MSG_ERROR([At least one version of GTK is required.])
--fi
--
--PKG_CHECK_MODULES([XML2], [libxml-2.0])
--PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
--
- ###########################################################################
- ####### read user-specific requests from --enable directives         ######
- ###########################################################################