diff options
author | mlelstv <mlelstv@pkgsrc.org> | 2018-10-13 10:54:04 +0000 |
---|---|---|
committer | mlelstv <mlelstv@pkgsrc.org> | 2018-10-13 10:54:04 +0000 |
commit | efef421485bf16dd871c56a94a19432f5b1d1382 (patch) | |
tree | 8fb807a6121676504a6e9f5573a80545fa94ea63 /security | |
parent | 594ad95a23a5dd6390edb64129a726b6eff0434b (diff) | |
download | pkgsrc-efef421485bf16dd871c56a94a19432f5b1d1382.tar.gz |
update from 0.16.0 to 0.19.0
Project moved from sourceforge to github.
Diffstat (limited to 'security')
-rw-r--r-- | security/opensc/Makefile | 11 | ||||
-rw-r--r-- | security/opensc/PLIST | 13 | ||||
-rw-r--r-- | security/opensc/distinfo | 18 | ||||
-rw-r--r-- | security/opensc/patches/patch-aa | 19 | ||||
-rw-r--r-- | security/opensc/patches/patch-ab | 8 | ||||
-rw-r--r-- | security/opensc/patches/patch-doc_tools_Makefile.am | 12 | ||||
-rw-r--r-- | security/opensc/patches/patch-src_libopensc_log.c | 10 |
7 files changed, 53 insertions, 38 deletions
diff --git a/security/opensc/Makefile b/security/opensc/Makefile index a8d6350121c..514a6a9fd24 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.25 2016/08/04 13:08:25 mef Exp $ +# $NetBSD: Makefile,v 1.26 2018/10/13 10:54:04 mlelstv Exp $ -OPENSC_PKG_VERSION= 0.16.0 +OPENSC_PKG_VERSION= 0.19.0 DISTNAME= opensc-${OPENSC_PKG_VERSION} CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opensc/OpenSC/opensc-0.13.0/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=opensc/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/OpenSC/OpenSC/wiki @@ -16,10 +16,11 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_OLD_DES_API= YES USE_TOOLS+= gmake pkg-config +WRKSRC= ${WRKDIR}/OpenSC-${OPENSC_PKG_VERSION} USE_TOOLS+= autoreconf autoconf automake AUTOCONF_REQD= 2.60 -AUTOMAKE_REQD= 1.10 +AUTOMAKE_REQD= 1.15 pre-configure: cd ${WRKSRC:Q} && \ ./bootstrap \ @@ -47,7 +48,7 @@ CONF_FILES+= ${EGDIR}/opensc.conf ${PKG_SYSCONFDIR}/opensc.conf INSTALLATION_DIRS= ${EGDIR} post-install: - ${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf.example ${DESTDIR}${EGDIR}/opensc.conf # build tools for doc; should be TOOLS .include "../../textproc/libxslt/buildlink3.mk" diff --git a/security/opensc/PLIST b/security/opensc/PLIST index fdccb8f3fb6..78162578350 100644 --- a/security/opensc/PLIST +++ b/security/opensc/PLIST @@ -1,13 +1,17 @@ -@comment $NetBSD: PLIST,v 1.9 2016/08/04 13:08:25 mef Exp $ +@comment $NetBSD: PLIST,v 1.10 2018/10/13 10:54:04 mlelstv Exp $ bin/cardos-tool bin/cryptoflex-tool bin/dnie-tool +bin/egk-tool bin/eidenv bin/gids-tool bin/iasecc-tool bin/netkey-tool +bin/npa-tool bin/openpgp-tool +bin/opensc-asn1 bin/opensc-explorer +bin/opensc-notify bin/opensc-tool bin/piv-tool bin/pkcs11-tool @@ -24,15 +28,20 @@ lib/pkcs11-spy.la lib/pkcs11/onepin-opensc-pkcs11.so lib/pkcs11/opensc-pkcs11.so lib/pkcs11/pkcs11-spy.so +lib/pkgconfig/opensc-pkcs11.pc man/man1/cardos-tool.1 man/man1/cryptoflex-tool.1 man/man1/dnie-tool.1 +man/man1/egk-tool.1 man/man1/eidenv.1 man/man1/gids-tool.1 man/man1/iasecc-tool.1 man/man1/netkey-tool.1 +man/man1/npa-tool.1 man/man1/openpgp-tool.1 +man/man1/opensc-asn1.1 man/man1/opensc-explorer.1 +man/man1/opensc-notify.1 man/man1/opensc-tool.1 man/man1/piv-tool.1 man/man1/pkcs11-tool.1 @@ -41,7 +50,9 @@ man/man1/pkcs15-init.1 man/man1/pkcs15-tool.1 man/man1/sc-hsm-tool.1 man/man1/westcos-tool.1 +man/man5/opensc.conf.5 man/man5/pkcs15-profile.5 +share/applications/org.opensc.notify.desktop share/doc/opensc/NEWS share/examples/opensc/opensc.conf share/opensc/asepcos.profile diff --git a/security/opensc/distinfo b/security/opensc/distinfo index de189432acc..2be3a7dea0c 100644 --- a/security/opensc/distinfo +++ b/security/opensc/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.14 2016/08/04 13:08:25 mef Exp $ +$NetBSD: distinfo,v 1.15 2018/10/13 10:54:04 mlelstv Exp $ -SHA1 (opensc-0.16.0.tar.gz) = 8a5616ac514c4fbad50b0505dc61f082de3e479c -RMD160 (opensc-0.16.0.tar.gz) = f785df816560493baceb71e2197346c724fc0834 -SHA512 (opensc-0.16.0.tar.gz) = 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139 -Size (opensc-0.16.0.tar.gz) = 1760418 bytes -SHA1 (patch-aa) = 8344b445def1b1b63519e97fd0185c5cf4b3b636 -SHA1 (patch-ab) = c8a8a21ed7fe387aa93e6454e30d284d77ffd67c +SHA1 (opensc-0.19.0.tar.gz) = 7e4e52c15407b5e1642418068ae52a38b01cdaec +RMD160 (opensc-0.19.0.tar.gz) = d589dc2d4371958e7e35e282c0f970b29eb18fbb +SHA512 (opensc-0.19.0.tar.gz) = a54161b72e6ecea9d61d8bdf0fe0dbd0f97dd8fff0ce6ce344442d9dd9218779851054f8a9049c95c4276e69d3ab96afd0906ebb3278739c8f8e32ad3dbf2d4b +Size (opensc-0.19.0.tar.gz) = 1607290 bytes +SHA1 (patch-aa) = 5ca9245c763a9f8a8aa273e7e76c75168c52d0cd +SHA1 (patch-ab) = 5ea2a3e623df6bc2c814c37ce89fed491149f8b4 SHA1 (patch-configure.ac) = 9031a51162d883b3e3118820d400e07ef99dbad9 -SHA1 (patch-doc_tools_Makefile.am) = bbfb4ae09bfeef5f4d2ca36da3efda6d1a699a0d +SHA1 (patch-doc_tools_Makefile.am) = 4535988c6fbe4b9f45838362f2f9604c91fecd53 SHA1 (patch-src_common_compat__getopt.h) = a9c4fad2d1fd73f5b2c245a364cfd37d838f51eb SHA1 (patch-src_common_compat__getopt__main.c) = 96d51499ea6d48bd53a17e3849c44ae4e0c9b669 -SHA1 (patch-src_libopensc_log.c) = 1f6107d56298bf3b88d22c627dee6a9840b7309a +SHA1 (patch-src_libopensc_log.c) = e272654963cf03a459369fa512a79b46daa30720 diff --git a/security/opensc/patches/patch-aa b/security/opensc/patches/patch-aa index 18fc1d7dae6..e22c9490874 100644 --- a/security/opensc/patches/patch-aa +++ b/security/opensc/patches/patch-aa @@ -1,21 +1,24 @@ -$NetBSD: patch-aa,v 1.6 2016/08/04 13:08:25 mef Exp $ +$NetBSD: patch-aa,v 1.7 2018/10/13 10:54:05 mlelstv Exp $ Disable installation of config file, because pkgsrc installs config files as examples. ---- etc/Makefile.am.orig 2016-05-31 16:36:09.000000000 +0900 -+++ etc/Makefile.am 2016-08-04 21:48:05.000000000 +0900 -@@ -28,13 +28,5 @@ opensc.conf: opensc.conf.in force +--- etc/Makefile.am.orig 2018-09-13 11:47:21.000000000 +0000 ++++ etc/Makefile.am +@@ -30,16 +30,6 @@ opensc.conf.example: opensc.conf.example -e 's|@PROFILE_DIR_DEFAULT[@]|$(PROFILE_DIR_DEFAULT)|g' \ < $< > $@ --install-exec-hook: opensc.conf +-install-exec-hook: opensc.conf.example - $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" - if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \ -- $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \ +- $(INSTALL_DATA) $(srcdir)/opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \ - else \ -- $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf"; \ +- $(INSTALL_DATA) $(srcdir)/opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf"; \ - fi +- $(MKDIR_P) "$(DESTDIR)$(docdir)" +- $(INSTALL_DATA) opensc.conf.example "$(DESTDIR)$(docdir)/opensc.conf"; - - uninstall-hook: opensc.conf + uninstall-hook: opensc.conf.example rm -f "$(DESTDIR)$(sysconfdir)/opensc.conf.new" "$(DESTDIR)$(sysconfdir)/opensc.conf" + rm -f "$(DESTDIR)$(docdir)/opensc.conf" diff --git a/security/opensc/patches/patch-ab b/security/opensc/patches/patch-ab index 872d0733fd9..49bc865fbb8 100644 --- a/security/opensc/patches/patch-ab +++ b/security/opensc/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.5 2015/09/07 19:59:42 gdt Exp $ +$NetBSD: patch-ab,v 1.6 2018/10/13 10:54:05 mlelstv Exp $ This patch was added 2009-09-10 by hasso@, with comment: More userfriendly default configuration. ---- etc/opensc.conf.in.orig 2015-05-16 20:30:24.000000000 +0000 -+++ etc/opensc.conf.in -@@ -451,6 +451,7 @@ app default { +--- etc/opensc.conf.example.in.orig 2018-09-13 11:47:21.000000000 +0000 ++++ etc/opensc.conf.example.in +@@ -898,6 +898,7 @@ app default { # # Default: no # try_emulation_first = yes; diff --git a/security/opensc/patches/patch-doc_tools_Makefile.am b/security/opensc/patches/patch-doc_tools_Makefile.am index 86f5231bd65..170d60c59bd 100644 --- a/security/opensc/patches/patch-doc_tools_Makefile.am +++ b/security/opensc/patches/patch-doc_tools_Makefile.am @@ -1,17 +1,17 @@ -$NetBSD: patch-doc_tools_Makefile.am,v 1.1 2015/09/07 20:00:09 gdt Exp $ +$NetBSD: patch-doc_tools_Makefile.am,v 1.2 2018/10/13 10:54:05 mlelstv Exp $ These files are interpreted as config files by the pkgsrc framework, and there's no agreed-upon place to put them. For now, just skip installing them. Not reported upstream. ---- doc/tools/Makefile.am.orig 2015-05-16 20:30:24.000000000 +0000 +--- doc/tools/Makefile.am.orig 2018-09-13 11:47:21.000000000 +0000 +++ doc/tools/Makefile.am -@@ -10,7 +10,7 @@ man1_MANS = $(patsubst $(srcdir)/%.xml, - man5_MANS = $(patsubst $(srcdir)/%.xml, %, $(wildcard $(srcdir)/*.5.xml)) +@@ -14,7 +14,7 @@ if ENABLE_MAN + man1_MANS = $(patsubst $(srcdir)/%.xml, %, $(wildcard $(srcdir)/*.1.xml)) endif -completion_DATA = $(patsubst $(srcdir)/%.1.xml, %, $(wildcard $(srcdir)/*.1.xml)) +#completion_DATA = $(patsubst $(srcdir)/%.1.xml, %, $(wildcard $(srcdir)/*.1.xml)) - completiondir = $(sysconfdir)/bash_completion.d - tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(wildcard $(srcdir)/*.5.xml) + tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) + $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $< diff --git a/security/opensc/patches/patch-src_libopensc_log.c b/security/opensc/patches/patch-src_libopensc_log.c index dc9b9be54ed..4d591664607 100644 --- a/security/opensc/patches/patch-src_libopensc_log.c +++ b/security/opensc/patches/patch-src_libopensc_log.c @@ -1,8 +1,8 @@ -$NetBSD: patch-src_libopensc_log.c,v 1.3 2016/08/04 13:08:25 mef Exp $ +$NetBSD: patch-src_libopensc_log.c,v 1.4 2018/10/13 10:54:05 mlelstv Exp $ ---- src/libopensc/log.c.orig 2016-05-31 16:36:09.000000000 +0900 -+++ src/libopensc/log.c 2016-08-04 21:52:53.000000000 +0900 -@@ -91,7 +91,13 @@ static void sc_do_log_va(sc_context_t *c +--- src/libopensc/log.c.orig 2018-09-13 11:47:21.000000000 +0000 ++++ src/libopensc/log.c +@@ -93,7 +93,13 @@ static void sc_do_log_va(sc_context_t *c gettimeofday (&tv, NULL); tm = localtime (&tv.tv_sec); strftime (time_string, sizeof(time_string), "%H:%M:%S", tm); @@ -13,7 +13,7 @@ $NetBSD: patch-src_libopensc_log.c,v 1.3 2016/08/04 13:08:25 mef Exp $ +#else + (unsigned long) 0, +#endif -+ time_string, tv.tv_usec / 1000); ++ time_string, (long) tv.tv_usec / 1000); #endif p += r; left -= r; |