From e93a38d535f2c29b55a5756d2de99425986b0bf3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Aug 2024 11:06:02 +0100 Subject: gentoo auto-resync : 11:08:2024 - 11:06:01 --- app-crypt/Manifest.gz | Bin 25280 -> 25285 bytes app-crypt/eid-mw/Manifest | 9 +- app-crypt/eid-mw/eid-mw-5.1.18.ebuild | 110 --------------------- app-crypt/eid-mw/eid-mw-5.1.19.ebuild | 91 +++++++++++++++++ app-crypt/eid-mw/eid-mw-9999.ebuild | 32 ++---- .../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 +++++++++ 8 files changed, 219 insertions(+), 139 deletions(-) delete mode 100644 app-crypt/eid-mw/eid-mw-5.1.18.ebuild create mode 100644 app-crypt/eid-mw/eid-mw-5.1.19.ebuild create mode 100644 app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch create mode 100644 app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch create mode 100644 app-crypt/eid-mw/files/0001-Remove-uml-build.patch (limited to 'app-crypt') diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index d3384a315796..9f564119ee37 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index 4f4f016b17cf..178d4001635d 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1,4 +1,7 @@ -DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76 SHA512 1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7 -EBUILD eid-mw-5.1.18.ebuild 2722 BLAKE2B 97c9396d17975db0c9bd60316631be378d9076388a5f1138c7c46980bd4084b58c74a5b37ef5f1c9b263fd3a8185483794b2a7769d59cb84f3e12bdd533ce8fb SHA512 857bb597cc53c60fdd6983b3649dbd663f83d2e7c7f7393b5473c47284c9e124906c1a02b3eebecf5c61b808f085cc1ae01698cbf2f33ad3af3c802a886e4510 -EBUILD eid-mw-9999.ebuild 2481 BLAKE2B ee16cfa263d10a0d1c5775279e6678c3c6f24503d83ff1a2721cbf11468104de9f02b861e3519490cfe24e5ea166c76c326679c5b123930c1354aa1b5b6db383 SHA512 e8dd7c1b5ddeecb6248d439c284d62ee3887c2b75e0dc7c6477d12be292c16b5cf365d7b305c0ec483e2d8d5638618ed6a016424d30336572314af8a6b336f60 +AUX 0001-Do-not-build-xpi-module.patch 1267 BLAKE2B d35ad7299e89520a085f07a5594b2dc9e97f1e91878681482978ee904ae8d62639967b33789cf0306efeed657cd531c2eac91ec7f08a1755513fc94e06fc7058 SHA512 d2f1b4c364d8a098b9afd50e2746a977330c3a7f1846ba9ec30678b3abe275840e508d60c1055cfcffd655893f8fb9b5ceb3109326f377e7fc6d80af87eb1d6f +AUX 0001-Fix-libdir-for-manifestdir.patch 1116 BLAKE2B 39c38824a3021d88d80fe75237d73a28013b3c5c8abac4e5e80d6b9377f0e57b0899d32e725a975cfeef4bd163fe167c8c71e61bebf5e27ea7a149531ec486d9 SHA512 d513728dedd269f99afc60b12347ffe79c05963d87535835b670a93522cf904d1dd93108bbbed3ad7a7d2568ab4b548c269b6b386bd7e14eab09a4d36dc0fa65 +AUX 0001-Remove-uml-build.patch 2052 BLAKE2B 321f136a1e4bc4e43a20b10d18a5cd112fc4fc111d4d7a3b47bf19f6187b467ed81c3825672bbe4b3309ab0bbe65d60dcf7dd9dd18cbb427dec05f0c598227d2 SHA512 9fcd2d75fb9f018a4dac2e5c42fea45bbd3a33c1e52cf554871a903a36807b38381e013f65aba115e16178e5a981fb57fc9e2699c664e145301c8095ef99ae48 +DIST eid-mw-5.1.19.tar.gz 16299622 BLAKE2B a66c861c1120851ecbfd66de4b61db2c2f0951735982365ad516f2cf31249e7241180829e2992738821ecbd09c0fd83a0cba11cf34b23cdc45bfd9899072777a SHA512 9383fa4661a6e46510c3c0f1509aa9c9ee772b7222faacdad3de9433529591c9e7b102d954363f345e47104f4f0473e241c0be57d1049936842e67dac45adc2f +EBUILD eid-mw-5.1.19.ebuild 2101 BLAKE2B 8540bacf591526fc3c8e7bd48ecb661d55ce8c0d7a139fbaa07b4d0e9d602f815d81e1e5c677e3b65f988368bf1bc6884c9cb4d4fdd50687b1b7ff639ef80623 SHA512 b78678deaecf2444a8b0eca492c1237aa0891f5c484efcf5c873d3228e8511724b988bedb75c1755829bc75af26dceb25417be30b0d0da9b43371b55fa67d543 +EBUILD eid-mw-9999.ebuild 1859 BLAKE2B 2e5cfc79f05f77415e9d9d2d3dd63675421a73b30c2870e204f9d6593b712596637b9fa132625276f7fb2c96bfbbe29047df8299e31531640361b4e2dc8e5dae SHA512 bc81df919a9b7b487916f026f667fa2368fa89525a8403cb922fbc5657273dc2b01f3370c1397bec14dd58a786215e74e673ad343ee6bb3f5c88820c7aba7f4d MISC metadata.xml 1447 BLAKE2B bf97d239f8d44f8a3bd31e35868335a6286a8ded9d6904a919a5a69eb89a61173aca5eb988455df2ca201e0d687e932a84ff8ed7012a3f9ca3e1eda0627ae9ec SHA512 6c27500bb1dd72027a540745e3916c41af548c1cd277fad02f975dd6431a22a9083bc0a7cdd00d316e2c7a536be0ac484f9b47bebb53121b7647da8699321838 diff --git a/app-crypt/eid-mw/eid-mw-5.1.18.ebuild b/app-crypt/eid-mw/eid-mw-5.1.18.ebuild deleted file mode 100644 index bd390d5174b7..000000000000 --- a/app-crypt/eid-mw/eid-mw-5.1.18.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# 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 )" - -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 - - # xpi module : we don't want it anymore - sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die - sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die - - # hardcoded lsb_info - sed -i \ - -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \ - -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \ - -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \ - plugins_tools/aboutmw/gtk/about-main.c || die - - # Fix libdir for manifestdir - sed -i \ - -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \ - -e "/managed_storage_manifestdir/ s:prefix)/lib:libdir):" \ - cardcomm/pkcs11/src/Makefile.am || die - - # See bug #811270 (remove uml build) - sed -i \ - -e 's:cardlayer/uml::' \ - cardcomm/pkcs11/src/Makefile.am || die - sed -i \ - -e 's:uml::' \ - plugins_tools/eid-viewer/Makefile.am || die - - 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/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/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild index 3c461d2daa95..6b11be857dc4 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -29,34 +29,14 @@ 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 - - # xpi module : we don't want it anymore - sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die - sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die - - # hardcoded lsb_info - sed -i \ - -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \ - -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \ - -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \ - plugins_tools/aboutmw/gtk/about-main.c || die - - # Fix libdir for manifestdir - sed -i \ - -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \ - -e "/managed_storage_manifestdir/ s:prefix)/lib:libdir):" \ - cardcomm/pkcs11/src/Makefile.am || die - - # See bug #811270 (remove uml build) - sed -i \ - -e 's:cardlayer/uml::' \ - cardcomm/pkcs11/src/Makefile.am || die - sed -i \ - -e 's:uml::' \ - plugins_tools/eid-viewer/Makefile.am || die - eautoreconf } 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 +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 +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 +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 ' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@ +-- +2.44.2 + -- cgit v1.2.3