1 |
commit: e100d4676d821df59fe477088a28b1775c003149 |
2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 12 16:56:28 2017 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 12 16:59:15 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e100d467 |
7 |
|
8 |
app-crypt/eid-mw: version bump 4.2.5. Vincent Hardy |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
|
12 |
app-crypt/eid-mw/Manifest | 1 + |
13 |
app-crypt/eid-mw/eid-mw-4.2.5.ebuild | 98 ++++++++++++++++++++++ |
14 |
.../eid-mw/files/gtk_not_required_4_2_5.patch | 75 +++++++++++++++++ |
15 |
app-crypt/eid-mw/metadata.xml | 2 +- |
16 |
4 files changed, 175 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest |
19 |
index d6c050028fb..881a3d0dc69 100644 |
20 |
--- a/app-crypt/eid-mw/Manifest |
21 |
+++ b/app-crypt/eid-mw/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f WHIRLPOOL b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643 |
24 |
+DIST eid-mw-4.2.5.tar.gz 7751526 SHA256 d2c46a65026790485f39db0b6d9b66a65b1d19061f3682a0b6da2e2b0c54bc81 SHA512 cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075 WHIRLPOOL c24186b1f2b6b02df4a790e3a8c3d1f8e762b1e556d8f55aeeb4523a71387045827b47444246334933fc3d746485ea14086cfe41c5ec23f43826e6a7375c7fc3 |
25 |
|
26 |
diff --git a/app-crypt/eid-mw/eid-mw-4.2.5.ebuild b/app-crypt/eid-mw/eid-mw-4.2.5.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..f77817c88b4 |
29 |
--- /dev/null |
30 |
+++ b/app-crypt/eid-mw/eid-mw-4.2.5.ebuild |
31 |
@@ -0,0 +1,98 @@ |
32 |
+# Copyright 1999-2017 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=6 |
36 |
+ |
37 |
+inherit eutils autotools mozextension |
38 |
+ |
39 |
+if [[ ${PV} == "9999" ]] ; then |
40 |
+ EGIT_REPO_URI="git://github.com/Fedict/${PN}.git |
41 |
+ https://github.com/Fedict/${PN}.git" |
42 |
+ inherit git-r3 |
43 |
+ SRC_URI="" |
44 |
+else |
45 |
+ SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> |
46 |
+ ${P}.tar.gz" |
47 |
+ KEYWORDS="~x86 ~amd64 ~arm" |
48 |
+fi |
49 |
+ |
50 |
+SLOT="0" |
51 |
+LICENSE="LGPL-3" |
52 |
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" |
53 |
+ |
54 |
+HOMEPAGE="https://eid.belgium.be" |
55 |
+ |
56 |
+IUSE="+dialogs +gtk p11-kit +xpi" |
57 |
+ |
58 |
+REQUIRED_USE=" |
59 |
+ dialogs? ( gtk )" |
60 |
+ |
61 |
+RDEPEND="gtk? ( |
62 |
+ x11-libs/gdk-pixbuf[jpeg] |
63 |
+ x11-libs/gtk+:* |
64 |
+ dev-libs/libxml2 |
65 |
+ net-misc/curl[ssl] |
66 |
+ net-libs/libproxy |
67 |
+ !app-misc/eid-viewer-bin |
68 |
+ ) |
69 |
+ >=sys-apps/pcsc-lite-1.2.9 |
70 |
+ p11-kit? ( app-crypt/p11-kit ) |
71 |
+ xpi? ( || ( >=www-client/firefox-bin-3.6.24 |
72 |
+ >=www-client/firefox-3.6.20 ) )" |
73 |
+ |
74 |
+DEPEND="${RDEPEND} |
75 |
+ virtual/pkgconfig" |
76 |
+ |
77 |
+src_prepare() { |
78 |
+ eapply_user |
79 |
+ |
80 |
+ sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die |
81 |
+ sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die |
82 |
+ |
83 |
+ # hardcoded lsb_info |
84 |
+ sed -i \ |
85 |
+ -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \ |
86 |
+ -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \ |
87 |
+ -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \ |
88 |
+ plugins_tools/aboutmw/gtk/about-main.c || die |
89 |
+ |
90 |
+ if [[ ${PV} == "9999" ]] ; then |
91 |
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch |
92 |
+ else |
93 |
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2_5.patch |
94 |
+ fi |
95 |
+ |
96 |
+ eautoreconf |
97 |
+} |
98 |
+ |
99 |
+src_configure() { |
100 |
+ econf \ |
101 |
+ $(use_enable dialogs) \ |
102 |
+ $(use_enable p11-kit p11kit) \ |
103 |
+ --with-gnu-ld \ |
104 |
+ --disable-static \ |
105 |
+ --disable-signed |
106 |
+} |
107 |
+ |
108 |
+src_install() { |
109 |
+ emake DESTDIR="${D}" install |
110 |
+ |
111 |
+ if use xpi; then |
112 |
+ declare MOZILLA_FIVE_HOME |
113 |
+ if has_version '>=www-client/firefox-3.6.20'; then |
114 |
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox" |
115 |
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
116 |
+ fi |
117 |
+ if has_version '>=www-client/firefox-bin-3.6.24'; then |
118 |
+ MOZILLA_FIVE_HOME="/opt/firefox" |
119 |
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
120 |
+ fi |
121 |
+ fi |
122 |
+ rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die |
123 |
+ use gtk || rm -r "${D}/usr/include/eid-util" || die |
124 |
+} |
125 |
+ |
126 |
+pkg_postinst() |
127 |
+{ |
128 |
+ use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/ |
129 |
+} |
130 |
|
131 |
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch |
132 |
new file mode 100644 |
133 |
index 00000000000..a1680c2353d |
134 |
--- /dev/null |
135 |
+++ b/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch |
136 |
@@ -0,0 +1,75 @@ |
137 |
+diff --git a/Makefile.am b/Makefile.am |
138 |
+index 393ecb3..0e14661 100644 |
139 |
+--- a/Makefile.am |
140 |
++++ b/Makefile.am |
141 |
+@@ -1,7 +1,7 @@ |
142 |
+ ACLOCAL_AMFLAGS = -I scripts/m4 |
143 |
+ EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc |
144 |
+ |
145 |
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer |
146 |
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi |
147 |
+ |
148 |
+ xpipackage: |
149 |
+ $(MAKE) -C plugins_tools/xpi xpipackage |
150 |
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am |
151 |
+index 02e4e36..86d607b 100644 |
152 |
+--- a/cardcomm/pkcs11/src/Makefile.am |
153 |
++++ b/cardcomm/pkcs11/src/Makefile.am |
154 |
+@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \ |
155 |
+ dialogs/dialogsgtk/single_dialog.c |
156 |
+ endif |
157 |
+ |
158 |
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin |
159 |
+ |
160 |
+ if P11KIT |
161 |
+ dist_p11kitcf_DATA = beid.module |
162 |
+@@ -176,30 +175,4 @@ install-exec-hook: |
163 |
+ $(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so |
164 |
+ endif |
165 |
+ |
166 |
+-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c |
167 |
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
168 |
+-beid_askpin_LDADD = @GTK_LIBS@ |
169 |
+- |
170 |
+-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c |
171 |
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
172 |
+-beid_changepin_LDADD = @GTK_LIBS@ |
173 |
+- |
174 |
+-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c |
175 |
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
176 |
+-beid_badpin_LDADD = @GTK_LIBS@ |
177 |
+- |
178 |
+-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c |
179 |
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
180 |
+-beid_askaccess_LDADD = @GTK_LIBS@ |
181 |
+- |
182 |
+-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c |
183 |
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
184 |
+-beid_spr_askpin_LDADD = @GTK_LIBS@ |
185 |
+- |
186 |
+-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c |
187 |
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
188 |
+-beid_spr_changepin_LDADD = @GTK_LIBS@ |
189 |
+- |
190 |
+ pkgconfig_DATA=libbeidpkcs11.pc |
191 |
+- |
192 |
+-SUBDIRS = dialogs/dialogsgtk/po |
193 |
+diff --git a/configure.ac b/configure.ac |
194 |
+index 9bf10f9..f0120b1 100644 |
195 |
+--- a/configure.ac |
196 |
++++ b/configure.ac |
197 |
+@@ -59,14 +59,6 @@ fi |
198 |
+ |
199 |
+ AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk]) |
200 |
+ |
201 |
+-if test "$have_gtk" = "no" |
202 |
+-then |
203 |
+- AC_MSG_ERROR([At least one version of GTK is required.]) |
204 |
+-fi |
205 |
+- |
206 |
+-PKG_CHECK_MODULES([XML2], [libxml-2.0]) |
207 |
+-PKG_CHECK_MODULES([libproxy], [libproxy-1.0]) |
208 |
+- |
209 |
+ ########################################################################### |
210 |
+ ####### read user-specific requests from --enable directives ###### |
211 |
+ ########################################################################### |
212 |
|
213 |
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml |
214 |
index 9cc32049c19..5a0c5666c03 100644 |
215 |
--- a/app-crypt/eid-mw/metadata.xml |
216 |
+++ b/app-crypt/eid-mw/metadata.xml |
217 |
@@ -16,7 +16,7 @@ With your eID, you can: |
218 |
- authenticate yourself. This is a way of checking that you are who you say you are. That can be handy on the internet or to enable your children to chat in safety. |
219 |
- place a legally binding electronic signature on electronic documents. |
220 |
|
221 |
-These three functions form the basis of the countless applications for your eID. Go to http://welcome-to-e-belgium.be/en/ and check out what can you do with it? and discover all the things you can use the eID for. |
222 |
+These three functions form the basis of the countless applications for your eID. Go to https://my.belgium.be and check out what can you do with it? and discover all the things you can use the eID for. |
223 |
</longdescription> |
224 |
<use> |
225 |
<flag name="gtk"> |