From 4ab2d098fb6fb70d813e7c6bc3e86bb6c6fab2959fa4ef6fd4cea5ba2529a822 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 22 Sep 2020 10:18:35 +0000 Subject: [PATCH] Accepting request 835884 from home:msmeissn:branches:security - updated to 5.0.8 eID Viewer - Now supports applet 1.8 eID cards - updated to 5.0.6 Pkcs11 - Now supports applet 1.8 eID cards - SDK now supports applet 1.8 eID cards Minidriver - Now supports applet 1.8 eID cards OBS-URL: https://build.opensuse.org/request/show/835884 OBS-URL: https://build.opensuse.org/package/show/security/eid-mw?expand=0&rev=3 --- eid-mw-4.0.6-1620_tcm444-258906.tar.gz | 3 - eid-mw-5.0.8-v5.0.8v.31.g6af62466.tar.gz | 3 + eid-mw-5.0.8-v5.0.8v.31.g6af62466.tar.gz.asc | 16 ++ eid-mw-add_missing_includes.patch | 16 -- eid-mw.changes | 14 ++ eid-mw.keyring | 29 +++ eid-mw.spec | 179 ++++++++++++++----- 7 files changed, 195 insertions(+), 65 deletions(-) delete mode 100644 eid-mw-4.0.6-1620_tcm444-258906.tar.gz create mode 100644 eid-mw-5.0.8-v5.0.8v.31.g6af62466.tar.gz create mode 100644 eid-mw-5.0.8-v5.0.8v.31.g6af62466.tar.gz.asc delete mode 100644 eid-mw-add_missing_includes.patch create mode 100644 eid-mw.keyring diff --git a/eid-mw-4.0.6-1620_tcm444-258906.tar.gz b/eid-mw-4.0.6-1620_tcm444-258906.tar.gz deleted file mode 100644 index 093e512..0000000 --- a/eid-mw-4.0.6-1620_tcm444-258906.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9951e13c1283139335765f72e464834b0415e62da346a73dd7c28b9fadf24775 -size 4335550 diff --git a/eid-mw-5.0.8-v5.0.8v.31.g6af62466.tar.gz b/eid-mw-5.0.8-v5.0.8v.31.g6af62466.tar.gz new file mode 100644 index 0000000..5ff4c94 --- /dev/null +++ b/eid-mw-5.0.8-v5.0.8v.31.g6af62466.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:283a1b0e9401a9d593a5afa96182214b33bb351c6f2d2bdc081e9b0a1ac4f180 +size 7055826 diff --git a/eid-mw-5.0.8-v5.0.8v.31.g6af62466.tar.gz.asc b/eid-mw-5.0.8-v5.0.8v.31.g6af62466.tar.gz.asc new file mode 100644 index 0000000..b279fab --- /dev/null +++ b/eid-mw-5.0.8-v5.0.8v.31.g6af62466.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2VQm4wnASSmQ2OjigkpeABCgTUYFAl9k2nwACgkQgkpeABCg +TUbtTxAAhv/ImRxxvQcpr0SQdUkCoqeF2fT/MhoeoWwgQNXjvpb1S2wn92mgUZ+b +Mvs9724prPpMB9GxdAGiD7j6IBtLjiptQNmqqCvyxNrMBkTxAQQ6ahxv8WVJirqv +6BXbC/dX6s6CUBOxlkerEhP/VjinlVIHD97R4PF7AqUsTZG0TgcKDZ/zcDO/A3Ff +swzesrHhvIy8phGavZKUeA20GrUsRm7h1ek98kkX+3W4mcZ+UkaiJBusEmqIMoyN +Bz8+w7wGTbd+uCecdXAFxi3qaY1ZX2HfR5LoDBSIfnrqmfUvDDdOQUdkIeXa1dKY +Xrol+SvFJDEVLXb1yF+VYEHYtoYKDVbcwJnkTB4jMgwfVwwWjkCrT5FXcUE8oTZn +0TCDlm5qmN9e8ISH+1CYLlxI7kAFDXgXkCVvC84RE6TJ9hDTKZzAp528Af8fSFlW +2AlbrWSOGdzCBEHmi0JIcXg7JkOliyP0OD6rxYL67oYqx0NfUKg0H14b44m3yDn2 +TFcjON4fNcGxKiawP94tzX7hJdRVL7+rhubAScdLqi7ZxGYzhbcoiBtJTedPmYCT +gEfy/Af7a695GjAUDlKivC/HZXQ9SyeUCDemg4LhyOXgCYzrzUDeJiZq1SFRx7uV +kmVBsa7FO6xdvyWgokaAUNq9KXUbcyliE6UJMZDWCODELsZbKTs= +=V5Nw +-----END PGP SIGNATURE----- diff --git a/eid-mw-add_missing_includes.patch b/eid-mw-add_missing_includes.patch deleted file mode 100644 index 88e7a94..0000000 --- a/eid-mw-add_missing_includes.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - dialogs/src/dialogsgtk/parent.c | 1 + - 1 file changed, 1 insertion(+) - -Index: dialogs/src/dialogsgtk/parent.c -=================================================================== ---- dialogs/src/dialogsgtk/parent.c.orig 2014-12-04 08:47:56.664098930 +0100 -+++ dialogs/src/dialogsgtk/parent.c 2014-12-04 08:48:32.771245582 +0100 -@@ -1,6 +1,7 @@ - #include - #include "config.h" - #include "parent.h" -+#include - #include - #include - diff --git a/eid-mw.changes b/eid-mw.changes index f598502..fabe2e8 100644 --- a/eid-mw.changes +++ b/eid-mw.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Sep 21 15:16:03 UTC 2020 - Marcus Meissner + +- updated to 5.0.8 + eID Viewer + - Now supports applet 1.8 eID cards + +- updated to 5.0.6 + Pkcs11 + - Now supports applet 1.8 eID cards + - SDK now supports applet 1.8 eID cards + Minidriver + - Now supports applet 1.8 eID cards + ------------------------------------------------------------------- Mon Dec 8 07:55:24 CET 2014 - pth@suse.de diff --git a/eid-mw.keyring b/eid-mw.keyring new file mode 100644 index 0000000..b1345f4 --- /dev/null +++ b/eid-mw.keyring @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFN8fdEBEADIc6aOg7A7JdfaoVjuwqXZk9E+A3GDLIRLfT0UfpJGkHPyI1Dd +flV+sz2qmVHYM4ZFv3Nq9kLNiNslC0ZHOJecK64ZOJdoVdNnyXYRa1BhdRibo4qD +aCDygbP7wJjoirbsPumitzScmda9toFxLmwMPOJ9mQOVUHTdeTPNR1KzyrJWcJwB +8J8i3S5dXOaAYOIVymik9VwxYVzgLQndt7gXKS1YkjZy/YeC7IYiO8DM9vtgcTJL +rbO649xTZ1DAfXwPa0Jumn/G6v0IhGFLKvrrFuWPeFEWh4wnLFrn52tOfmdOrwSD +Y3pNrpWFwTtvwwMFCR/1K2rdRzCsTh2cHg8t1kI0X9L4hvo81oPnbuVANRRnQMbI +r/K54odqQzGIHTYlVhjh0pIGM/oMv+YP82qB8WYGF3tkFfgYmv/CzVzqMPi7Is5j +vav4wts2h0dHOSpJebWkOwNug4bSyJLKQtAYURsSmkoSTfP2MoLxJh8WGLbdkGxR +oxVdJ96L9AFMVwjVW7OFzKaoLXaxEcTbzlYX3VR2vPf2JGPVR7xrZpo0GltP+3pl +Svqrgtbz6beVe6MkFmntqr3Ncl4OYLnuV1hRNIF/kQMaipFFNI+GEaq0cNtQdjPD +io1440jjXBJZPRbaIdKB78Alm07NBxTHM2d9ugdU38zZHC/IoGgq6UN4GwARAQAB +tDVCZWxnaWFuIGVJRCBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKGNvbnRpbnVvdXMg +YnVpbGRzKYkCOAQTAQIAIgUCU3x90QIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC +F4AACgkQgkpeABCgTUYigA/+NnddLAdHhPsnPDwAPayIK7UBGmWD172CWqB+g5WZ +BIotqW3radx8P2KrdpHBe4G0k7HIaGjjYsMtmK85e8R5wuNAFCD4A0WzNdjVvUj5 +XffEsr66+ZmrsRiXYRgea2aGPbOWtLND0pHg1eWHuNUgbtxco1VRBr9t/BbjOgYg +1MiwJ+qUO35D5xyNGutfVUjZj+hzmym0S4TKMC0l0bI2NwQVLq9L1HQ8lRF0mu9P +afK6g9kYrtMdzNcPEJN6dQt9l17jw/vI4IZ7T6ER0BXwy7V86um3QIauLbVNpw0j +3UBc3OCusGHbDy0h3xAYeqKF0njGUwWkEp7CChbuoUPc3gqS8mQYwOfhp1gMx5YG +WRxA+b4/ma7Fs0EsGqTq9fS5vIKqvXCEJSn9K4F3oy/1h16ulAFzeVlr3znQvI17 +O47UlVs9q02HKtqfPZQxxdpN+2pTB8IdW6Ssoi81nHh/3M36SHF+fZyFKUm0F9q0 +J+pb1SxMlGLUtg+Kz4PX5bqVSvS638qgNyi7U6oTwJ6Qt7EAyRNKTozINwXD1e+X +kNhlNjT5XiDwSX490KKYxqP/sVtP/Hb/ufTi1XJYLly77VZJpDN3BRQXGA1r+Y81 +fyqR0Hn3NRiKEu2tHA+no3jYD0FLxGgsA82ms9szFw07DgQ94ThYrVx7OacqdIvB +0rY= +=b8WZ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/eid-mw.spec b/eid-mw.spec index 46fd861..0732573 100644 --- a/eid-mw.spec +++ b/eid-mw.spec @@ -1,3 +1,7 @@ +# +# spec file for package eid-mw +# +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2014 Philipp Thomas # # All modifications and additions to the file contributed by third parties @@ -9,45 +13,58 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# -%define real_version 4.0.6 -Name: eid-mw -Version: %{real_version}+1620 -Release: 1 -%define pkg_version %{real_version}-1620 -%define src_tag _tcm444-258906 -License: LGPL-3.0+ -Group: Productivity/Security -URL: http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/ -Summary: Belgium electronic identity card PKCS#11 module and Firefox plugin -Source: %{name}-%{pkg_version}%{src_tag}.tar.gz -Source1: baselibs.conf +%define revision 31.g6af62466 +%define src_name eid-mw-%{version}-v%{version}v.%{revision} + +Name: eid-mw +Version: 5.0.8 +Release: 0 +URL: http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/ +Summary: Belgium electronic identity card PKCS#11 module and Firefox plugin +License: LGPL-3.0-or-later +Group: Productivity/Security +Source: https://dist.eid.belgium.be/continuous/sources/%{src_name}.tar.gz +Source2: https://dist.eid.belgium.be/continuous/sources/%{src_name}.tar.gz.asc +Source1: baselibs.conf #Source2: eid-mw-rpmlintrc -Patch1: eid-mw-add_missing_includes.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel -BuildRequires: pcsc-lite-devel +Source99: eid-mw.keyring +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gtk2-devel +BuildRequires: pcsc-lite-devel Requires(pre): /sbin/chkconfig -BuildRequires: autoconf automake libtool -BuildRequires: subversion +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: subversion %if 0%{?suse_version} -Requires: pcsc-ccid -BuildRequires: gcc-c++ -BuildRequires: gcc-c++ make glibc-devel pkgconfig -BuildRequires: update-desktop-files -BuildRequires: MozillaFirefox -Recommends: pcsc-acr38 -BuildRequires: pcsc-acr38 -Recommends: pcsc-lite -BuildRequires: pcsc-lite -Recommends: zip -BuildRequires: zip +Requires: pcsc-ccid +BuildRequires: MozillaFirefox +BuildRequires: gcc-c++ +BuildRequires: gtk3-devel +BuildRequires: glibc-devel +BuildRequires: make +BuildRequires: libxml2-devel +BuildRequires: libproxy-devel +#BuildRequires: libassuan-devel +BuildRequires: libopenssl-devel +BuildRequires: libcurl-devel +BuildRequires: p11-kit-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +Recommends: pcsc-acr38 +BuildRequires: pcsc-acr38 +Recommends: pcsc-lite +BuildRequires: pcsc-lite +Recommends: zip +BuildRequires: zip %else -Requires: ccid +Requires: ccid %endif -Conflicts: openct +Conflicts: openct %description The eID Middleware provides the libraries, a PKCS#11 module and a Firefox @@ -57,8 +74,8 @@ programs needed by the eID Middleware and the infrastructure for eid-mw. %package devel Summary: Belgium electronic identity card PKCS#11 module - development package -Requires: eid-mw = %{version} Group: Development/Libraries/C and C++ +Requires: eid-mw = %{version} %description devel The eID Middleware provides the libraries, a PKCS#11 module and a Firefox @@ -83,21 +100,45 @@ Recommends: MozillaFirefox %description firefox Mozilla Firefox extension for using the Belgian eID (electronic identity card). +%package -n eid-viewer +Summary: Belgium electronic identity card viewer +Group: Productivity/Security +Requires: eid-mw +%if 0%{?suse_version} +Requires: pcsc-ccid +%else +Requires: ccid +%endif +Requires: pcsc-lite +Conflicts: openct + +%description -n eid-viewer +The eid-viewer application allows the user to read out any information from +a Belgian electronic identity card. Both identity information and information +about the stored cryptographic keys can be read in a user-friendly manner, +and can easily be printed out or stored for later reviewal. + +The application verifies the signature of the identity information, +checks whether it was signed by a government-issued key, and optionally +checks the certificate against the government's Trust Service. + %prep -%setup -q -n %{name}-%{real_version} -%patch1 +%setup -q -n %{src_name} %build -%configure \ - --with-mozext="%{_datadir}/mozilla/extensions" \ - --enable-dialogs=yes \ - --disable-static + +%configure --enable-p11v220 --enable-webextension --disable-static %{__make} %{?_smp_mflags} %install -make DESTDIR="%{buildroot}" install +%{__make} install DESTDIR="%{buildroot}" +mkdir -p %{buildroot}%{_libdir}/mozilla/ +mv %{buildroot}/usr/lib/mozilla/pkcs11-modules %{buildroot}%{_libdir}/mozilla/ || true +rm -f %{buildroot}%{_datadir}/applications/eid-viewer.desktop +desktop-file-install --dir %{buildroot}%{_datadir}/applications --add-category="Office;Viewer;" --vendor fedict plugins_tools/eid-viewer/eid-viewer.desktop || true + %post -n eid-mw-libs /sbin/ldconfig @@ -109,6 +150,9 @@ elif /usr/bin/pgrep 'iceweasel' &>/dev/null; then echo "INFO: You may have to restart Iceweasel for the Belgium eID add-on to work." >&2 fi +%post -n eid-viewer +[ -x /usr/bin/glib-compile-schemas ] && /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + %postun -n eid-mw-libs /sbin/ldconfig ### Make pcscd reread configuration and rescan USB bus. @@ -118,7 +162,7 @@ fi %files %defattr(-, root, root, 0755) -%doc AUTHORS COPYING ChangeLog README +%doc AUTHORS COPYING %exclude %{_libdir}/*.la %{_libexecdir}/beid-askaccess %{_libexecdir}/beid-askpin @@ -126,23 +170,66 @@ fi %{_libexecdir}/beid-changepin %{_libexecdir}/beid-spr-askpin %{_libexecdir}/beid-spr-changepin +/etc/xdg/autostart/beid-update-nssdb.desktop +%{_bindir}/about-eid-mw +%{_bindir}/beid-update-nssdb +/usr/share/locale/*/LC_MESSAGES/about-eid-mw.mo +/usr/share/locale/*/LC_MESSAGES/dialogs-beid.mo + + %files libs %defattr(-,root,root) %{_libdir}/libbeidpkcs11.so.* -%{_libdir}/libbeidcommon.so.* +%{_libdir}/libeidviewer.so.* +%dir %{_libdir}/pkcs11 +%{_libdir}/pkcs11/beidpkcs11.so +%dir /usr/share/p11-kit +%dir /usr/share/p11-kit/modules +/usr/share/p11-kit/modules/beid.module + %files firefox %defattr(-,root,root) %dir %{_datadir}/mozilla/ -%{_datadir}/mozilla/extensions/belgiumeid@eid.belgium.be +%dir %{_libdir}/mozilla/pkcs11-modules +%{_libdir}/mozilla/pkcs11-modules/beidp11kit.json +%{_libdir}/mozilla/pkcs11-modules/beidpkcs11.json +%{_datadir}/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be.xpi %files devel %defattr(-,root,root) %{_libdir}/libbeidpkcs11.so -%{_libdir}/libbeiddialogs.so -%{_libdir}/libbeidcardlayer.so -%{_libdir}/libbeidcommon.so +%{_libdir}/libeidviewer.so +%dir /usr/include/eid-util +%dir /usr/include/eid-viewer +%dir /usr/include/beid +%dir /usr/include/beid/rsaref220 +/usr/include/eid-util/utftranslate.h +/usr/include/eid-viewer/certhelpers.h +/usr/include/eid-viewer/eid-viewer.h +/usr/include/eid-viewer/macros.h +/usr/include/eid-viewer/oslayer.h +/usr/include/eid-viewer/verify_cert.h +/usr/include/beid/rsaref220/pkcs11.h +/usr/include/beid/rsaref220/pkcs11f.h +/usr/include/beid/rsaref220/pkcs11t.h +/usr/include/beid/rsaref220/unix.h +%{_libdir}/pkgconfig/libbeidpkcs11.pc + + +%files -n eid-viewer +%defattr(-,root,root,0755) +%{_bindir}/eid-viewer +%{_datadir}/locale/*/LC_MESSAGES/eid-viewer.mo +%{_datadir}/applications/fedict-eid-viewer.desktop +%{_datadir}/eid-mw/ +%{_datadir}/metainfo/ +%exclude %{_datadir}/metainfo/*metainfo.xml +%{_datadir}/icons/hicolor/*/*/eid-viewer.png +%if ! 0%{?el6} +%{_datadir}/glib-2.0/schemas/ +%endif %changelog