public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/
@ 2015-08-16 18:16 Sven Vermeulen
  0 siblings, 0 replies; 8+ messages in thread
From: Sven Vermeulen @ 2015-08-16 18:16 UTC (permalink / raw
  To: gentoo-commits

commit:     1bfbafda280c28e50b577c835d9fdb42376d1021
Author:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 18:10:57 2015 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 18:16:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bfbafda

app-crypt/eid-mw: Version bump to 4.1.4

As provided by Vincent Hardy, this brings eid-mw to version 4.1.4

Gentoo-Bug: 557604

Package-Manager: portage-2.2.20.1

 app-crypt/eid-mw/Manifest                          |  1 +
 app-crypt/eid-mw/eid-mw-4.1.4.ebuild               | 79 ++++++++++++++++++++++
 .../eid-mw/files/gtk_not_required_4.1.4.patch      | 60 ++++++++++++++++
 3 files changed, 140 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index b5b1c58..9f67898 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
 DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
 DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
+DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398

diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
new file mode 100644
index 0000000..06e154c
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools mozextension multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+		https://github.com/Fedict/${PN}.git"
+	inherit git-2
+	SRC_URI=""
+else
+	MY_P="${P}-v${PV}"
+	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~x86 ~amd64 ~arm"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+gtk +xpi +dialogs"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:* )
+	>=sys-apps/pcsc-lite-1.2.9
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )
+	!app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+
+	if [[ ${PV} == "9999" ]] ; then
+		# Only in current git. Hopefully, in next release.
+		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
+		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+	fi
+
+	if [[ ${PV} == "9999" ]] || ! use gtk ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf $(use_enable dialogs) --disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if [[ ${PV} != "9999" ]] ; then
+		# Automatically done in current git. Hopefully, in next release.
+		rm doc/sdk/include/rsaref220/win32.h
+		doheader -r doc/sdk/include/*
+	fi
+	if use xpi; then
+		declare MOZILLA_FIVE_HOME
+		if has_version '>=www-client/firefox-3.6.20'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+		if has_version '>=www-client/firefox-bin-3.6.24'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+}

diff --git a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
new file mode 100644
index 0000000..137ef8e
--- /dev/null
+++ b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
@@ -0,0 +1,60 @@
+diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am
+--- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am	2015-07-27 10:30:34.638418958 +0200
++++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am	2015-08-13 14:12:43.827586821 +0200
+@@ -164,29 +164,3 @@
+ 	dialogs/dialogsgtk/dlgs_gtk.cpp \
+ 	dialogs/dialogsgtk/single_dialog.c
+ endif
+-
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-
+-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@
+diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
+--- eid-mw-4.1.4-v4.1.4-a/configure.ac	2015-07-27 10:30:34.641752294 +0200
++++ eid-mw-4.1.4-v4.1.4-b/configure.ac	2015-08-13 14:13:51.456736608 +0200
+@@ -55,11 +55,6 @@
+ 	fi
+ fi
+ 
+-if test x"$have_gtk" = "xno"
+-then
+-	AC_MSG_ERROR([At least one version of GTK is required.])
+-fi
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives         ######
+ ###########################################################################
+diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am
+--- eid-mw-4.1.4-v4.1.4-a/Makefile.am	2015-07-27 10:30:34.638418958 +0200
++++ eid-mw-4.1.4-v4.1.4-b/Makefile.am	2015-08-13 14:11:43.878340486 +0200
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
+ 
+-SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
++SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi
+ 
+ xpipackage:
+ 	$(MAKE) -C plugins_tools/xpi xpipackage


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/
@ 2016-03-20 14:44 Ian Delaney
  0 siblings, 0 replies; 8+ messages in thread
From: Ian Delaney @ 2016-03-20 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     e44f81f16070ab97ceb88211c4adc250d67dfdd3
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 10:08:33 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 14:44:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44f81f1

app-crypt/eid-mw: rm old and related patches

Removed files requested byt the proxy maintianer via the

Gentoo-bug: #577642

Package-Manager: portage-2.2.28

 app-crypt/eid-mw/Manifest                          |  2 -
 app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild         | 65 ----------------------
 app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild         | 62 ---------------------
 .../eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch  | 38 -------------
 app-crypt/eid-mw/files/fix-nodialog-bug.patch      | 20 -------
 5 files changed, 187 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index c44af1a..d02c45b 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,4 +1,2 @@
-DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
-DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
 DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
 DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9

diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild b/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild
deleted file mode 100644
index 300793e..0000000
--- a/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator mozextension multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://eid-mw.googlecode.com/svn/trunk/"
-	inherit subversion autotools
-	SRC_URI=""
-else
-	MY_P="${PN}-${PV/_p/-}"
-	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-250016.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-	S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be"
-
-IUSE="+gtk +xpi"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	>=sys-apps/pcsc-lite-1.2.9
-	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )
-	!app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-if [[ ${PV} == "9999" ]]; then
-	src_prepare() {
-		eautoreconf
-	}
-else
-	src_prepare() {
-		epatch "${FILESDIR}"/fix-nodialog-bug.patch
-	}
-fi
-
-src_configure() {
-	econf $(use_enable gtk dialogs) --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	if use xpi; then
-		declare MOZILLA_FIVE_HOME
-		if has_version '>=www-client/firefox-3.6.20'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-		if has_version '>=www-client/firefox-bin-3.6.24'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-	fi
-	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
-}

diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild b/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild
deleted file mode 100644
index 9ef575a..0000000
--- a/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator mozextension multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
-		https://github.com/Fedict/${PN}.git"
-	inherit git-2 autotools
-	SRC_URI=""
-else
-	MY_P="${PN}-${PV/_p/-}"
-	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-	S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be"
-
-IUSE="+gtk +xpi"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	>=sys-apps/pcsc-lite-1.2.9
-	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )
-	!app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-if [[ ${PV} == "9999" ]]; then
-	src_prepare() {
-		eautoreconf
-	}
-fi
-
-src_configure() {
-	econf $(use_enable gtk dialogs) --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	if use xpi; then
-		declare MOZILLA_FIVE_HOME
-		if has_version '>=www-client/firefox-3.6.20'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-		if has_version '>=www-client/firefox-bin-3.6.24'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-	fi
-	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
-}

diff --git a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
deleted file mode 100644
index 1f70c78..0000000
--- a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: eid-mw-4.0.2/common/src/socket/socket.cpp
-===================================================================
---- eid-mw-4.0.2.orig/common/src/socket/socket.cpp
-+++ eid-mw-4.0.2/common/src/socket/socket.cpp
-@@ -21,6 +21,8 @@
- #include "../eiderrors.h"
- #include <iostream>
- 
-+#include <unistd.h>
-+
- namespace eIDMW
- {
- 
-Index: eid-mw-4.0.2/common/src/socket/socketserver.cpp
-===================================================================
---- eid-mw-4.0.2.orig/common/src/socket/socketserver.cpp
-+++ eid-mw-4.0.2/common/src/socket/socketserver.cpp
-@@ -26,6 +26,7 @@
- #include <netinet/in.h>
- #include <sys/ioctl.h>
- #include <errno.h>
-+#include <unistd.h>
- #ifndef SOCKET_ERROR
- #define SOCKET_ERROR -1
- #endif
-Index: eid-mw-4.0.2/common/src/util.cpp
-===================================================================
---- eid-mw-4.0.2.orig/common/src/util.cpp
-+++ eid-mw-4.0.2/common/src/util.cpp
-@@ -27,6 +27,8 @@
- 
- #include <stdlib.h>
- 
-+#include <unistd.h>
-+
- #ifdef WIN32
- #include <windows.h>
- #endif

diff --git a/app-crypt/eid-mw/files/fix-nodialog-bug.patch b/app-crypt/eid-mw/files/fix-nodialog-bug.patch
deleted file mode 100644
index 5ea0032..0000000
--- a/app-crypt/eid-mw/files/fix-nodialog-bug.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: cardlayer/src/pinpadlib.h
-===================================================================
---- cardlayer/src/pinpadlib.h	(revision 1501)
-+++ cardlayer/src/pinpadlib.h	(revision 1502)
-@@ -43,13 +43,14 @@
- #endif
- #ifndef NO_DIALOGS
- #include "../dialogs/src/dialogs.h"
-+#endif
- #ifdef __APPLE__
- typedef void* BEID_DIALOGHANDLE;
- #else
- typedef unsigned long BEID_DIALOGHANDLE;
- #endif
--#endif
- 
-+
- namespace eIDMW
- {
- #ifdef EIDMW_PF_EXPORT


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/
@ 2016-07-01 17:06 Amy Winston
  0 siblings, 0 replies; 8+ messages in thread
From: Amy Winston @ 2016-07-01 17:06 UTC (permalink / raw
  To: gentoo-commits

commit:     99bc8b5524ba2542b22b81c8d5c1a4b431c23573
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 17:04:03 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 17:04:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99bc8b55

app-crypt/eid-mw: eapi update bug #587250 by Vincent Hardy

- Move to EAPI 6
- add 1 new dependency
- patch update gtk_not_required_9999.patch
- add new patch not_zip_xpi_plugin.patch
- add missing die

Package-Manager: portage-2.2.28

 app-crypt/eid-mw/eid-mw-9999.ebuild                | 38 ++++++++++++++--------
 app-crypt/eid-mw/files/gtk_not_required_9999.patch | 22 ++++++-------
 app-crypt/eid-mw/files/not_zip_xpi_plugin.patch    | 27 +++++++++++++++
 3 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 2424341..57bb7b8 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils autotools mozextension multilib
+inherit autotools mozextension
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
 		https://github.com/Fedict/${PN}.git"
-	inherit git-2
+	inherit git-r3
 	SRC_URI=""
 else
 	MY_P="${P}-v${PV}"
@@ -29,8 +29,9 @@ IUSE="+gtk +xpi +dialogs"
 REQUIRED_USE="
 	dialogs? ( gtk )"
 
-RDEPEND="gtk? ( x11-libs/gtk+:* )
+RDEPEND="gtk? ( x11-libs/gtk+:= )
 	>=sys-apps/pcsc-lite-1.2.9
+	net-libs/libproxy
 	xpi? ( || ( >=www-client/firefox-bin-3.6.24
 		>=www-client/firefox-3.6.20 ) )
 	!app-misc/beid-runtime"
@@ -39,21 +40,32 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	use gtk || epatch "${FILESDIR}"/gtk_not_required_9999.patch
+	eapply_user
 
 	if [[ ${PV} == "9999" ]] ; then
+		use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
+
 		# Only in current git. Hopefully, in next release.
-		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
-		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+	else
+		use gtk || eapply "${FILESDIR}"/gtk_not_required_4.1.4.patch
 	fi
 
 	if [[ ${PV} == "9999" ]] || ! use gtk ; then
 		eautoreconf
 	fi
+
+	# Do that after autoreconf (if autoreconf is required)
+	# This patch is not mandatory, it's just to do things properly :-)
+	eapply "${FILESDIR}"/not_zip_xpi_plugin.patch
 }
 
 src_configure() {
-	econf $(use_enable dialogs) --disable-static
+	econf \
+		$(use_enable dialogs) \
+		--disable-static \
+		--disable-signed
 }
 
 src_install() {
@@ -61,19 +73,19 @@ src_install() {
 
 	if [[ ${PV} != "9999" ]] ; then
 		# Automatically done in current git. Hopefully, in next release.
-		rm doc/sdk/include/rsaref220/win32.h
+		rm doc/sdk/include/rsaref220/win32.h || die
 		doheader -r doc/sdk/include/*
 	fi
 	if use xpi; then
 		declare MOZILLA_FIVE_HOME
 		if has_version '>=www-client/firefox-3.6.20'; then
 			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
 		fi
 		if has_version '>=www-client/firefox-bin-3.6.24'; then
 			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
 		fi
 	fi
-	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
 }

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 d5d6f1c..f66ec18 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
@@ -1,13 +1,13 @@
 diff --git a/Makefile.am b/Makefile.am
-index 1a605f7..6475886 100644
+index 65baf07..c264576 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,7 @@
  ACLOCAL_AMFLAGS = -I scripts/m4
  EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
  
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi
+-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
@@ -54,18 +54,18 @@ index 6e33315..fce4494 100644
 -
  pkgconfig_DATA=libbeidpkcs11.pc
 diff --git a/configure.ac b/configure.ac
-index 6f4b833..ec7ae8f 100644
+index 6485b23..a1f9c93 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -56,11 +56,6 @@ then
- 	fi
- fi
+@@ -59,11 +59,6 @@ fi
  
--if test x"$have_gtk" = "xno"
+ 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
 -
- ###########################################################################
- ####### read user-specific requests from --enable directives         ######
- ###########################################################################
+ PKG_CHECK_MODULES([XML2], [libxml-2.0])
+ PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
+ 

diff --git a/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch b/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch
new file mode 100644
index 0000000..4295543
--- /dev/null
+++ b/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch
@@ -0,0 +1,27 @@
+--- eid-mw-4.1.18-v4.1.18-a/plugins_tools/xpi/src/Makefile.in	2016-05-20 12:58:46.184002742 +0200
++++ eid-mw-4.1.18-v4.1.18-b/plugins_tools/xpi/src/Makefile.in	2016-06-18 16:18:57.467199895 +0200
+@@ -724,24 +724,6 @@
+ @SIGNED_TRUE@	cp $(srcdir)/belgiumeid-1.0.18.1-signed.1-signed.xpi $(XPI_ID).xpi
+ 
+ @SIGNED_FALSE@xpipackage: $(xpi_files)
+-#	 Create a temporary directory $tmp in $TMPDIR (default /tmp).
+-#	 Use mktemp if possible; otherwise fall back on mkdir,
+-#	 with $RANDOM to make collisions less likely.
+-@SIGNED_FALSE@	{ \
+-@SIGNED_FALSE@		tmp=` \
+-@SIGNED_FALSE@			(umask 077 && mktemp -t -d "xpiXXXXXX") 2>/dev/null \
+-@SIGNED_FALSE@		` && \
+-@SIGNED_FALSE@		test -n "$$tmp" && test -d "$$tmp"; \
+-@SIGNED_FALSE@	} || { \
+-@SIGNED_FALSE@		tmp=$$TMPDIR/xpi$$RANDOM; \
+-@SIGNED_FALSE@		umask 077 && $(mkinstalldirs) "$$tmp"; \
+-@SIGNED_FALSE@	} || exit $$?; \
+-@SIGNED_FALSE@	$(MAKE) DESTDIR=$$tmp extensionrootdir=/ install; \
+-@SIGNED_FALSE@	cd $$tmp; \
+-@SIGNED_FALSE@        rm -f $(abs_builddir)/$(XPI_NAME); \
+-@SIGNED_FALSE@	@ZIP@ -rq $(abs_builddir)/$(XPI_NAME) .; \
+-@SIGNED_FALSE@	cd -; \
+-@SIGNED_FALSE@	rm -rf $$tmp;
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/
@ 2017-02-04 16:50 Amy Liffey
  0 siblings, 0 replies; 8+ messages in thread
From: Amy Liffey @ 2017-02-04 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     4da08d060ef1009569798c3d29ff94e7b56e62ae
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 16:47:43 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 16:50:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da08d06

app-crypt/eid-mw: remove old. Vincent Hardy

Package-Manager: portage-2.3.0

 app-crypt/eid-mw/Manifest                          |  3 -
 app-crypt/eid-mw/eid-mw-4.1.18.ebuild              | 83 ----------------------
 app-crypt/eid-mw/eid-mw-4.1.4.ebuild               | 79 --------------------
 app-crypt/eid-mw/eid-mw-4.1.9.ebuild               | 79 --------------------
 .../eid-mw/files/gtk_not_required_4.1.4.patch      | 60 ----------------
 app-crypt/eid-mw/files/not_zip_xpi_plugin.patch    | 27 -------
 6 files changed, 331 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 0bea827..d6c0500 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,4 +1 @@
-DIST eid-mw-4.1.18-v4.1.18.tar.gz 3480541 SHA256 abc9d3194008f05b2589ddd9a29c45d22d89716bdc8689fcec42b2aa8450ddbf SHA512 18825a06007f7c07609cee034896ebf64b589200e04b72fece2bd65004a738c01cf64475d59f2c94b7242aa1adfc433bf4af6cf8b5d809746f3e9357ac27b98c WHIRLPOOL 584817aff81a1e0b1af24e5b259fa7e40b5a43b27be701242430cdc480d8ba57205faeba6fb787f1321e02916e6f3efa722e01609151fa3798b8e37b13cb159e
-DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
-DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9
 DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f WHIRLPOOL b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643

diff --git a/app-crypt/eid-mw/eid-mw-4.1.18.ebuild b/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
deleted file mode 100644
index 815d376..00000000
--- a/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools mozextension multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
-		https://github.com/Fedict/${PN}.git"
-	inherit git-2
-	SRC_URI=""
-else
-	MY_P="${P}-v${PV}"
-	SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
-	KEYWORDS="~x86 ~amd64 ~arm"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be"
-
-IUSE="+gtk +xpi +dialogs"
-
-REQUIRED_USE="
-	dialogs? ( gtk )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:= )
-	>=sys-apps/pcsc-lite-1.2.9
-	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )
-	!app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
-
-	if [[ ${PV} == "9999" ]] ; then
-		# Only in current git. Hopefully, in next release.
-		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-	fi
-
-	if [[ ${PV} == "9999" ]] || ! use gtk ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable dialogs) \
-		--with-gnu-ld \
-		--disable-static \
-		--disable-signed
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if [[ ${PV} != "9999" ]] ; then
-		# Automatically done in current git. Hopefully, in next release.
-		rm doc/sdk/include/rsaref220/win32.h || die
-		doheader -r doc/sdk/include/*
-	fi
-	if use xpi; then
-		declare MOZILLA_FIVE_HOME
-		if has_version '>=www-client/firefox-3.6.20'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-		if has_version '>=www-client/firefox-bin-3.6.24'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-	fi
-	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
-}

diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
deleted file mode 100644
index 2cf391e..00000000
--- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools mozextension multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
-		https://github.com/Fedict/${PN}.git"
-	inherit git-2
-	SRC_URI=""
-else
-	MY_P="${P}-v${PV}"
-	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~x86 ~amd64 ~arm"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be"
-
-IUSE="+gtk +xpi +dialogs"
-
-REQUIRED_USE="
-	dialogs? ( gtk )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:= )
-	>=sys-apps/pcsc-lite-1.2.9
-	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )
-	!app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
-
-	if [[ ${PV} == "9999" ]] ; then
-		# Only in current git. Hopefully, in next release.
-		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-	fi
-
-	if [[ ${PV} == "9999" ]] || ! use gtk ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf $(use_enable dialogs) --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if [[ ${PV} != "9999" ]] ; then
-		# Automatically done in current git. Hopefully, in next release.
-		rm doc/sdk/include/rsaref220/win32.h || die
-		doheader -r doc/sdk/include/*
-	fi
-	if use xpi; then
-		declare MOZILLA_FIVE_HOME
-		if has_version '>=www-client/firefox-3.6.20'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-		if has_version '>=www-client/firefox-bin-3.6.24'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-	fi
-	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
-}

diff --git a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
deleted file mode 100644
index aa57f80..00000000
--- a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools mozextension multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
-		https://github.com/Fedict/${PN}.git"
-	inherit git-2
-	SRC_URI=""
-else
-	MY_P="${P}-v${PV}"
-	SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
-	KEYWORDS="~x86 ~amd64 ~arm"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be"
-
-IUSE="+gtk +xpi +dialogs"
-
-REQUIRED_USE="
-	dialogs? ( gtk )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:= )
-	>=sys-apps/pcsc-lite-1.2.9
-	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )
-	!app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
-
-	if [[ ${PV} == "9999" ]] ; then
-		# Only in current git. Hopefully, in next release.
-		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-	fi
-
-	if [[ ${PV} == "9999" ]] || ! use gtk ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf $(use_enable dialogs) --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if [[ ${PV} != "9999" ]] ; then
-		# Automatically done in current git. Hopefully, in next release.
-		rm doc/sdk/include/rsaref220/win32.h || die
-		doheader -r doc/sdk/include/*
-	fi
-	if use xpi; then
-		declare MOZILLA_FIVE_HOME
-		if has_version '>=www-client/firefox-3.6.20'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-		if has_version '>=www-client/firefox-bin-3.6.24'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
-		fi
-	fi
-	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
-}

diff --git a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
deleted file mode 100644
index 137ef8e..00000000
--- a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am
---- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am	2015-07-27 10:30:34.638418958 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am	2015-08-13 14:12:43.827586821 +0200
-@@ -164,29 +164,3 @@
- 	dialogs/dialogsgtk/dlgs_gtk.cpp \
- 	dialogs/dialogsgtk/single_dialog.c
- endif
--
--libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
--
--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@
-diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
---- eid-mw-4.1.4-v4.1.4-a/configure.ac	2015-07-27 10:30:34.641752294 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/configure.ac	2015-08-13 14:13:51.456736608 +0200
-@@ -55,11 +55,6 @@
- 	fi
- fi
- 
--if test x"$have_gtk" = "xno"
--then
--	AC_MSG_ERROR([At least one version of GTK is required.])
--fi
--
- ###########################################################################
- ####### read user-specific requests from --enable directives         ######
- ###########################################################################
-diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am
---- eid-mw-4.1.4-v4.1.4-a/Makefile.am	2015-07-27 10:30:34.638418958 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/Makefile.am	2015-08-13 14:11:43.878340486 +0200
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
- 
--SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
-+SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi
- 
- xpipackage:
- 	$(MAKE) -C plugins_tools/xpi xpipackage

diff --git a/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch b/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch
deleted file mode 100644
index 4295543..00000000
--- a/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- eid-mw-4.1.18-v4.1.18-a/plugins_tools/xpi/src/Makefile.in	2016-05-20 12:58:46.184002742 +0200
-+++ eid-mw-4.1.18-v4.1.18-b/plugins_tools/xpi/src/Makefile.in	2016-06-18 16:18:57.467199895 +0200
-@@ -724,24 +724,6 @@
- @SIGNED_TRUE@	cp $(srcdir)/belgiumeid-1.0.18.1-signed.1-signed.xpi $(XPI_ID).xpi
- 
- @SIGNED_FALSE@xpipackage: $(xpi_files)
--#	 Create a temporary directory $tmp in $TMPDIR (default /tmp).
--#	 Use mktemp if possible; otherwise fall back on mkdir,
--#	 with $RANDOM to make collisions less likely.
--@SIGNED_FALSE@	{ \
--@SIGNED_FALSE@		tmp=` \
--@SIGNED_FALSE@			(umask 077 && mktemp -t -d "xpiXXXXXX") 2>/dev/null \
--@SIGNED_FALSE@		` && \
--@SIGNED_FALSE@		test -n "$$tmp" && test -d "$$tmp"; \
--@SIGNED_FALSE@	} || { \
--@SIGNED_FALSE@		tmp=$$TMPDIR/xpi$$RANDOM; \
--@SIGNED_FALSE@		umask 077 && $(mkinstalldirs) "$$tmp"; \
--@SIGNED_FALSE@	} || exit $$?; \
--@SIGNED_FALSE@	$(MAKE) DESTDIR=$$tmp extensionrootdir=/ install; \
--@SIGNED_FALSE@	cd $$tmp; \
--@SIGNED_FALSE@        rm -f $(abs_builddir)/$(XPI_NAME); \
--@SIGNED_FALSE@	@ZIP@ -rq $(abs_builddir)/$(XPI_NAME) .; \
--@SIGNED_FALSE@	cd -; \
--@SIGNED_FALSE@	rm -rf $$tmp;
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/
@ 2017-06-28  8:27 Amy Liffey
  0 siblings, 0 replies; 8+ messages in thread
From: Amy Liffey @ 2017-06-28  8:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4f52555b9db0977023230e4520831272aeb8b0c4
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 08:24:29 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 08:27:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f52555b

app-crypt/eid-mw: version bump 4.2.8

Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com>

- fix bug 608450, usage of libressl instead of openssl

Submitted-by: Cédric Krier <cedk <AT> gentoo.org>

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-crypt/eid-mw/Manifest                       |  1 +
 app-crypt/eid-mw/eid-mw-4.2.8.ebuild            | 95 +++++++++++++++++++++++++
 app-crypt/eid-mw/files/fix_libressl_check.patch | 45 ++++++++++++
 3 files changed, 141 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 881a3d0dc69..be14ea38968 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
 DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f WHIRLPOOL b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643
 DIST eid-mw-4.2.5.tar.gz 7751526 SHA256 d2c46a65026790485f39db0b6d9b66a65b1d19061f3682a0b6da2e2b0c54bc81 SHA512 cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075 WHIRLPOOL c24186b1f2b6b02df4a790e3a8c3d1f8e762b1e556d8f55aeeb4523a71387045827b47444246334933fc3d746485ea14086cfe41c5ec23f43826e6a7375c7fc3
+DIST eid-mw-4.2.8.tar.gz 7076407 SHA256 6b998bd14897f640e29f9140ee457ea963162a409c7aff646e3346b0b0ae2e65 SHA512 bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb WHIRLPOOL 12f998d6065ed0eddbee5c6f99ef75f2bd3b3344314c7dd2e2e8a5652ea0f5adc9159af22d30ff8c4349bf75a71f982c26de886bf287d379fc99e5b341b4c303

diff --git a/app-crypt/eid-mw/eid-mw-4.2.8.ebuild b/app-crypt/eid-mw/eid-mw-4.2.8.ebuild
new file mode 100644
index 00000000000..cadd463d766
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.2.8.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools mozextension
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+		https://github.com/Fedict/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
+	${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64 ~arm"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="https://eid.belgium.be"
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	>=sys-apps/pcsc-lite-1.2.9
+	p11-kit? ( app-crypt/p11-kit )
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+
+	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || 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
+
+	use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2_5.patch
+	eapply "${FILESDIR}"/fix_libressl_check.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		--with-gnu-ld \
+		--disable-static \
+		--disable-signed
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use xpi; then
+		declare MOZILLA_FIVE_HOME
+		if has_version '>=www-client/firefox-3.6.20'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+		if has_version '>=www-client/firefox-bin-3.6.24'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+	use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+}

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 00000000000..5476e3e4aaf
--- /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;


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/
@ 2019-08-15 19:20 Amy Liffey
  0 siblings, 0 replies; 8+ messages in thread
From: Amy Liffey @ 2019-08-15 19:20 UTC (permalink / raw
  To: gentoo-commits

commit:     e2c4faef071d1e2210ea330d5f14f1fe80403527
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 19:14:35 2019 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 19:19:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c4faef

app-crypt/eid-mw: version bump 4.4.19

Closes: https://bugs.gentoo.org/690038
Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>

 app-crypt/eid-mw/Manifest                         |   1 +
 app-crypt/eid-mw/eid-mw-4.4.19.ebuild             | 103 ++++++++
 app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch | 272 ++++++++++++++++++++++
 3 files changed, 376 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index debf3f3f29b..644dc3133d4 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
 DIST eid-mw-4.4.11.tar.gz 7975630 BLAKE2B e7b052736cba98c53e97e9de15ea8e54f508c28471a7a936c5d28539648f5d3454983d9c9a21cf5959a070849865de5ca58d5d29ad64eb08209afd40959c56ae SHA512 35273492abc0efa7146848c82770bcd5e4ce1b7c9971ce45686b4d3244332456011db6df05154ad6a204854fd13ac3dce8f7b8cd6112a2e60a7b8434f3c4a196
+DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848 SHA512 21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634

diff --git a/app-crypt/eid-mw/eid-mw-4.4.19.ebuild b/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
new file mode 100644
index 00000000000..98c8bfee6ce
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop gnome2-utils xdg-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 ~x86"
+IUSE="+dialogs +gtk +p11v220 p11-kit"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	p11-kit? ( app-crypt/p11-kit )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+	# 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
+	sed -i \
+		-e '/^GITDESC/ d' \
+		-e '/^VERCLEAN/ d' \
+		scripts/build-aux/genver.sh
+
+	# legacy 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 pkcs11_manifestdir
+	sed -i \
+		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+		cardcomm/pkcs11/src/Makefile.am || die
+
+	# See bug #691308
+	eapply "${FILESDIR}/eid-sign-test-${PV}.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11v220) \
+		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers 'detect') \
+		--with-gnu-ld \
+		--disable-static
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/$(get_libdir)/*.la || 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
+	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/eid-sign-test-4.4.19.patch b/app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch
new file mode 100644
index 00000000000..cf59f99a8ea
--- /dev/null
+++ b/app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch
@@ -0,0 +1,272 @@
+--- eid-mw-4.4.19/tests/unit/sign.c	2019-07-11 16:08:46.000000000 +0200
++++ eid-mw-git/tests/unit/sign.c	2019-08-04 17:40:08.683942928 +0200
+@@ -19,10 +19,13 @@
+ **************************************************************************** */
+ #ifdef WIN32
+ #include <win32.h>
++#pragma pack(push, cryptoki, 1)
++#include "pkcs11.h"
++#pragma pack(pop, cryptoki)
+ #else
+ #include <unix.h>
+-#endif
+ #include <pkcs11.h>
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -33,66 +36,88 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdbool.h>
++
+ #if HAVE_OPENSSL
+-#include <openssl/rsa.h>
++#include <openssl/opensslv.h>
++#include <openssl/evp.h>
+ #include <openssl/engine.h>
+ 
+-#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;
+-	}
+-	r->n = n;
+-	r->e = e;
+-	r->d = d;
+-	return 1;
+-}
+-#endif
+-
+-CK_BYTE digest_sha256[] = {
+-                0x2c, 0x26, 0xb4, 0x6b,
+-                0x68, 0xff, 0xc6, 0x8f,
+-                0xf9, 0x9b, 0x45, 0x3c,
+-                0x1d, 0x30, 0x41, 0x34,
+-                0x13, 0x42, 0x2d, 0x70,
+-		0x64, 0x83, 0xbf, 0xa0,
+-		0xf9, 0x8a, 0x5e, 0x88,
+-		0x62, 0x66, 0xe7, 0xae
+-};
+-
+-int verify_sig(unsigned char* sig, CK_ULONG siglen, CK_BYTE_PTR modulus, CK_ULONG modlen, CK_BYTE_PTR exponent, CK_ULONG explen) {
+-	RSA* rsa = RSA_new();
+-	unsigned char* s = malloc(siglen);
+-	int ret;
+-
+-	RSA_set0_key(rsa, BN_bin2bn(modulus, (int) modlen, NULL), BN_bin2bn(exponent, (int) explen, NULL), NULL);
+-
+-	int v = RSA_verify(NID_sha256, digest_sha256, sizeof(digest_sha256), sig, siglen, rsa);
+-
+-	printf("Signature verification returned: %d\n", v);
+-	if(!v) {
+-		unsigned long e = ERR_get_error();
+-		printf("error %ld: %s\n", e, ERR_error_string(e, NULL));
+-		ret = TEST_RV_FAIL;
+-	} else {
+-		ret = TEST_RV_OK;
++// These were copied from eid-test-ca:derencode.c
++int verify_sig(const unsigned char *sig_in, CK_ULONG siglen, const unsigned char *certificate, size_t certlen, bool is_rsa) {
++#if OPENSSL_VERSION_NUMBER > 0x10100000L
++	X509 *cert = NULL;
++	EVP_PKEY *pkey = NULL;
++	EVP_MD_CTX *mdctx;
++	EVP_PKEY_CTX *pctx;
++	const EVP_MD *md = EVP_get_digestbyname("sha256");
++	unsigned char *sig = (unsigned char*)sig_in;
++
++	if(d2i_X509(&cert, &certificate, certlen) == NULL) {
++		fprintf(stderr, "E: could not parse X509 certificate\n");
++		return TEST_RV_FAIL;
++	}
++	pkey = X509_get0_pubkey(cert);
++	if(pkey == NULL) {
++		fprintf(stderr, "E: could not find public key in certificate\n");
++		return TEST_RV_FAIL;
++	}
++	mdctx = EVP_MD_CTX_new();
++	if(EVP_DigestVerifyInit(mdctx, &pctx, md, NULL, pkey) != 1) {
++		fprintf(stderr, "E: initialization for signature validation failed!\n");
++		return TEST_RV_FAIL;
++	}
++	if(EVP_DigestVerifyUpdate(mdctx, (const unsigned char*)"foo", 3) != 1) {
++		fprintf(stderr, "E: hashing for signature failed!\n");
++		return TEST_RV_FAIL;
+ 	}
+ 
+-	free(s);
+-	RSA_free(rsa);
+-
+-	return ret;
++	ECDSA_SIG* ec_sig;
++	if(!is_rsa) {
++		BIGNUM *r;
++		BIGNUM *s;
++		ec_sig = ECDSA_SIG_new();
++		if((r = BN_bin2bn(sig, siglen / 2, NULL)) == NULL) {
++			fprintf(stderr, "E: could not convert R part of ECDSA signature!\n");
++			return TEST_RV_FAIL;
++		}
++		if((s = BN_bin2bn(sig + (siglen / 2), siglen / 2, NULL)) == NULL) {
++			fprintf(stderr, "E: could not convert S part of ECDSA signature!\n");
++			return TEST_RV_FAIL;
++		}
++		if(ECDSA_SIG_set0(ec_sig, r, s) == 0) {
++			fprintf(stderr, "E: could not set ECDSA_SIG structure!\n");
++			return TEST_RV_FAIL;
++		}
++		siglen = i2d_ECDSA_SIG(ec_sig, NULL);
++		unsigned char *dersig = sig = malloc(siglen);
++		siglen = i2d_ECDSA_SIG(ec_sig, &dersig);
++	}
++	if(EVP_DigestVerifyFinal(mdctx, sig, siglen) != 1) {
++		fprintf(stderr, "E: signature fails validation!\n");
++		return TEST_RV_FAIL;
++	}
++	if(!is_rsa) {
++		free(sig);
++	}
++	printf("signature verified\n");
++	return TEST_RV_OK;
++#else
++	printf("OpenSSL too old for verification\n");
++#endif
+ }
+-
+ #endif
+ 
+-int test_key(char* label, CK_SESSION_HANDLE session, CK_SLOT_ID slot EIDT_UNUSED) {
++int test_key(char* label, CK_SESSION_HANDLE session, CK_SLOT_ID slot) {
+ 	CK_ATTRIBUTE attr[2];
+ 	CK_MECHANISM mech;
++	CK_MECHANISM_TYPE_PTR mechlist;
+ 	CK_BYTE data[] = { 'f', 'o', 'o' };
+ 	CK_BYTE_PTR sig, mod, exp;
+ 	CK_ULONG sig_len, type, count;
+-	CK_OBJECT_HANDLE privatekey, publickey;
++	CK_OBJECT_HANDLE privatekey, publickey, certificate;
++	bool is_rsa = false;
++	int i;
+ 
+ 	attr[0].type = CKA_CLASS;
+ 	attr[0].pValue = &type;
+@@ -113,7 +138,22 @@
+ 		return TEST_RV_SKIP;
+ 	}
+ 
+-	mech.mechanism = CKM_SHA256_RSA_PKCS;
++	check_rv(C_GetMechanismList(slot, NULL_PTR, &count));
++	mechlist = malloc(sizeof(CK_MECHANISM_TYPE) * count);
++#undef CHECK_RV_DEALLOCATE
++#define CHECK_RV_DEALLOCATE free(mechlist)
++
++	check_rv(C_GetMechanismList(slot, mechlist, &count));
++
++	for(i=0; i<count; i++) {
++		if(mechlist[i] == CKM_SHA256_RSA_PKCS) {
++			mech.mechanism = mechlist[i];
++			i=count;
++			is_rsa = true;
++			break;
++		}
++	}
++
+ 	check_rv(C_SignInit(session, &mech, privatekey));
+ 
+ 	check_rv(C_Sign(session, data, sizeof(data), NULL, &sig_len));
+@@ -124,42 +164,68 @@
+ 
+ 	hex_dump((char*)sig, sig_len);
+ 
+-	type = CKO_PUBLIC_KEY;
+-	check_rv(C_FindObjectsInit(session, attr, 2));
+-	check_rv(C_FindObjects(session, &publickey, 1, &count));
+-	verbose_assert(count == 1);
+-	check_rv(C_FindObjectsFinal(session));
++	if(is_rsa) {
++		type = CKO_PUBLIC_KEY;
++		check_rv(C_FindObjectsInit(session, attr, 2));
++		check_rv(C_FindObjects(session, &publickey, 1, &count));
++		verbose_assert(count == 1);
++		check_rv(C_FindObjectsFinal(session));
+ 
+-	attr[0].type = CKA_MODULUS;
+-	attr[0].pValue = NULL_PTR;
+-	attr[0].ulValueLen = 0;
++		attr[0].type = CKA_MODULUS;
++		attr[0].pValue = NULL_PTR;
++		attr[0].ulValueLen = 0;
+ 
+-	attr[1].type = CKA_PUBLIC_EXPONENT;
+-	attr[1].pValue = NULL_PTR;
+-	attr[1].ulValueLen = 0;
++		attr[1].type = CKA_PUBLIC_EXPONENT;
++		attr[1].pValue = NULL_PTR;
++		attr[1].ulValueLen = 0;
+ 
+-	check_rv(C_GetAttributeValue(session, publickey, attr, 2));
++		check_rv(C_GetAttributeValue(session, publickey, attr, 2));
+ 
+-	verbose_assert(attr[0].ulValueLen == sig_len);
++		verbose_assert(attr[0].ulValueLen == sig_len);
+ 
+-	mod = malloc(attr[0].ulValueLen);
+-	mod[0] = 0xde; mod[1] = 0xad; mod[2] = 0xbe; mod[3] = 0xef;
+-	exp = malloc(attr[1].ulValueLen);
+-	exp[0] = 0xde; exp[1] = 0xad; exp[2] = 0xbe; exp[3] = 0xef;
++		mod = malloc(attr[0].ulValueLen);
++		mod[0] = 0xde; mod[1] = 0xad; mod[2] = 0xbe; mod[3] = 0xef;
++		exp = malloc(attr[1].ulValueLen);
++		exp[0] = 0xde; exp[1] = 0xad; exp[2] = 0xbe; exp[3] = 0xef;
+ 
+-	attr[0].pValue = mod;
+-	attr[1].pValue = exp;
++		attr[0].pValue = mod;
++		attr[1].pValue = exp;
+ 
+-	check_rv(C_GetAttributeValue(session, publickey, attr, 2));
++		check_rv(C_GetAttributeValue(session, publickey, attr, 2));
+ 
+-	printf("Received key modulus with length %lu:\n", attr[0].ulValueLen);
+-	hex_dump((char*)mod, attr[0].ulValueLen);
++		printf("Received key modulus with length %lu:\n", attr[0].ulValueLen);
++		hex_dump((char*)mod, attr[0].ulValueLen);
+ 
+-	printf("Received public exponent of key with length %lu:\n", attr[1].ulValueLen);
+-	hex_dump((char*)exp, attr[1].ulValueLen);
++		printf("Received public exponent of key with length %lu:\n", attr[1].ulValueLen);
++		hex_dump((char*)exp, attr[1].ulValueLen);
++	}
+ 
+-#if HAVE_OPENSSL
+-	return verify_sig(sig, sig_len, mod, attr[0].ulValueLen, exp, attr[1].ulValueLen);
++#if HAVE_OPENSSL && OPENSSL_VERSION_NUMBER > 0x10100000L
++	unsigned char cert[4096];
++	attr[0].type = CKA_CLASS;
++	attr[0].pValue = &type;
++	type = CKO_CERTIFICATE;
++	attr[0].ulValueLen = sizeof(CK_ULONG);
++
++	attr[1].type = CKA_LABEL;
++	attr[1].pValue = label;
++	attr[1].ulValueLen = strlen(label);
++
++	check_rv(C_FindObjectsInit(session, attr, 2));
++	check_rv(C_FindObjects(session, &certificate, 1, &count));
++	verbose_assert(count == 1);
++	check_rv(C_FindObjectsFinal(session));
++
++	attr[0].type = CKA_VALUE;
++	attr[0].pValue = cert;
++	attr[0].ulValueLen = sizeof(cert);
++
++	check_rv(C_GetAttributeValue(session, certificate, attr, 1));
++
++	printf("Received certificate with length %lu:\n", attr[0].ulValueLen);
++	hex_dump((char*)cert, attr[0].ulValueLen);
++
++	return verify_sig(sig, sig_len, cert, attr[0].ulValueLen, is_rsa);
+ #else
+ 	return TEST_RV_OK;
+ #endif


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/
@ 2021-03-10 19:05 Amy Liffey
  0 siblings, 0 replies; 8+ messages in thread
From: Amy Liffey @ 2021-03-10 19:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3b8a376e2734c94174127aa3ac6d1563e3555b28
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 19:05:15 2021 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 19:05:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b8a376e

app-crypt/eid-mw: remove old 4.4.27, 5.0.11

Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>

 app-crypt/eid-mw/Manifest                         |   2 -
 app-crypt/eid-mw/eid-mw-4.4.27.ebuild             | 108 ---------
 app-crypt/eid-mw/eid-mw-5.0.11.ebuild             | 111 ---------
 app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch | 272 ----------------------
 app-crypt/eid-mw/metadata.xml                     |   3 -
 5 files changed, 496 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 198a92e64ad..0af6a426942 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1 @@
-DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b SHA512 c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
-DIST eid-mw-5.0.11.tar.gz 8928406 BLAKE2B 36358b758e1e865a7a99099f548b8e7acc045df73ab6290dc5ebf7e82c8b03566137340498e815cdb3458c63961233ef0e8530f75dfeed18e714b6fb4fcfbbcd SHA512 2753739797dbfe5b01c4538fca02f5a0833a3850a2b62cd4e7179a148b0459c9217311f44d1f03b9b9655187af7d90cbe53dd1e4a8318a0cba864d346f8c9324
 DIST eid-mw-5.0.14.tar.gz 8971565 BLAKE2B d1e6997c089c72f6b6b15fafefa227d7341721c1fa52e446f0334c3915b2e16d84ccb27053dc2e12c0f932bb3cb96e1cbfadc0d6b203098734f74fa0dbffc6ab SHA512 97a4e1359c853f14e91d5ec6c3b13d97b3113106da1e7125b558d724aea76f8a15b289dd06ed13391896d9318daea0133eba9269b6103fb1b922e8b55ceaf9cc

diff --git a/app-crypt/eid-mw/eid-mw-4.4.27.ebuild b/app-crypt/eid-mw/eid-mw-4.4.27.ebuild
deleted file mode 100644
index 38d7672f996..00000000000
--- a/app-crypt/eid-mw/eid-mw-4.4.27.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop gnome2-utils xdg-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 ~x86"
-IUSE="+dialogs +gtk +p11v220 p11-kit"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.2.9
-	gtk? (
-		x11-libs/gdk-pixbuf[jpeg]
-		x11-libs/gtk+:*
-		dev-libs/libxml2
-		net-misc/curl[ssl]
-		net-libs/libproxy
-		!app-misc/eid-viewer-bin
-	)
-	p11-kit? ( app-crypt/p11-kit )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="dialogs? ( gtk )"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-
-	# 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
-	sed -i \
-		-e '/^GITDESC/ d' \
-		-e '/^VERCLEAN/ d' \
-		scripts/build-aux/genver.sh
-
-	# legacy 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 pkcs11_manifestdir
-	sed -i \
-		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
-		cardcomm/pkcs11/src/Makefile.am || die
-
-	# See bug #691308
-	eapply "${FILESDIR}/eid-sign-test-4.4.19.patch"
-
-	# See bug #732994
-	sed -i \
-		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable dialogs) \
-		$(use_enable p11v220) \
-		$(use_enable p11-kit p11kit) \
-		$(use_with gtk gtkvers 'detect') \
-		--with-gnu-ld \
-		--disable-static
-}
-
-src_install() {
-	default
-	rm -r "${ED}"/usr/$(get_libdir)/*.la || 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
-	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.0.11.ebuild b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
deleted file mode 100644
index b0e0654fd5b..00000000000
--- a/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop gnome2-utils xdg-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 ~x86"
-IUSE="+dialogs +gtk +p11v220 p11-kit"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.2.9
-	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}
-	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 pkcs11_manifestdir
-	sed -i \
-		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
-		cardcomm/pkcs11/src/Makefile.am || die
-
-	# See bug #732994
-	sed -i \
-		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
-		configure.ac || die
-
-	# See bug #751472
-	eapply "${FILESDIR}/use-printf-in-Makefile.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable dialogs) \
-		$(use_enable p11v220) \
-		$(use_enable p11-kit p11kit) \
-		$(use_with gtk gtkvers 'detect') \
-		--with-gnu-ld \
-		--disable-static
-}
-
-src_install() {
-	default
-	rm -r "${ED}"/usr/$(get_libdir)/*.la || 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
-		*gtk*) ;;
-		*)	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-gtk-2 as default pinentry provider:"
-			ewarn " # eselect pinentry set pinentry-gtk-2"
-		;;
-		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/eid-sign-test-4.4.19.patch b/app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch
deleted file mode 100644
index cf59f99a8ea..00000000000
--- a/app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch
+++ /dev/null
@@ -1,272 +0,0 @@
---- eid-mw-4.4.19/tests/unit/sign.c	2019-07-11 16:08:46.000000000 +0200
-+++ eid-mw-git/tests/unit/sign.c	2019-08-04 17:40:08.683942928 +0200
-@@ -19,10 +19,13 @@
- **************************************************************************** */
- #ifdef WIN32
- #include <win32.h>
-+#pragma pack(push, cryptoki, 1)
-+#include "pkcs11.h"
-+#pragma pack(pop, cryptoki)
- #else
- #include <unix.h>
--#endif
- #include <pkcs11.h>
-+#endif
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -33,66 +36,88 @@
- #include <config.h>
- #endif
- 
-+#include <stdbool.h>
-+
- #if HAVE_OPENSSL
--#include <openssl/rsa.h>
-+#include <openssl/opensslv.h>
-+#include <openssl/evp.h>
- #include <openssl/engine.h>
- 
--#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;
--	}
--	r->n = n;
--	r->e = e;
--	r->d = d;
--	return 1;
--}
--#endif
--
--CK_BYTE digest_sha256[] = {
--                0x2c, 0x26, 0xb4, 0x6b,
--                0x68, 0xff, 0xc6, 0x8f,
--                0xf9, 0x9b, 0x45, 0x3c,
--                0x1d, 0x30, 0x41, 0x34,
--                0x13, 0x42, 0x2d, 0x70,
--		0x64, 0x83, 0xbf, 0xa0,
--		0xf9, 0x8a, 0x5e, 0x88,
--		0x62, 0x66, 0xe7, 0xae
--};
--
--int verify_sig(unsigned char* sig, CK_ULONG siglen, CK_BYTE_PTR modulus, CK_ULONG modlen, CK_BYTE_PTR exponent, CK_ULONG explen) {
--	RSA* rsa = RSA_new();
--	unsigned char* s = malloc(siglen);
--	int ret;
--
--	RSA_set0_key(rsa, BN_bin2bn(modulus, (int) modlen, NULL), BN_bin2bn(exponent, (int) explen, NULL), NULL);
--
--	int v = RSA_verify(NID_sha256, digest_sha256, sizeof(digest_sha256), sig, siglen, rsa);
--
--	printf("Signature verification returned: %d\n", v);
--	if(!v) {
--		unsigned long e = ERR_get_error();
--		printf("error %ld: %s\n", e, ERR_error_string(e, NULL));
--		ret = TEST_RV_FAIL;
--	} else {
--		ret = TEST_RV_OK;
-+// These were copied from eid-test-ca:derencode.c
-+int verify_sig(const unsigned char *sig_in, CK_ULONG siglen, const unsigned char *certificate, size_t certlen, bool is_rsa) {
-+#if OPENSSL_VERSION_NUMBER > 0x10100000L
-+	X509 *cert = NULL;
-+	EVP_PKEY *pkey = NULL;
-+	EVP_MD_CTX *mdctx;
-+	EVP_PKEY_CTX *pctx;
-+	const EVP_MD *md = EVP_get_digestbyname("sha256");
-+	unsigned char *sig = (unsigned char*)sig_in;
-+
-+	if(d2i_X509(&cert, &certificate, certlen) == NULL) {
-+		fprintf(stderr, "E: could not parse X509 certificate\n");
-+		return TEST_RV_FAIL;
-+	}
-+	pkey = X509_get0_pubkey(cert);
-+	if(pkey == NULL) {
-+		fprintf(stderr, "E: could not find public key in certificate\n");
-+		return TEST_RV_FAIL;
-+	}
-+	mdctx = EVP_MD_CTX_new();
-+	if(EVP_DigestVerifyInit(mdctx, &pctx, md, NULL, pkey) != 1) {
-+		fprintf(stderr, "E: initialization for signature validation failed!\n");
-+		return TEST_RV_FAIL;
-+	}
-+	if(EVP_DigestVerifyUpdate(mdctx, (const unsigned char*)"foo", 3) != 1) {
-+		fprintf(stderr, "E: hashing for signature failed!\n");
-+		return TEST_RV_FAIL;
- 	}
- 
--	free(s);
--	RSA_free(rsa);
--
--	return ret;
-+	ECDSA_SIG* ec_sig;
-+	if(!is_rsa) {
-+		BIGNUM *r;
-+		BIGNUM *s;
-+		ec_sig = ECDSA_SIG_new();
-+		if((r = BN_bin2bn(sig, siglen / 2, NULL)) == NULL) {
-+			fprintf(stderr, "E: could not convert R part of ECDSA signature!\n");
-+			return TEST_RV_FAIL;
-+		}
-+		if((s = BN_bin2bn(sig + (siglen / 2), siglen / 2, NULL)) == NULL) {
-+			fprintf(stderr, "E: could not convert S part of ECDSA signature!\n");
-+			return TEST_RV_FAIL;
-+		}
-+		if(ECDSA_SIG_set0(ec_sig, r, s) == 0) {
-+			fprintf(stderr, "E: could not set ECDSA_SIG structure!\n");
-+			return TEST_RV_FAIL;
-+		}
-+		siglen = i2d_ECDSA_SIG(ec_sig, NULL);
-+		unsigned char *dersig = sig = malloc(siglen);
-+		siglen = i2d_ECDSA_SIG(ec_sig, &dersig);
-+	}
-+	if(EVP_DigestVerifyFinal(mdctx, sig, siglen) != 1) {
-+		fprintf(stderr, "E: signature fails validation!\n");
-+		return TEST_RV_FAIL;
-+	}
-+	if(!is_rsa) {
-+		free(sig);
-+	}
-+	printf("signature verified\n");
-+	return TEST_RV_OK;
-+#else
-+	printf("OpenSSL too old for verification\n");
-+#endif
- }
--
- #endif
- 
--int test_key(char* label, CK_SESSION_HANDLE session, CK_SLOT_ID slot EIDT_UNUSED) {
-+int test_key(char* label, CK_SESSION_HANDLE session, CK_SLOT_ID slot) {
- 	CK_ATTRIBUTE attr[2];
- 	CK_MECHANISM mech;
-+	CK_MECHANISM_TYPE_PTR mechlist;
- 	CK_BYTE data[] = { 'f', 'o', 'o' };
- 	CK_BYTE_PTR sig, mod, exp;
- 	CK_ULONG sig_len, type, count;
--	CK_OBJECT_HANDLE privatekey, publickey;
-+	CK_OBJECT_HANDLE privatekey, publickey, certificate;
-+	bool is_rsa = false;
-+	int i;
- 
- 	attr[0].type = CKA_CLASS;
- 	attr[0].pValue = &type;
-@@ -113,7 +138,22 @@
- 		return TEST_RV_SKIP;
- 	}
- 
--	mech.mechanism = CKM_SHA256_RSA_PKCS;
-+	check_rv(C_GetMechanismList(slot, NULL_PTR, &count));
-+	mechlist = malloc(sizeof(CK_MECHANISM_TYPE) * count);
-+#undef CHECK_RV_DEALLOCATE
-+#define CHECK_RV_DEALLOCATE free(mechlist)
-+
-+	check_rv(C_GetMechanismList(slot, mechlist, &count));
-+
-+	for(i=0; i<count; i++) {
-+		if(mechlist[i] == CKM_SHA256_RSA_PKCS) {
-+			mech.mechanism = mechlist[i];
-+			i=count;
-+			is_rsa = true;
-+			break;
-+		}
-+	}
-+
- 	check_rv(C_SignInit(session, &mech, privatekey));
- 
- 	check_rv(C_Sign(session, data, sizeof(data), NULL, &sig_len));
-@@ -124,42 +164,68 @@
- 
- 	hex_dump((char*)sig, sig_len);
- 
--	type = CKO_PUBLIC_KEY;
--	check_rv(C_FindObjectsInit(session, attr, 2));
--	check_rv(C_FindObjects(session, &publickey, 1, &count));
--	verbose_assert(count == 1);
--	check_rv(C_FindObjectsFinal(session));
-+	if(is_rsa) {
-+		type = CKO_PUBLIC_KEY;
-+		check_rv(C_FindObjectsInit(session, attr, 2));
-+		check_rv(C_FindObjects(session, &publickey, 1, &count));
-+		verbose_assert(count == 1);
-+		check_rv(C_FindObjectsFinal(session));
- 
--	attr[0].type = CKA_MODULUS;
--	attr[0].pValue = NULL_PTR;
--	attr[0].ulValueLen = 0;
-+		attr[0].type = CKA_MODULUS;
-+		attr[0].pValue = NULL_PTR;
-+		attr[0].ulValueLen = 0;
- 
--	attr[1].type = CKA_PUBLIC_EXPONENT;
--	attr[1].pValue = NULL_PTR;
--	attr[1].ulValueLen = 0;
-+		attr[1].type = CKA_PUBLIC_EXPONENT;
-+		attr[1].pValue = NULL_PTR;
-+		attr[1].ulValueLen = 0;
- 
--	check_rv(C_GetAttributeValue(session, publickey, attr, 2));
-+		check_rv(C_GetAttributeValue(session, publickey, attr, 2));
- 
--	verbose_assert(attr[0].ulValueLen == sig_len);
-+		verbose_assert(attr[0].ulValueLen == sig_len);
- 
--	mod = malloc(attr[0].ulValueLen);
--	mod[0] = 0xde; mod[1] = 0xad; mod[2] = 0xbe; mod[3] = 0xef;
--	exp = malloc(attr[1].ulValueLen);
--	exp[0] = 0xde; exp[1] = 0xad; exp[2] = 0xbe; exp[3] = 0xef;
-+		mod = malloc(attr[0].ulValueLen);
-+		mod[0] = 0xde; mod[1] = 0xad; mod[2] = 0xbe; mod[3] = 0xef;
-+		exp = malloc(attr[1].ulValueLen);
-+		exp[0] = 0xde; exp[1] = 0xad; exp[2] = 0xbe; exp[3] = 0xef;
- 
--	attr[0].pValue = mod;
--	attr[1].pValue = exp;
-+		attr[0].pValue = mod;
-+		attr[1].pValue = exp;
- 
--	check_rv(C_GetAttributeValue(session, publickey, attr, 2));
-+		check_rv(C_GetAttributeValue(session, publickey, attr, 2));
- 
--	printf("Received key modulus with length %lu:\n", attr[0].ulValueLen);
--	hex_dump((char*)mod, attr[0].ulValueLen);
-+		printf("Received key modulus with length %lu:\n", attr[0].ulValueLen);
-+		hex_dump((char*)mod, attr[0].ulValueLen);
- 
--	printf("Received public exponent of key with length %lu:\n", attr[1].ulValueLen);
--	hex_dump((char*)exp, attr[1].ulValueLen);
-+		printf("Received public exponent of key with length %lu:\n", attr[1].ulValueLen);
-+		hex_dump((char*)exp, attr[1].ulValueLen);
-+	}
- 
--#if HAVE_OPENSSL
--	return verify_sig(sig, sig_len, mod, attr[0].ulValueLen, exp, attr[1].ulValueLen);
-+#if HAVE_OPENSSL && OPENSSL_VERSION_NUMBER > 0x10100000L
-+	unsigned char cert[4096];
-+	attr[0].type = CKA_CLASS;
-+	attr[0].pValue = &type;
-+	type = CKO_CERTIFICATE;
-+	attr[0].ulValueLen = sizeof(CK_ULONG);
-+
-+	attr[1].type = CKA_LABEL;
-+	attr[1].pValue = label;
-+	attr[1].ulValueLen = strlen(label);
-+
-+	check_rv(C_FindObjectsInit(session, attr, 2));
-+	check_rv(C_FindObjects(session, &certificate, 1, &count));
-+	verbose_assert(count == 1);
-+	check_rv(C_FindObjectsFinal(session));
-+
-+	attr[0].type = CKA_VALUE;
-+	attr[0].pValue = cert;
-+	attr[0].ulValueLen = sizeof(cert);
-+
-+	check_rv(C_GetAttributeValue(session, certificate, attr, 1));
-+
-+	printf("Received certificate with length %lu:\n", attr[0].ulValueLen);
-+	hex_dump((char*)cert, attr[0].ulValueLen);
-+
-+	return verify_sig(sig, sig_len, cert, attr[0].ulValueLen, is_rsa);
- #else
- 	return TEST_RV_OK;
- #endif

diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index 99549db6384..1ef7d1fc920 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -28,8 +28,5 @@ These three functions form the basis of the countless applications for your eID.
   <flag name="p11-kit">
     Support for app-crypt/p11-kit.
   </flag>
-  <flag name="p11v220">
-    Enable PKCS#11 v2.20 features.
-  </flag>
 </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/
@ 2024-05-18 16:46 Amy Liffey
  0 siblings, 0 replies; 8+ messages in thread
From: Amy Liffey @ 2024-05-18 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     d7b2484619fb6e0388a144086bd7ba5ca615f288
Author:     Vincent Hardy <vincent.hardy.be <AT> gmail <DOT> com>
AuthorDate: Sat May 18 16:42:31 2024 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat May 18 16:45:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b24846

app-crypt/eid-mw: drop 5.1.15

Closes: https://bugs.gentoo.org/928091
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>

 app-crypt/eid-mw/Manifest                          |   1 -
 app-crypt/eid-mw/eid-mw-5.1.15.ebuild              | 129 ---------------------
 .../eid-mw/files/use-printf-in-Makefile.patch      |  21 ----
 3 files changed, 151 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index c48adf78962f..623c7a009f28 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1 @@
-DIST eid-mw-5.1.15.tar.gz 16296281 BLAKE2B 12efbc884ff250d5497ace6b9670e4dac934a8aa87e2e77d4c083d3e0325c7b0a57dd137506f62a6e3ada57459b5b23e7d5e0d86a80616a64e05948560ce265b SHA512 4cf352ba912db6252f864430bacc895d29b478d3ec13ef3716089e5cb6019b2db2de08a99775dcd71a4ac9f13f3e3c6e1013f36bb2d458bbb0e851f7b45451e5
 DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76 SHA512 1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7

diff --git a/app-crypt/eid-mw/eid-mw-5.1.15.ebuild b/app-crypt/eid-mw/eid-mw-5.1.15.ebuild
deleted file mode 100644
index 1c782e3b1ce9..000000000000
--- a/app-crypt/eid-mw/eid-mw-5.1.15.ebuild
+++ /dev/null
@@ -1,129 +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-1.2.9
-	gtk? (
-		x11-libs/gdk-pixbuf[jpeg]
-		x11-libs/gtk+:3
-		dev-libs/libxml2
-		net-misc/curl[ssl]
-		net-libs/libproxy
-		>=app-crypt/pinentry-1.1.0-r4[gtk]
-	)
-	p11-kit? ( app-crypt/p11-kit )"
-
-DEPEND="${RDEPEND}
-	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
-
-	# See bug #862306
-	sed -i \
-		-e 's:PACKAGE_VERSION:MAINVERSION:' \
-		cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-
-	# 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 #732994
-	sed -i \
-		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
-		configure.ac || die
-
-	# See bug #751472
-	eapply "${FILESDIR}/use-printf-in-Makefile.patch"
-
-	# 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
-
-	# See bug #923375
-	sed -i \
-		-e 's:C_Sign(NULL,:C_Sign(NULL_PTR,:' \
-		tests/unit/sign_state.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable dialogs) \
-		$(use_enable p11-kit p11kit) \
-		$(use_with gtk gtkvers 'detect') \
-		--with-gnu-ld \
-		--disable-static
-}
-
-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/use-printf-in-Makefile.patch b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch
deleted file mode 100644
index 5b4ef2adc07e..000000000000
--- a/app-crypt/eid-mw/files/use-printf-in-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am
---- a/plugins_tools/eid-viewer/Makefile.am	2020-08-19 15:32:50.000000000 +0200
-+++ b/plugins_tools/eid-viewer/Makefile.am	2020-12-21 23:07:49.980421703 +0200
-@@ -125,13 +125,13 @@
- SUBDIRS = . gtk/po test uml
- 
- resources/%.c: resources/%.png
--	echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@
-+	printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
- 	gdk-pixbuf-csource --struct --extern --name `basename $^ .png` $^ >> $@
--	echo -e "#pragma GCC diagnostic pop\n" >> $@
-+	printf '%s\n' '#pragma GCC diagnostic pop' >> $@
- resources/%.c: resources/%.jpg
--	echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@
-+	printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
- 	gdk-pixbuf-csource --struct --extern --name `basename $^ .jpg` $^ >> $@
--	echo -e "#pragma GCC diagnostic pop\n" >> $@
-+	printf '%s\n' '#pragma GCC diagnostic pop' >> $@
- 
- BUILT_SOURCES = gtk/viewer_glade.h \
- 		resources/coat_of_arms_nl.c \


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-05-18 16:46 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-16 18:16 [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/ Sven Vermeulen
  -- strict thread matches above, loose matches on Subject: below --
2016-03-20 14:44 Ian Delaney
2016-07-01 17:06 Amy Winston
2017-02-04 16:50 Amy Liffey
2017-06-28  8:27 Amy Liffey
2019-08-15 19:20 Amy Liffey
2021-03-10 19:05 Amy Liffey
2024-05-18 16:46 Amy Liffey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox