Klemens Nanni <k...@openbsd.org> writes:
> Lots of new support, improvements but also CVE fixes, see > https://github.com/OpenSC/OpenSC/wiki#news > > The shared libraries gained exported symbols but did not lose any, so > I'm bumping their minors. > > Keeps working for me on amd64 Works for me with ssh and pkcs11 (onepin-opensc-pkcs11.so). It was a bit weird that opensc-tool -V still printed 0.19.0 so maybe bump the OPESC_SCM_VERSION variable in configure.ac? configure.ac:OPENSC_SCM_REVISION="OpenSC-0.19.0, rev: f1691fc9, commit-time: 2018-09-13 13:47:21 2018 +0200" Here is an updated patch with that bumped: Index: Makefile =================================================================== RCS file: /cvs/ports/security/opensc/Makefile,v retrieving revision 1.53 diff -u -p -r1.53 Makefile --- Makefile 9 Nov 2019 07:09:09 -0000 1.53 +++ Makefile 29 Jan 2020 19:33:22 -0000 @@ -2,13 +2,12 @@ COMMENT= set of libraries and utilities to access smart cards -V= 0.19.0 -REVISION= 3 +V= 0.20.0 DISTNAME= opensc-${V} SUBST_VARS += V -SHARED_LIBS += opensc 7.0 # 5.0 -SHARED_LIBS += smm-local 3.0 # 5.0 +SHARED_LIBS += opensc 7.1 # 6.0 +SHARED_LIBS += smm-local 3.1 # 6.0 CATEGORIES= security Index: distinfo =================================================================== RCS file: /cvs/ports/security/opensc/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 29 Sep 2018 11:19:16 -0000 1.14 +++ distinfo 29 Jan 2020 19:33:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (opensc-0.19.0.tar.gz) = LFoOTfkCdjUpC5wPOt278NZR213bCreJyw6XjwL9WCY= -SIZE (opensc-0.19.0.tar.gz) = 2080320 +SHA256 (opensc-0.20.0.tar.gz) = u/S09KREY2RckKUl6CCoBZsvdCpTt7lE+UHePJe6SGM= +SIZE (opensc-0.20.0.tar.gz) = 2140645 Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/security/opensc/patches/patch-configure_ac,v retrieving revision 1.9 diff -u -p -r1.9 patch-configure_ac --- patches/patch-configure_ac 9 Nov 2019 07:09:09 -0000 1.9 +++ patches/patch-configure_ac 29 Jan 2020 19:33:22 -0000 @@ -9,7 +9,7 @@ Remove -Werror so it builds with gcc Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -341,29 +341,9 @@ elif test "${xslstylesheetsdir}" != "no"; then +@@ -363,29 +363,9 @@ elif test "${xslstylesheetsdir}" != "no"; then fi AC_MSG_RESULT([${xslstylesheetsdir}]) @@ -19,7 +19,7 @@ Index: configure.ac - GIT_CHECKOUT="yes" -fi -AC_MSG_RESULT([${GIT_CHECKOUT}]) -+OPENSC_SCM_REVISION="OpenSC-0.19.0, rev: f1691fc9, commit-time: 2018-09-13 13:47:21 2018 +0200" ++OPENSC_SCM_REVISION="OpenSC-0.20.0, rev: 45e29056, commit-time: 2019-12-29 13:42:06 2019 +0100" +OPENSC_VERSION_REVISION="0" -if test "${GIT_CHECKOUT}" = "yes"; then @@ -41,7 +41,7 @@ Index: configure.ac dnl C Compiler features AC_C_INLINE -@@ -414,11 +394,6 @@ AC_CHECK_LIB( +@@ -436,11 +416,6 @@ AC_CHECK_LIB( ) if test "${WIN32}" = "no"; then @@ -53,19 +53,11 @@ Index: configure.ac dnl Special check for pthread support. AX_PTHREAD( [AC_DEFINE( -@@ -1036,14 +1011,13 @@ AM_CONDITIONAL([ENABLE_SM], [test "${enable_sm}" = "ye - AM_CONDITIONAL([ENABLE_DNIE_UI], [test "${enable_dnie_ui}" = "yes"]) +@@ -1061,7 +1036,6 @@ AM_CONDITIONAL([ENABLE_DNIE_UI], [test "${enable_dnie_ AM_CONDITIONAL([ENABLE_NPATOOL], [test "${ENABLE_NPATOOL}" = "yes"]) - AM_CONDITIONAL([ENABLE_TESTS], [test "${enable_tests}" = "yes"]) + AM_CONDITIONAL([ENABLE_AUTOSTART], [test "${enable_autostart}" = "yes"]) + AM_CONDITIONAL([ENABLE_CMOCKA], [test "${enable_cmocka}" = "yes"]) -AM_CONDITIONAL([GIT_CHECKOUT], [test "${GIT_CHECKOUT}" = "yes"]) - - if test "${enable_pedantic}" = "yes"; then - enable_strict="yes"; - CFLAGS="${CFLAGS} -pedantic" - fi - if test "${enable_strict}" = "yes"; then -- CFLAGS="${CFLAGS} -Wall -Wextra -Wno-unused-parameter -Werror" -+ CFLAGS="${CFLAGS} -Wall -Wextra -Wno-unused-parameter" - fi - - AC_CONFIG_FILES([ + AM_CONDITIONAL([ENABLE_FUZZING], [test "${enable_fuzzing}" = "yes"]) + AM_CONDITIONAL([ENABLE_SHARED], [test "${enable_shared}" = "yes"]) + AS_IF([test "${enable_shared}" = "yes"], [AC_DEFINE([ENABLE_SHARED], [1], [Enable shared libraries])]) Index: patches/patch-doc_tools_Makefile_am =================================================================== RCS file: /cvs/ports/security/opensc/patches/patch-doc_tools_Makefile_am,v retrieving revision 1.2 diff -u -p -r1.2 patch-doc_tools_Makefile_am --- patches/patch-doc_tools_Makefile_am 29 Sep 2018 11:19:16 -0000 1.2 +++ patches/patch-doc_tools_Makefile_am 29 Jan 2020 19:33:22 -0000 @@ -5,7 +5,7 @@ Do not install bash-completion scripts Index: doc/tools/Makefile.am --- doc/tools/Makefile.am.orig +++ doc/tools/Makefile.am -@@ -14,8 +14,6 @@ if ENABLE_MAN +@@ -11,8 +11,6 @@ if ENABLE_MAN man1_MANS = $(patsubst $(srcdir)/%.xml, %, $(wildcard $(srcdir)/*.1.xml)) endif @@ -14,7 +14,7 @@ Index: doc/tools/Makefile.am tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $< -@@ -43,4 +41,4 @@ tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/* +@@ -40,4 +38,4 @@ tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/* > $@ clean-local: Index: patches/patch-src_pkcs11_Makefile_am =================================================================== RCS file: /cvs/ports/security/opensc/patches/patch-src_pkcs11_Makefile_am,v retrieving revision 1.3 diff -u -p -r1.3 patch-src_pkcs11_Makefile_am --- patches/patch-src_pkcs11_Makefile_am 29 Sep 2018 11:19:16 -0000 1.3 +++ patches/patch-src_pkcs11_Makefile_am 29 Jan 2020 19:33:22 -0000 @@ -12,10 +12,10 @@ Index: src/pkcs11/Makefile.am +EXTRA_DIST = Makefile.mak versioninfo-pkcs11.rc.in versioninfo-pkcs11-spy.rc.in lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la onepin-opensc-pkcs11.la - -@@ -20,16 +22,13 @@ OPENSC_PKCS11_LIBS = \ + if ENABLE_SHARED +@@ -24,16 +26,13 @@ OPENSC_PKCS11_LIBS = \ $(top_builddir)/src/common/libcompat.la \ - $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) + $(OPENPACE_LIBS) $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = opensc-pkcs11.pc @@ -29,9 +29,9 @@ Index: src/pkcs11/Makefile.am -module -shared -avoid-version -no-undefined +opensc_pkcs11_la_LIBTOOLFLAGS = --tag=disable-static - onepin_opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) - onepin_opensc_pkcs11_la_CFLAGS = -DMODULE_APP_NAME=\"onepin-opensc-pkcs11\" $(OPENSC_PKCS11_CFLAGS) -@@ -37,6 +36,7 @@ onepin_opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS) + libopensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) + libopensc_pkcs11_la_CFLAGS = $(OPENSC_PKCS11_CFLAGS) +@@ -46,6 +45,7 @@ onepin_opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS) onepin_opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \ -export-symbols "$(srcdir)/pkcs11.exports" \ -module -shared -avoid-version -no-undefined @@ -39,7 +39,7 @@ Index: src/pkcs11/Makefile.am pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11.exports pkcs11_spy_la_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) -@@ -48,6 +48,7 @@ pkcs11_spy_la_LIBADD = \ +@@ -57,6 +57,7 @@ pkcs11_spy_la_LIBADD = \ pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \ -export-symbols "$(srcdir)/pkcs11.exports" \ -module -shared -avoid-version -no-undefined @@ -47,7 +47,7 @@ Index: src/pkcs11/Makefile.am if WIN32 opensc_pkcs11_la_SOURCES += versioninfo-pkcs11.rc -@@ -60,13 +61,4 @@ install-exec-hook: +@@ -69,15 +70,6 @@ install-exec-hook: for l in opensc-pkcs11.dll pkcs11-spy.dll; do \ mv "$(DESTDIR)$(libdir)/$$l" "$(DESTDIR)$(bindir)/$$l"; \ done @@ -61,3 +61,5 @@ Index: src/pkcs11/Makefile.am - done - endif + + TIDY_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(OPENSC_PKCS11_CFLAGS) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/security/opensc/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 29 Sep 2018 11:19:16 -0000 1.12 +++ pkg/PLIST 29 Jan 2020 19:33:22 -0000 @@ -5,6 +5,7 @@ @bin bin/egk-tool @bin bin/eidenv @bin bin/gids-tool +@bin bin/goid-tool @bin bin/iasecc-tool @bin bin/netkey-tool @bin bin/npa-tool @@ -14,22 +15,23 @@ @bin bin/opensc-notify @bin bin/opensc-tool @bin bin/piv-tool +@bin bin/pkcs11-register @bin bin/pkcs11-tool @bin bin/pkcs15-crypt @bin bin/pkcs15-init @bin bin/pkcs15-tool @bin bin/sc-hsm-tool @bin bin/westcos-tool -lib/libopensc.a +@static-lib lib/libopensc.a lib/libopensc.la @lib lib/libopensc.so.${LIBopensc_VERSION} -lib/libsmm-local.a +@static-lib lib/libsmm-local.a lib/libsmm-local.la @lib lib/libsmm-local.so.${LIBsmm-local_VERSION} lib/pkcs11/ -lib/pkcs11/onepin-opensc-pkcs11.so -lib/pkcs11/opensc-pkcs11.so -lib/pkcs11/pkcs11-spy.so +@so lib/pkcs11/onepin-opensc-pkcs11.so +@so lib/pkcs11/opensc-pkcs11.so +@so lib/pkcs11/pkcs11-spy.so lib/pkgconfig/libopensc.pc @man man/man1/cardos-tool.1 @man man/man1/cryptoflex-tool.1 @@ -63,6 +65,9 @@ share/examples/opensc/opensc.conf @mode 644 @sample ${SYSCONFDIR}/opensc.conf @mode +share/examples/opensc/xdg/ +share/examples/opensc/xdg/autostart/ +share/examples/opensc/xdg/autostart/pkcs11-register.desktop share/opensc/ share/opensc/asepcos.profile share/opensc/authentic.profile @@ -91,6 +96,7 @@ share/opensc/openpgp.profile share/opensc/pkcs15.profile share/opensc/rutoken.profile share/opensc/rutoken_ecp.profile +share/opensc/rutoken_lite.profile share/opensc/sc-hsm.profile share/opensc/setcos.profile share/opensc/starcos.profile
