* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/
@ 2016-03-17 5:09 Ian Delaney
0 siblings, 0 replies; 4+ messages in thread
From: Ian Delaney @ 2016-03-17 5:09 UTC (permalink / raw
To: gentoo-commits
commit: 64f91d4811beb99d9bcdf37bc18d7221bf1add4d
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 04:56:13 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 05:07:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f91d48
app-crypt/eid-mw: update to gtk_not_required_9999.patch in live ebuild
patch supplied by maintainer via email
Package-Manager: portage-2.2.26
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 43 ++++++++--------------
1 file changed, 15 insertions(+), 28 deletions(-)
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
index 93ddc67..d5d6f1c 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
@@ -12,48 +12,38 @@ index 1a605f7..6475886 100644
xpipackage:
$(MAKE) -C plugins_tools/xpi xpipackage
diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index b70e7f2..066c348 100644
+index 6e33315..fce4494 100644
--- a/cardcomm/pkcs11/src/Makefile.am
+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,30 +165,30 @@ libbeidpkcs11_la_SOURCES += \
+@@ -165,8 +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
-+#libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-
+ if P11KIT
+ dist_p11kitcf_DATA = beid.module
+ install-exec-hook:
+@@ -176,28 +174,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@
-beid_askpin_LDADD = @GTK_LIBS@
-+#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@
-+#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@
-+#beid_changepin_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@
-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@
-+#beid_badpin_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@
-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@
-+#beid_askaccess_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@
-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@
-+#beid_spr_askpin_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@
-beid_spr_askpin_LDADD = @GTK_LIBS@
@@ -61,13 +51,10 @@ index b70e7f2..066c348 100644
-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@
-beid_spr_changepin_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@
-+#beid_spr_changepin_LDADD = @GTK_LIBS@
-
+-
pkgconfig_DATA=libbeidpkcs11.pc
diff --git a/configure.ac b/configure.ac
-index 102c1c7..efdf0e2 100644
+index 6f4b833..ec7ae8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,11 +56,6 @@ then
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/
@ 2017-04-08 8:08 Amy Liffey
0 siblings, 0 replies; 4+ messages in thread
From: Amy Liffey @ 2017-04-08 8:08 UTC (permalink / raw
To: gentoo-commits
commit: eaa706cbf986a2b286670f1a180f5886149bada0
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 8 08:04:42 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Apr 8 08:08:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa706cb
app-crypt/eid-mw: live ebuild patch updated. Vincent Hardy
Package-Manager: portage-2.3.0
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 31 +++++++++++-----------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
index 7990acaebdd..a1680c2353d 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
@@ -1,60 +1,61 @@
diff --git a/Makefile.am b/Makefile.am
-index de5416f..8e55277 100644
+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 debian rpm doc
+ 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
++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 6e33315..fce4494 100644
+index 02e4e36..86d607b 100644
--- a/cardcomm/pkcs11/src/Makefile.am
+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \
+@@ -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
- install-exec-hook:
-@@ -176,28 +174,4 @@ install-exec-hook:
+@@ -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@
+-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@
+-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@
+-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@
+-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@
+-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@
+-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 92bbb3b..a47e7c2 100644
+index 9bf10f9..f0120b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,14 +59,6 @@ fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/
@ 2018-01-13 22:41 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2018-01-13 22:41 UTC (permalink / raw
To: gentoo-commits
commit: b01f5c6f8297e0493d963734f9dd3239369464cb
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jan 13 20:01:53 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 22:40:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01f5c6f
app-crypt/eid-mw: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/6853
app-crypt/eid-mw/files/gtk_not_required_4_2.patch | 74 -----------------------
1 file changed, 74 deletions(-)
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
deleted file mode 100644
index 7990acaebdd..00000000000
--- a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index de5416f..8e55277 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath 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 6e33315..fce4494 100644
---- a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,8 +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
- install-exec-hook:
-@@ -176,28 +174,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@
--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@
--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@
--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@
--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@
--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@
--beid_spr_changepin_LDADD = @GTK_LIBS@
--
- pkgconfig_DATA=libbeidpkcs11.pc
-diff --git a/configure.ac b/configure.ac
-index 92bbb3b..a47e7c2 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 ######
- ###########################################################################
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/
@ 2018-05-18 12:34 Aaron Bauman
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Bauman @ 2018-05-18 12:34 UTC (permalink / raw
To: gentoo-commits
commit: ae946489b28c15941ceb2f1607e0c3f16feb3845
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu May 17 08:23:42 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri May 18 12:33:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae946489
app-crypt/eid-mw: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/8447
app-crypt/eid-mw/files/fix_libressl_check.patch | 45 -------------
.../eid-mw/files/gtk_not_required_4_2_5.patch | 75 ----------------------
2 files changed, 120 deletions(-)
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 5476e3e4aaf..00000000000
--- 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 a1680c2353d..00000000000
--- 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 ######
- ###########################################################################
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-18 12:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-08 8:08 [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/ Amy Liffey
-- strict thread matches above, loose matches on Subject: below --
2018-05-18 12:34 Aaron Bauman
2018-01-13 22:41 David Seifert
2016-03-17 5:09 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox