diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-crypt/eid-mw/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'app-crypt/eid-mw/files')
-rw-r--r-- | app-crypt/eid-mw/files/fix_libressl_check.patch | 45 | ||||
-rw-r--r-- | app-crypt/eid-mw/files/gtk_not_required_4_2.patch | 74 | ||||
-rw-r--r-- | app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch | 75 |
3 files changed, 194 insertions, 0 deletions
diff --git a/app-crypt/eid-mw/files/fix_libressl_check.patch b/app-crypt/eid-mw/files/fix_libressl_check.patch new file mode 100644 index 000000000000..5476e3e4aaff --- /dev/null +++ b/app-crypt/eid-mw/files/fix_libressl_check.patch @@ -0,0 +1,45 @@ +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.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch new file mode 100644 index 000000000000..7990acaebdd2 --- /dev/null +++ b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch @@ -0,0 +1,74 @@ +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 ###### + ########################################################################### 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 new file mode 100644 index 000000000000..a1680c2353d0 --- /dev/null +++ b/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch @@ -0,0 +1,75 @@ +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 ###### + ########################################################################### |