commit: 8ebd1d9a0846f5e8110a22bb88f428ae343c19c3 Author: Vincent Hardy <vincent.hardy.be <AT> gmail <DOT> com> AuthorDate: Sat Aug 10 13:51:24 2024 +0000 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> CommitDate: Sat Aug 10 13:52:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebd1d9a
app-crypt/eid-mw: add 5.1.19 Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> app-crypt/eid-mw/Manifest | 1 + app-crypt/eid-mw/eid-mw-5.1.19.ebuild | 91 ++++++++++++++++++++++ .../files/0001-Do-not-build-xpi-module.patch | 38 +++++++++ .../files/0001-Fix-libdir-for-manifestdir.patch | 30 +++++++ app-crypt/eid-mw/files/0001-Remove-uml-build.patch | 48 ++++++++++++ 5 files changed, 208 insertions(+) diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index 623c7a009f28..f2415a4abd3b 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1 +1,2 @@ DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76 SHA512 1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7 +DIST eid-mw-5.1.19.tar.gz 16299622 BLAKE2B a66c861c1120851ecbfd66de4b61db2c2f0951735982365ad516f2cf31249e7241180829e2992738821ecbd09c0fd83a0cba11cf34b23cdc45bfd9899072777a SHA512 9383fa4661a6e46510c3c0f1509aa9c9ee772b7222faacdad3de9433529591c9e7b102d954363f345e47104f4f0473e241c0be57d1049936842e67dac45adc2f diff --git a/app-crypt/eid-mw/eid-mw-5.1.19.ebuild b/app-crypt/eid-mw/eid-mw-5.1.19.ebuild new file mode 100644 index 000000000000..905a49b49f47 --- /dev/null +++ b/app-crypt/eid-mw/eid-mw-5.1.19.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop gnome2-utils + +DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" +HOMEPAGE="https://eid.belgium.be"; +SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="+dialogs +gtk p11-kit" + +RDEPEND="sys-apps/pcsc-lite + gtk? ( + x11-libs/gdk-pixbuf[jpeg] + x11-libs/gtk+:3 + dev-libs/libxml2 + net-misc/curl[ssl] + net-libs/libproxy + app-crypt/pinentry[gtk] + ) + p11-kit? ( app-crypt/p11-kit )" + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +REQUIRED_USE="dialogs? ( gtk )" + +PATCHES=( + "${FILESDIR}/0001-Do-not-build-xpi-module.patch" + "${FILESDIR}/0001-Fix-libdir-for-manifestdir.patch" + "${FILESDIR}/0001-Remove-uml-build.patch" + ) + +src_prepare() { + default + + # Buggy internal versioning when autoreconf a tarball release. + # Weird numbering is required otherwise we get a seg fault in + # about-eid-mw program. + echo "${PV}-v${PV}" > .version + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable dialogs) \ + $(use_enable p11-kit p11kit) \ + $(use_with gtk gtkvers '3') \ + --with-gnu-ld +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die + if use gtk; then + domenu plugins_tools/eid-viewer/eid-viewer.desktop + doicon plugins_tools/eid-viewer/gtk/eid-viewer.png + fi +} + +pkg_postinst() { + if use gtk; then + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update + + local peimpl=$(eselect --brief --colour=no pinentry show) + case "${peimpl}" in + *gnome*|*qt*) ;; + *) ewarn "The pinentry front-end currently selected is not supported by eid-mw." + ewarn "You may be prompted for your pin code in an inaccessible shell!!" + ewarn "Please select pinentry-gnome3 as default pinentry provider:" + ewarn " # eselect pinentry set pinentry-gnome3" + ;; + esac + fi +} + +pkg_postrm() { + if use gtk; then + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update + fi +} 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 <[email protected]> +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 <[email protected]> +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 = [email protected] + + 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 <[email protected]> +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 +
