Date: Fri, 28 Jan 2022 12:15:23 GMT From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 09707eb57fd1 - main - security/beid: update to 5.0.28 Message-ID: <202201281215.20SCFNMr092935@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=09707eb57fd1ea915d00fc7de1a79f3cc3957dda commit 09707eb57fd1ea915d00fc7de1a79f3cc3957dda Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2021-12-05 14:14:37 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2022-01-28 12:14:09 +0000 security/beid: update to 5.0.28 --- security/beid/Makefile | 5 ++- security/beid/distinfo | 6 ++-- .../patch-plugins__tools_eid-viewer_Makefile.am | 11 ++++++ .../files/patch-plugins__tools_eid-viewer_verify.c | 10 ++++++ ...h-plugins_tools_chrome_pkcs11_beid-update-nssdb | 40 ---------------------- .../patch-plugins_tools_eid-viewer_Makefile.am | 22 ------------ security/beid/pkg-plist | 4 ++- 7 files changed, 29 insertions(+), 69 deletions(-) diff --git a/security/beid/Makefile b/security/beid/Makefile index 7df73a2daee0..f1937afc6205 100644 --- a/security/beid/Makefile +++ b/security/beid/Makefile @@ -1,5 +1,5 @@ PORTNAME= beid -PORTVERSION= 5.0.8 +PORTVERSION= 5.0.28 DISTVERSIONPREFIX= v CATEGORIES= security @@ -44,8 +44,7 @@ post-patch: @${REINPLACE_CMD} -e 's,/usr/bin/pinentry,${LOCALBASE}/bin/pinentry,' \ -e 's,/proc/%d/exe,/proc/%d/file,' \ ${WRKSRC}/cardcomm/pkcs11/src/dialogs/dialogspinentry/dlgs_pinentry.cpp - @${REINPLACE_CMD} -e '/^MODUTIL=/s,/usr/bin,${LOCALBASE}/bin,' \ - -e '/^CERTUTIL=/s,/usr/bin,${LOCALBASE}/bin,' \ + @${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' \ -e '/^LIBS=/s,=.*,=${PREFIX}/lib,' \ ${WRKSRC}/plugins_tools/chrome_pkcs11/beid-update-nssdb @${REINPLACE_CMD} '/^Exec=/s,/usr/bin,${PREFIX}/bin,' \ diff --git a/security/beid/distinfo b/security/beid/distinfo index d8999728c6cd..c375e7252019 100644 --- a/security/beid/distinfo +++ b/security/beid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1598443353 -SHA256 (Fedict-eid-mw-v5.0.8_GH0.tar.gz) = 843f1535cf6c54391e84ce9dba55a2d6de029ca4cb10e5f71880532d46fa9b83 -SIZE (Fedict-eid-mw-v5.0.8_GH0.tar.gz) = 8782476 +TIMESTAMP = 1638704952 +SHA256 (Fedict-eid-mw-v5.0.28_GH0.tar.gz) = 44fa020dd40ae6801a941991780d0efcc4d7ec2b8949e19544f695bc24c22bfb +SIZE (Fedict-eid-mw-v5.0.28_GH0.tar.gz) = 13615312 diff --git a/security/beid/files/patch-plugins__tools_eid-viewer_Makefile.am b/security/beid/files/patch-plugins__tools_eid-viewer_Makefile.am new file mode 100644 index 000000000000..9338056c0800 --- /dev/null +++ b/security/beid/files/patch-plugins__tools_eid-viewer_Makefile.am @@ -0,0 +1,11 @@ +--- plugins_tools/eid-viewer/Makefile.am.orig 2021-08-13 09:34:02 UTC ++++ plugins_tools/eid-viewer/Makefile.am +@@ -131,7 +131,7 @@ eid_viewer_LDADD += $(top_builddir)/cardcomm/pkcs11/sr + endif + libeidviewer_la_LIBADD = $(top_builddir)/plugins_tools/util/liblabels.la $(top_builddir)/cardcomm/pkcs11/src/libbeidpkcs11.la @SSL_LIBS@ @XML2_LIBS@ + libeidviewer_la_LDFLAGS = -version-info 1:0:1 +-AM_CFLAGS = @GTK_CFLAGS@ -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/v240 -I$(top_srcdir)/cardcomm/pkcs11/src/fuzz -I$(top_srcdir)/plugins_tools/util @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden @FUZZING@ ++AM_CPPFLAGS = -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/v240 -I$(top_srcdir)/cardcomm/pkcs11/src/fuzz -I$(top_srcdir)/plugins_tools/util @GTK_CFLAGS@ @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden @FUZZING@ + AM_CXXFLAGS = $(AM_CFLAGS) -std=c++98 + SUBDIRS = . gtk/po test uml + diff --git a/security/beid/files/patch-plugins__tools_eid-viewer_verify.c b/security/beid/files/patch-plugins__tools_eid-viewer_verify.c new file mode 100644 index 000000000000..ff2cb22d83a2 --- /dev/null +++ b/security/beid/files/patch-plugins__tools_eid-viewer_verify.c @@ -0,0 +1,10 @@ +--- plugins_tools/eid-viewer/verify.c.orig 2021-08-13 09:34:02 UTC ++++ plugins_tools/eid-viewer/verify.c +@@ -19,7 +19,6 @@ + #endif + + #ifdef HAVE_LIBBSD +-#include <bsd/bsd.h> + #endif + + #ifdef __APPLE__ diff --git a/security/beid/files/patch-plugins_tools_chrome_pkcs11_beid-update-nssdb b/security/beid/files/patch-plugins_tools_chrome_pkcs11_beid-update-nssdb deleted file mode 100644 index 90e4789933ba..000000000000 --- a/security/beid/files/patch-plugins_tools_chrome_pkcs11_beid-update-nssdb +++ /dev/null @@ -1,40 +0,0 @@ ---- plugins_tools/chrome_pkcs11/beid-update-nssdb.orig 2018-07-20 12:53:45 UTC -+++ plugins_tools/chrome_pkcs11/beid-update-nssdb -@@ -1,4 +1,4 @@ --#!/bin/bash -+#! /bin/sh - # - # The MIT License (MIT) - # -@@ -26,15 +26,17 @@ - # Copyright(c) Wouter Verhelst, 2018 - - NSSDB=$HOME/.pki/nssdb --MODUTIL="/usr/bin/modutil -force -dbdir sql:$NSSDB" --CERTUTIL="/usr/bin/certutil -d sql:$NSSDB" -+MODUTIL="/usr/bin/modutil" -+CERTUTIL="/usr/bin/certutil" - LIBS=$(ld --verbose | grep SEARCH | awk '{ gsub(/;/,"\n"); print }' | awk -F '\"' '/SEARCH_DIR\(\"=?/ { gsub(/=/,""); print $2 }') - PKCS11=libbeidpkcs11.so.0 - -+[ -e $CERTUTIL -a -e $MODUTIL ] || exit -+ - if [ ! -f $NSSDB/cert9.db ]; then - echo "Initializing new database" - mkdir -p $NSSDB -- $CERTUTIL -N --empty-password -+ $CERTUTIL -d sql:$NSSDB -N --empty-password - fi - - for DIR in $LIBS; do -@@ -45,8 +47,8 @@ for DIR in $LIBS; do - echo "ID-card support for Google Chrome/Chromium/Opera already enabled" - else - echo "Enabling ID-card functionality in Google Chrome/Chromium/Opera via $LIB" -- $MODUTIL -delete "Belgium eID" -- $MODUTIL -add "Belgium eID" -libfile $LIB -mechanisms FRIENDLY -+ $MODUTIL -force -dbdir sql:$NSSDB -delete "Belgium eID" -+ $MODUTIL -force -dbdir sql:$NSSDB -add "Belgium eID" -libfile $LIB -mechanisms FRIENDLY - fi - exit - fi diff --git a/security/beid/files/patch-plugins_tools_eid-viewer_Makefile.am b/security/beid/files/patch-plugins_tools_eid-viewer_Makefile.am deleted file mode 100644 index ea1502f45bbd..000000000000 --- a/security/beid/files/patch-plugins_tools_eid-viewer_Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ ---- plugins_tools/eid-viewer/Makefile.am.orig 2020-07-09 08:00:33 UTC -+++ plugins_tools/eid-viewer/Makefile.am -@@ -120,7 +120,7 @@ dist_eidvinclude_HEADERS = \ - eid_viewer_LDADD = @GTK_LIBS@ @GIO_LIBS@ @SSL_LIBS@ @XML2_LIBS@ @CURL_LIBS@ @libproxy_LIBS@ $(top_builddir)/plugins_tools/util/liblabels.la libeidviewer.la - libeidviewer_la_LIBADD = $(top_builddir)/plugins_tools/util/liblabels.la $(top_builddir)/cardcomm/pkcs11/src/libbeidpkcs11.la @SSL_LIBS@ @XML2_LIBS@ - libeidviewer_la_LDFLAGS = -version-info 1:0:1 --AM_CFLAGS = @GTK_CFLAGS@ -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/rsaref220 -I$(top_srcdir)/plugins_tools/util @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden @FUZZING@ -+AM_CPPFLAGS = -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/rsaref220 -I$(top_srcdir)/plugins_tools/util @GTK_CFLAGS@ @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden @FUZZING@ - AM_CXXFLAGS = $(AM_CFLAGS) -std=c++98 - SUBDIRS = . gtk/po test uml - -@@ -199,7 +199,9 @@ dist_trust_DATA = \ - certs/belgiumrca4.pem - - install-data-hook: -- if ( $(SSL_PREFIX)/bin/openssl help 2>&1 | grep -q rehash); then $(SSL_PREFIX)/bin/openssl rehash $(DESTDIR)/$(trustdir); else $(SSL_PREFIX)/bin/c_rehash $(DESTDIR)/$(trustdir); fi -+ (cd $(DESTDIR)$(trustdir) && for i in *.pem; do \ -+ ln -sfh $$i $$($(SSL_PREFIX)/bin/openssl x509 -hash -noout -in $$i).0; \ -+ done) - - gtk/viewer_glade.h: gtk/viewer.glade - $(top_srcdir)/plugins_tools/aboutmw/gtk/gen.sh VIEWER_GLADE_H VIEWER_GLADE_STRING < $^ > $@ diff --git a/security/beid/pkg-plist b/security/beid/pkg-plist index 07c944754936..7edd4525e7a9 100644 --- a/security/beid/pkg-plist +++ b/security/beid/pkg-plist @@ -18,8 +18,8 @@ lib/libbeidpkcs11.so.0.0.0 lib/libeidviewer.so lib/libeidviewer.so.0 lib/libeidviewer.so.0.1.0 -lib/mozilla/pkcs11-modules/beidp11kit.json lib/mozilla/pkcs11-modules/beidpkcs11.json +lib/mozilla/pkcs11-modules/beidpkcs11_alt.json lib/pkcs11/beidpkcs11.so lib/firefox/distribution/extensions/belgiumeid@eid.belgium.be.xpi libdata/pkgconfig/libbeidpkcs11.pc @@ -27,9 +27,11 @@ share/applications/eid-viewer.desktop share/eid-mw/eidv4.xsd share/eid-mw/trustdir/143b8e8e.0 share/eid-mw/trustdir/9ef4b1e1.0 +share/eid-mw/trustdir/a094a3c4.0 share/eid-mw/trustdir/belgiumrca2.pem share/eid-mw/trustdir/belgiumrca3.pem share/eid-mw/trustdir/belgiumrca4.pem +share/eid-mw/trustdir/belgiumrca6.pem share/eid-mw/trustdir/c7e71426.0 share/icons/hicolor/128x128/apps/eid-viewer.png share/icons/hicolor/16x16/apps/eid-viewer.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201281215.20SCFNMr092935>