Gentoo Archives: gentoo-commits

From: Samuel Bernardo <samuelbernardo.mail@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/ssnb:master commit in: app-misc/cartao-cidadao-git/files/, app-misc/cartao-cidadao-git/
Date: Sun, 17 Nov 2019 00:16:06
Message-Id: 1573949742.f6793d420ef15d0306af4406c73659413373a47c.samuelbernardo@gentoo
1 commit: f6793d420ef15d0306af4406c73659413373a47c
2 Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
3 AuthorDate: Sun Nov 17 00:15:42 2019 +0000
4 Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
5 CommitDate: Sun Nov 17 00:15:42 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=f6793d42
7
8 add cartao-cidadao-git
9
10 Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>
11
12 app-misc/cartao-cidadao-git/Manifest | 10 +++
13 .../cartao-cidadao-git-3.0.20.ebuild | 94 +++++++++++++++++++++
14 .../cartao-cidadao-git/files/Makefile.gnu.patch | 17 ++++
15 .../files/XSECDOMUtils.hpp.patch | 12 +++
16 .../files/XadesSignature.cpp.3.0.16.patch | 30 +++++++
17 .../files/XadesSignature.cpp.patch | 38 +++++++++
18 .../files/dlgQndPinpadInfo.cpp.patch | 20 +++++
19 .../cartao-cidadao-git/files/extras-3.0.16.tar.gz | Bin 0 -> 93414 bytes
20 .../cartao-cidadao-git/files/extras-3.0.20.tar.gz | Bin 0 -> 133120 bytes
21 app-misc/cartao-cidadao-git/files/qmake.patch | 17 ++++
22 app-misc/cartao-cidadao-git/metadata.xml | 11 +++
23 11 files changed, 249 insertions(+)
24
25 diff --git a/app-misc/cartao-cidadao-git/Manifest b/app-misc/cartao-cidadao-git/Manifest
26 new file mode 100644
27 index 0000000..fe732a3
28 --- /dev/null
29 +++ b/app-misc/cartao-cidadao-git/Manifest
30 @@ -0,0 +1,10 @@
31 +AUX Makefile.gnu.patch 592 BLAKE2B 417e9fd33f4ba6897f4ddbcd8ec6e53e2bc50e2f854188e1698ada8c9e2e0ea6bbdf5fbf40ddd11e653ec024abdd9fd37f091b38afcbabef7ed445c98ee3ce75 SHA512 8da9359d93fbd4a2ed6df8a58f15228ba13ee7117634e024c2ea759ee046b5ba255d374143b087b506a32d21f44c2cad63b2af95a6834ad051d52e0b5b8aa9cb
32 +AUX XSECDOMUtils.hpp.patch 536 BLAKE2B 5ea81c2ef978ab408ece58fc068ab972251bd74b0d163c184169ec96064446d5a3781ca11b918ded7f1af9e04b9ab872a817dfdf45a54cd69326c346fa7fe153 SHA512 7ae206233ef95c5e0cd3c6e00dd8d47db81b85c1ee99bbf01c0dff143b8dcf2394a4c211eccb7a8f8fb1c3a2c78d624883865017d7f9a9118fcff9bd03564c66
33 +AUX XadesSignature.cpp.3.0.16.patch 1005 BLAKE2B 756f629c778a3c5330631ea786395b4f5c41e5b41ff49d6f22f874a98d6c3bab9be8c46990896e67107f8d00bdbec79f4dd0dd543aa1043664c824f73d883163 SHA512 09070ccb55b7b4cc311cb84924dbf791e3b7584aeb7c66cdde8cf5e940169930e8b3f8a4be30fd224b2293ca91ba7e5a13351b3a5fb6ce81d1741ba2120d61e8
34 +AUX XadesSignature.cpp.patch 1260 BLAKE2B db162abcf4011fc99f6cbf09d70fb5109370b1a75057ad6a7f54dac357f748e144ea5a3585bfd4bbfc3f4d8cfa617137673a3e742208257661eeb12c18ca2d81 SHA512 0d216324c9bba7497aa1af1498bfc2f4bd048d5ba73b8c5479925a4df7f4950a07130b1285abf6928a36fac723b30943b777e1a9ce9213ab3651b94e0f56dca8
35 +AUX dlgQndPinpadInfo.cpp.patch 813 BLAKE2B 47f0f20e56102ee6eeb65209ad9a11544101e7f03bec7d37cfbab35788066daf8afaa915193ce9b61fc566f30b5826fee3ebfb20d647d620b30ec4751221a4fa SHA512 b8ddccf85b652fc28f9fea77016da45b1c2c6122a03e3ee3de6a558c552e60cca29a3009f8197f687a1aed65dedf77573c497267cffd297d3481afd05ededd72
36 +AUX extras-3.0.16.tar.gz 93414 BLAKE2B 6f4f30fd6a0f7da8b0daef4bef0012085053d857a06fc811d2f4c534346cf66e91c9d02caa6807de4390a79bec8d4cded904a5b6a16eb34c2c064651d4dc8fa1 SHA512 c660421575bcf6e7af50e1e585a3f309e3e0ee855ec81ecc2bee87f42b395b7c817f264e3d4d74a81b98ad6bbf3c89b7c7abe1f7cf23df2ae998639bcb6bd1ae
37 +AUX extras-3.0.20.tar.gz 133120 BLAKE2B 7743858d88359d05eae39e1f4e4589714d98fcace12b20d83c23619af37d76b72b63725196ccee5e815a2dfcafb0436bc2c3e40ac6ef2ebca59bc54d1a2c417d SHA512 f7b1cd11e45e170d307de800fc92ea29c5fba7a2f8cae06079b813b9441f70a89bb0ccaae6769bf42007549eed45f6261028dcd6e147fcce9bfaec45bf62867a
38 +AUX qmake.patch 468 BLAKE2B 2f91848f33b7d94de801e65d4a97dc3c030701888043df444e10a464f0d796dd7f5f9fc55feef2b8fa175fa984fe4b5f460b6268cce5e7d63d0de78b106deaaf SHA512 ff8ed18d0748e04b1041c7b189a93dfe6674273e677ec86676187b2323ca794d61424204ec8c395c1f5b603c5dd6c346ae2db1cf9886fb42550a827f50c55d34
39 +EBUILD cartao-cidadao-git-3.0.20.ebuild 2075 BLAKE2B 31d6e41f432f00381f5a42e51012a7e6dfb7a5e713dbb80768d57b0cbd9625e1c228cff70ec0cf2e6851b1db53975436d7980ea68c6539b870dce2efff936186 SHA512 cd8a240dfdaa8fdd7e142e60512dd27c9f32ff60db61a3236081ea2ff160588f64dabe7cda6cfffefdcb2a976bd61e384104f09400345b31d3ba32b86fd5699b
40 +MISC metadata.xml 352 BLAKE2B cd72105d43a6ffe93ea0b14ca747161283860b37f2c70aac1d29227bc1b774fbfc1d8020effb2fd24c3165d1ffab853ce8791dd263cbaf6ceaf44b36036af25b SHA512 19f6c0e85c78157c5c542b951b3907f59b2891567d452163b46fd3369545095e772167eddc87c31a00e7b5283070f233d92edd86cac5159c123615ffd2c298b9
41
42 diff --git a/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.0.20.ebuild b/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.0.20.ebuild
43 new file mode 100644
44 index 0000000..c124da1
45 --- /dev/null
46 +++ b/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.0.20.ebuild
47 @@ -0,0 +1,94 @@
48 +# Copyright 1999-2019 Gentoo Foundation
49 +# Distributed under the terms of the GNU General Public License v2
50 +
51 +EAPI=7
52 +
53 +DESCRIPTION="Tools for authenticating with https://www.autenticacao.gov.pt/"
54 +HOMEPAGE="https://svn.gov.pt/projects/ccidadao"
55 +
56 +inherit git-r3 unpacker eutils
57 +
58 +EGIT_CLONE_TYPE="single"
59 +EGIT_REPO_URI="https://github.com/amagovpt/autenticacao.gov.git"
60 +EGIT_COMMIT="v$PV"
61 +
62 +LICENSE="EUPL"
63 +SLOT="3"
64 +KEYWORDS="~amd64 ~x86"
65 +IUSE=""
66 +
67 +DEPEND=">=sys-apps/pcsc-lite-1.5.0
68 + sys-apps/pcsc-tools
69 + app-crypt/ccid
70 + >=dev-qt/qtcore-5
71 + dev-qt/qtchooser
72 + dev-libs/xml-security-c
73 + dev-libs/xerces-c
74 + dev-vcs/subversion
75 + dev-libs/openssl
76 + media-libs/jasper
77 + app-text/poppler
78 + dev-libs/libzip"
79 +RDEPEND="${DEPEND}
80 + !app-misc/autenticacao-gov-pt:2
81 + !app-misc/cartao-cidadao-svn"
82 +
83 +PATCHES=(
84 + #"${FILESDIR}/*.${PV}.patch"
85 + )
86 +
87 +src_unpack() {
88 + default
89 + git-r3_fetch
90 + git-r3_checkout
91 + unpack ${FILESDIR}/extras-${PV}.tar.gz
92 +}
93 +
94 +src_prepare() {
95 + default
96 + cd "${S}"
97 + rm -rf ./docs README.md license.txt
98 + mv pteid-mw-pt/_src/eidmw/* .
99 + rm -rf pteid-mw-pt
100 +}
101 +
102 +src_configure() {
103 + # configure
104 + if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
105 + ${ECONF_SOURCE:-.}/configure || die "Error: econf failed"
106 + elif [[ -f ${ECONF_SOURCE:-.}/configure ]] ; then
107 + fperms 755 ${ECONF_SOURCE:-.}/configure
108 + ${ECONF_SOURCE:-.}/configure || die "Error: econf failed"
109 + else
110 + default
111 + fi
112 +}
113 +
114 +src_compile() {
115 + # qmake
116 + if [ -f pteid-mw.pro ]; then
117 + qmake pteid-mw.pro
118 + else
119 + die "Error: compile phase failed because is missing pteid-mw.pro!"
120 + fi
121 +
122 + # make
123 + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
124 + emake || die "Error: emake failed"
125 + else
126 + die "Error: compile phase failed because is missing Makefile!"
127 + fi
128 +}
129 +
130 +src_install() {
131 + # make install
132 + if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
133 + emake INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "Error: emake install failed"
134 + else
135 + die "Error: install phase failed because is missing Makefile!"
136 + fi
137 +
138 + # extras install
139 + cp -R "${WORKDIR}/usr" "${D}" || die "Error: copy files in install phase failed!"
140 +}
141 +
142
143 diff --git a/app-misc/cartao-cidadao-git/files/Makefile.gnu.patch b/app-misc/cartao-cidadao-git/files/Makefile.gnu.patch
144 new file mode 100644
145 index 0000000..b935940
146 --- /dev/null
147 +++ b/app-misc/cartao-cidadao-git/files/Makefile.gnu.patch
148 @@ -0,0 +1,17 @@
149 +--- a/FreeImagePTEiD/Makefile.gnu 2017-09-21 20:54:23.981722201 +0100
150 ++++ b/FreeImagePTEiD/Makefile.gnu 2017-10-21 17:47:58.342409997 +0100
151 +@@ -23,9 +23,11 @@
152 + override CXXFLAGS += -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
153 + override CXXFLAGS += $(INCLUDE)
154 +
155 +-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
156 +- CFLAGS += -fPIC
157 +- CXXFLAGS += -fPIC
158 ++ARCH_TEST := $(shell sh -c 'uname -m 2>/dev/null || echo not')
159 ++ARCH_TEST ?= error
160 ++ifeq ($(ARCH_TEST),x86_64)
161 ++ override CFLAGS += -fPIC
162 ++ override CXXFLAGS += -fPIC
163 + endif
164 +
165 + TARGET = freeimagePTEiD
166
167 diff --git a/app-misc/cartao-cidadao-git/files/XSECDOMUtils.hpp.patch b/app-misc/cartao-cidadao-git/files/XSECDOMUtils.hpp.patch
168 new file mode 100644
169 index 0000000..6cc59ec
170 --- /dev/null
171 +++ b/app-misc/cartao-cidadao-git/files/XSECDOMUtils.hpp.patch
172 @@ -0,0 +1,12 @@
173 +diff -Naur a/applayer/XadesSignature.cpp b/applayer/XadesSignature.cpp
174 +--- a/applayer/XadesSignature.cpp 2019-01-13 20:06:05.519457738 +0000
175 ++++ b/applayer/XadesSignature.cpp 2019-01-13 20:40:45.482262806 +0000
176 +@@ -63,7 +63,7 @@
177 + #include <xsec/enc/XSECCryptoUtils.hpp>
178 + #include <xsec/enc/XSECCryptoException.hpp>
179 + #include <xsec/utils/XSECBinTXFMInputStream.hpp>
180 +-#include <xsec/utils/XSECDOMUtils.hpp>
181 ++//#include <xsec/utils/XSECDOMUtils.hpp>
182 + #include <xsec/transformers/TXFMBase.hpp>
183 + #include <xsec/transformers/TXFMChain.hpp>
184 +
185
186 diff --git a/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.3.0.16.patch b/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.3.0.16.patch
187 new file mode 100644
188 index 0000000..88e6b9b
189 --- /dev/null
190 +++ b/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.3.0.16.patch
191 @@ -0,0 +1,30 @@
192 +diff -Naur a/applayer/XadesSignature.cpp b/applayer/XadesSignature.cpp
193 +--- a/applayer/XadesSignature.cpp 2019-09-13 08:07:22.239291284 +0100
194 ++++ b/applayer/XadesSignature.cpp 2019-09-13 08:14:39.319813193 +0100
195 +@@ -577,7 +577,7 @@
196 +
197 + string c14n;
198 + unsigned char buffer[1024];
199 +- xsecsize_t bytes = 0;
200 ++ XMLSize_t bytes = 0;
201 + while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
202 + {
203 + c14n.append( (char*)&buffer[0], size_t(bytes));
204 +@@ -632,7 +632,7 @@
205 +
206 + string c14n;
207 + unsigned char buffer[1024];
208 +- xsecsize_t bytes = 0;
209 ++ XMLSize_t bytes = 0;
210 + while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
211 + {
212 + c14n.append( (char*)&buffer[0], size_t(bytes));
213 +@@ -897,7 +897,7 @@
214 +
215 + string c14n;
216 + unsigned char buffer[1024];
217 +- xsecsize_t bytes = 0;
218 ++ XMLSize_t bytes = 0;
219 + while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
220 + {
221 + c14n.append((char*)&buffer[0], size_t(bytes));
222
223 diff --git a/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.patch b/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.patch
224 new file mode 100644
225 index 0000000..5014b8f
226 --- /dev/null
227 +++ b/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.patch
228 @@ -0,0 +1,38 @@
229 +diff -Naur a/applayer/XadesSignature.cpp b/applayer/XadesSignature.cpp
230 +--- a/applayer/XadesSignature.cpp 2019-02-18 23:48:47.483833073 +0000
231 ++++ b/applayer/XadesSignature.cpp 2019-02-19 00:43:51.207845230 +0000
232 +@@ -62,6 +62,7 @@
233 +
234 + #include <xsec/enc/XSECCryptoUtils.hpp>
235 + #include <xsec/enc/XSECCryptoException.hpp>
236 ++#include <xsec/enc/XSECCryptoHash.hpp>
237 + #include <xsec/utils/XSECBinTXFMInputStream.hpp>
238 + #include <xsec/utils/XSECDOMUtils.hpp>
239 + #include <xsec/transformers/TXFMBase.hpp>
240 +@@ -567,7 +568,7 @@
241 +
242 + string c14n;
243 + unsigned char buffer[1024];
244 +- xsecsize_t bytes = 0;
245 ++ XMLSize_t bytes = 0;
246 + while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
247 + {
248 + c14n.append( (char*)&buffer[0], size_t(bytes));
249 +@@ -622,7 +623,7 @@
250 +
251 + string c14n;
252 + unsigned char buffer[1024];
253 +- xsecsize_t bytes = 0;
254 ++ XMLSize_t bytes = 0;
255 + while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
256 + {
257 + c14n.append( (char*)&buffer[0], size_t(bytes));
258 +@@ -881,7 +882,7 @@
259 +
260 + string c14n;
261 + unsigned char buffer[1024];
262 +- xsecsize_t bytes = 0;
263 ++ XMLSize_t bytes = 0;
264 + while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
265 + {
266 + c14n.append((char*)&buffer[0], size_t(bytes));
267
268 diff --git a/app-misc/cartao-cidadao-git/files/dlgQndPinpadInfo.cpp.patch b/app-misc/cartao-cidadao-git/files/dlgQndPinpadInfo.cpp.patch
269 new file mode 100644
270 index 0000000..126b308
271 --- /dev/null
272 +++ b/app-misc/cartao-cidadao-git/files/dlgQndPinpadInfo.cpp.patch
273 @@ -0,0 +1,20 @@
274 +diff -Naur a/dialogs/dialogsQTsrv/dlgWndPinpadInfo.cpp b/dialogs/dialogsQTsrv/dlgWndPinpadInfo.cpp
275 +--- a/dialogs/dialogsQTsrv/dlgWndPinpadInfo.cpp 2018-11-11 13:51:45.408429081 +0000
276 ++++ b/dialogs/dialogsQTsrv/dlgWndPinpadInfo.cpp 2018-11-11 13:54:03.660290076 +0000
277 +@@ -21,6 +21,7 @@
278 + #include "dlgWndPinpadInfo.h"
279 + #include "../langUtil.h"
280 + #include <QDesktopWidget>
281 ++#include <QIcon>
282 +
283 + dlgWndPinpadInfo::dlgWndPinpadInfo( unsigned long ulHandle,
284 + DlgPinOperation operation, const QString & Reader,
285 +@@ -39,7 +40,7 @@
286 +
287 + QString Title="";
288 +
289 +- this->setWindowIcon( QIcon(":/Resources/ICO_CARD_EID_PLAIN_16x16.png") );
290 ++ this->setWindowIcon( QIcon("./Resources/ICO_CARD_EID_PLAIN_16x16.png") );
291 +
292 + if (operation == DLG_PIN_OP_CHANGE)
293 + Title+= QString::fromWCharArray(GETSTRING_DLG(ChangeYourPin));
294
295 diff --git a/app-misc/cartao-cidadao-git/files/extras-3.0.16.tar.gz b/app-misc/cartao-cidadao-git/files/extras-3.0.16.tar.gz
296 new file mode 100644
297 index 0000000..67e2ac0
298 Binary files /dev/null and b/app-misc/cartao-cidadao-git/files/extras-3.0.16.tar.gz differ
299
300 diff --git a/app-misc/cartao-cidadao-git/files/extras-3.0.20.tar.gz b/app-misc/cartao-cidadao-git/files/extras-3.0.20.tar.gz
301 new file mode 100644
302 index 0000000..f1cdfd5
303 Binary files /dev/null and b/app-misc/cartao-cidadao-git/files/extras-3.0.20.tar.gz differ
304
305 diff --git a/app-misc/cartao-cidadao-git/files/qmake.patch b/app-misc/cartao-cidadao-git/files/qmake.patch
306 new file mode 100644
307 index 0000000..3b7c465
308 --- /dev/null
309 +++ b/app-misc/cartao-cidadao-git/files/qmake.patch
310 @@ -0,0 +1,17 @@
311 +--- a/configure 2017-09-21 20:34:16.391377881 +0100
312 ++++ b/configure 2017-09-21 21:24:12.444003296 +0100
313 +@@ -302,11 +302,11 @@
314 + my $QtVerZ = 0;
315 + my $qmakeVerI = 10000 * $QtVerX + 100 * $QtVerY + $QtVerZ;
316 +
317 +-my $qmakeVer = `qmake -v`;
318 +-my $qmakeCmd = "qmake";
319 ++my $qmakeVer = `qmake -qt=5 -v`;
320 ++my $qmakeCmd = "qmake -qt=5";
321 + eval {
322 + print "trying qmake...";
323 +- $qmakeVer = `qmake -v`;
324 ++ $qmakeVer = `qmake -qt=5 -v`;
325 + };
326 +
327 + # get the version nr from the version string
328
329 diff --git a/app-misc/cartao-cidadao-git/metadata.xml b/app-misc/cartao-cidadao-git/metadata.xml
330 new file mode 100644
331 index 0000000..05b65b5
332 --- /dev/null
333 +++ b/app-misc/cartao-cidadao-git/metadata.xml
334 @@ -0,0 +1,11 @@
335 +<?xml version="1.0" encoding="UTF-8"?>
336 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
337 +<pkgmetadata>
338 + <maintainer type="person">
339 + <email>samuelbernardo.mail@×××××.com</email>
340 + <name>Samuel Bernardo</name>
341 + </maintainer>
342 + <upstream>
343 + <remote-id type="github">app-misc/cartao-cidadao-git</remote-id>
344 + </upstream>
345 +</pkgmetadata>