summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Hardy <vincent.hardy.be@gmail.com>2024-08-10 15:51:24 +0200
committerAmy Liffey <amynka@gentoo.org>2024-08-10 15:52:52 +0200
commit8ebd1d9a0846f5e8110a22bb88f428ae343c19c3 (patch)
tree3a6e6d6f97a8a42cfc968dd904fe01edaf3c94dc /app-crypt/eid-mw/files
parentdev-python/magic-wormhole-transit-relay: Add test-dep on mock (diff)
downloadgentoo-8ebd1d9a0846f5e8110a22bb88f428ae343c19c3.tar.gz
gentoo-8ebd1d9a0846f5e8110a22bb88f428ae343c19c3.tar.bz2
gentoo-8ebd1d9a0846f5e8110a22bb88f428ae343c19c3.zip
app-crypt/eid-mw: add 5.1.19
Signed-off-by: Amy Liffey <amynka@gentoo.org>
Diffstat (limited to 'app-crypt/eid-mw/files')
-rw-r--r--app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch38
-rw-r--r--app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch30
-rw-r--r--app-crypt/eid-mw/files/0001-Remove-uml-build.patch48
3 files changed, 116 insertions, 0 deletions
diff --git a/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch b/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch
new file mode 100644
index 000000000000..6bea1b0056a6
--- /dev/null
+++ b/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch
@@ -0,0 +1,38 @@
+From 2e5b6e80acc9ffc42afe329facdcb443dca21a34 Mon Sep 17 00:00:00 2001
+From: Vincent Hardy <vincent.hardy.be@gmail.com>
+Date: Thu, 8 Aug 2024 10:30:27 +0200
+Subject: [PATCH] Do not build xpi module
+
+xpi module has to be installed by the users
+---
+ Makefile.am | 2 +-
+ configure.ac | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 209a83c85..1073a8141 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/v240 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/chrome_pkcs11 tests/fuzz
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/v240 plugins_tools/util tests/unit plugins_tools/chrome_pkcs11 tests/fuzz
+
+ if GTK
+ SUBDIRS += plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
+diff --git a/configure.ac b/configure.ac
+index 845e8487c..b729bb870 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -275,6 +275,5 @@ AC_CONFIG_FILES([Makefile
+ plugins_tools/eid-viewer/gtk/eid-viewer.desktop.sh
+ plugins_tools/eid-viewer/uml/Makefile
+ rpm/eid-mw.spec])
+-AC_CONFIG_SUBDIRS([plugins_tools/xpi])
+
+ AC_OUTPUT
+--
+2.44.2
+
diff --git a/app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch b/app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch
new file mode 100644
index 000000000000..4121c208725c
--- /dev/null
+++ b/app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch
@@ -0,0 +1,30 @@
+From feb0032d95568e7f0dd1736ac773363cc778ce59 Mon Sep 17 00:00:00 2001
+From: Vincent Hardy <vincent.hardy.be@gmail.com>
+Date: Thu, 8 Aug 2024 10:58:44 +0200
+Subject: [PATCH] Fix libdir for manifestdir
+
+See also https://github.com/Fedict/eid-mw/pull/199
+---
+ cardcomm/pkcs11/src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 33201b147..ddc410fb4 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -211,10 +211,10 @@ beid_spr_changepin_LDADD = @GTK_LIBS@
+ metainfodir = $(datarootdir)/metainfo
+ dist_metainfo_DATA = be.belgium.eid.eidmw.metainfo.xml
+
+-pkcs11_manifestdir = $(prefix)/lib/mozilla/pkcs11-modules
++pkcs11_manifestdir = $(libdir)/mozilla/pkcs11-modules
+ pkcs11_manifest_DATA = beidpkcs11.json beidpkcs11_alt.json
+
+-managed_storage_manifestdir = $(prefix)/lib/mozilla/managed-storage
++managed_storage_manifestdir = $(libdir)/mozilla/managed-storage
+ managed_storage_manifest_DATA = belgiumeid@eid.belgium.be.json
+
+ pkgconfig_DATA=libbeidpkcs11.pc
+--
+2.44.2
+
diff --git a/app-crypt/eid-mw/files/0001-Remove-uml-build.patch b/app-crypt/eid-mw/files/0001-Remove-uml-build.patch
new file mode 100644
index 000000000000..6ff056a9876a
--- /dev/null
+++ b/app-crypt/eid-mw/files/0001-Remove-uml-build.patch
@@ -0,0 +1,48 @@
+From 3ad7dc89bdcae1607b90909cb2a5598363da74cf Mon Sep 17 00:00:00 2001
+From: Vincent Hardy <vincent.hardy.be@gmail.com>
+Date: Thu, 8 Aug 2024 15:02:00 +0200
+Subject: [PATCH] Remove uml build
+
+See bug #811270
+---
+ cardcomm/pkcs11/src/Makefile.am | 3 +--
+ plugins_tools/eid-viewer/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 33201b147..5decdfb26 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -148,7 +148,6 @@ noinst_HEADERS = \
+ dialogs/dialogsgtk/gtk_dialog_names.h \
+ fuzz/beid_fuzz.h
+
+-SUBDIRS = cardlayer/uml
+ if NO_DIALOGS
+ libbeidpkcs11_la_CXXFLAGS += -DNO_DIALOGS
+ libbeidpkcs11_la_LIBADD += libbeidcommon.la
+@@ -171,7 +170,7 @@ libdialogs_la_SOURCES = \
+ dialogs/dialogsgtk/dlgs_gtk.cpp \
+ dialogs/dialogsgtk/single_dialog.c
+ libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-SUBDIRS += dialogs/dialogsgtk/po
++SUBDIRS = dialogs/dialogsgtk/po
+ endif
+ endif
+
+diff --git a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am
+index a25746d3d..0a631d41c 100644
+--- a/plugins_tools/eid-viewer/Makefile.am
++++ b/plugins_tools/eid-viewer/Makefile.am
+@@ -139,7 +139,7 @@ libeidviewer_la_LIBADD = $(top_builddir)/plugins_tools/util/liblabels.la $(top_b
+ libeidviewer_la_LDFLAGS = -version-info 1:0:1
+ AM_CFLAGS = @GTK_CFLAGS@ -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/v240 -I$(top_srcdir)/cardcomm/pkcs11/src/fuzz -I$(top_srcdir)/plugins_tools/util @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden @FUZZING@
+ AM_CXXFLAGS = $(AM_CFLAGS) -std=c++98
+-SUBDIRS = . gtk/po test uml
++SUBDIRS = . gtk/po test
+
+ resources/%.c: resources/%.png
+ printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+--
+2.44.2
+