Sat Jun 20 19:08:19 2020 UTC ()
opensc: make it build again


(adam)
diff -r1.31 -r1.32 pkgsrc/security/opensc/Makefile
diff -r1.12 -r1.13 pkgsrc/security/opensc/PLIST
diff -r1.17 -r1.18 pkgsrc/security/opensc/distinfo
diff -r1.3 -r0 pkgsrc/security/opensc/patches/patch-src_common_compat__getopt.h
diff -r1.3 -r0 pkgsrc/security/opensc/patches/patch-src_common_compat__getopt__main.c
cvs diff -r1.31 -r1.32 pkgsrc/security/opensc/Makefile (expand / switch to unified diff)

--- pkgsrc/security/opensc/Makefile 2020/06/02 08:24:41 1.31
+++ pkgsrc/security/opensc/Makefile 2020/06/20 19:08:19 1.32
@@ -1,62 +1,48 @@ @@ -1,62 +1,48 @@
1# $NetBSD: Makefile,v 1.31 2020/06/02 08:24:41 adam Exp $ 1# $NetBSD: Makefile,v 1.32 2020/06/20 19:08:19 adam Exp $
2 2
3OPENSC_PKG_VERSION= 0.20.0 3DISTNAME= opensc-0.20.0
4DISTNAME= opensc-${OPENSC_PKG_VERSION} 4PKGREVISION= 2
5#PKGREVISION= 1 5CATEGORIES= security
6PKGREVISION= 1 6MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenSC/}
7CATEGORIES= security 7
8MASTER_SITES= ${MASTER_SITE_GITHUB:=opensc/} 8MAINTAINER= pkgsrc-users@NetBSD.org
9 9HOMEPAGE= https://github.com/OpenSC/OpenSC/wiki
10MAINTAINER= pkgsrc-users@NetBSD.org 10COMMENT= Smart Card drivers and middleware
11HOMEPAGE= https://github.com/OpenSC/OpenSC/wiki 11LICENSE= gnu-lgpl-v2.1
12COMMENT= Smart Card drivers and middleware 
13LICENSE= gnu-lgpl-v2.1 
14 12
15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 13WRKSRC= ${WRKDIR}/OpenSC-${PKGVERSION_NOREV}
16 
17GNU_CONFIGURE= YES 
18USE_LIBTOOL= YES 
19USE_TOOLS+= gmake pkg-config 
20WRKSRC= ${WRKDIR}/OpenSC-${OPENSC_PKG_VERSION} 
21 
22USE_TOOLS+= autoreconf autoconf automake 
23AUTOCONF_REQD= 2.60 
24AUTOMAKE_REQD= 1.15 
25pre-configure: 
26 cd ${WRKSRC:Q} && \ 
27 ./bootstrap \ 
28 -s ${OPENSC_VERSION_SUFFIX:Q} \ 
29 -r ${OPENSC_VERSION_REVISION:Q} 
30 14
31.include "options.mk" 15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
32 
33# Previous versions needed these, but 0.12.2 configure does not 
34# recognize them. 
35#CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 
36#CONFIGURE_ARGS+= --disable-sensitive-logging 
37 
38# Is this necessary (and non-default)? 
39CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 
40 16
 17USE_LIBTOOL= yes
 18USE_TOOLS+= autoreconf autoconf automake gmake pkg-config
 19GNU_CONFIGURE= yes
 20CONFIGURE_ARGS+= --disable-autostart-items
 21CONFIGURE_ARGS+= --disable-strict # avoid -Werror
 22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
 23# The stylesheets are not found without this.
 24CONFIGURE_ARGS+= --with-xsl-stylesheetsdir=${PREFIX}/share/xsl/docbook
41# This is perhaps an upstream bug. 25# This is perhaps an upstream bug.
42CONFIGURE_ENV+= PCSC_CFLAGS=-I${PREFIX}/include/PCSC 26CONFIGURE_ENV+= PCSC_CFLAGS=-I${PREFIX}/include/PCSC
43 27
44# The stylesheets are not found without this. 28.include "options.mk"
45CONFIGURE_ARGS+= --with-xsl-stylesheetsdir=${PREFIX}/share/xsl/docbook 
46 29
47EGDIR= ${PREFIX}/share/examples/opensc 30EGDIR= ${PREFIX}/share/examples/opensc
48CONF_FILES+= ${EGDIR}/opensc.conf ${PKG_SYSCONFDIR}/opensc.conf 31CONF_FILES+= ${EGDIR}/opensc.conf ${PKG_SYSCONFDIR}/opensc.conf
49 32
 33pre-configure:
 34 cd ${WRKSRC} && autoreconf -fi
 35
50INSTALLATION_DIRS= ${EGDIR} 36INSTALLATION_DIRS= ${EGDIR}
51post-install: 37post-install:
52 ${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf.example ${DESTDIR}${EGDIR}/opensc.conf 38 ${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf.example ${DESTDIR}${EGDIR}/opensc.conf
53 39
54# build tools for doc; should be TOOLS 40# build tools for doc; should be TOOLS
55.include "../../textproc/libxslt/buildlink3.mk" 41.include "../../textproc/libxslt/buildlink3.mk"
56 42
57# We avoid pthreads intentionally; tell dlopen not drag it in. 43# We avoid pthreads intentionally; tell dlopen not drag it in.
58DLOPEN_REQUIRE_PTHREADS= no 44DLOPEN_REQUIRE_PTHREADS= no
59.include "../../mk/dlopen.buildlink3.mk" 45.include "../../mk/dlopen.buildlink3.mk"
60.include "../../mk/readline.buildlink3.mk" 46.include "../../mk/readline.buildlink3.mk"
61.include "../../devel/zlib/buildlink3.mk" 47.include "../../devel/zlib/buildlink3.mk"
62.include "../../security/openssl/buildlink3.mk" 48.include "../../security/openssl/buildlink3.mk"
cvs diff -r1.12 -r1.13 pkgsrc/security/opensc/PLIST (expand / switch to unified diff)

--- pkgsrc/security/opensc/PLIST 2020/04/30 15:29:33 1.12
+++ pkgsrc/security/opensc/PLIST 2020/06/20 19:08:19 1.13
@@ -1,38 +1,37 @@ @@ -1,38 +1,37 @@
1@comment $NetBSD: PLIST,v 1.12 2020/04/30 15:29:33 manu Exp $ 1@comment $NetBSD: PLIST,v 1.13 2020/06/20 19:08:19 adam Exp $
2bin/cardos-tool 2bin/cardos-tool
3bin/cryptoflex-tool 3bin/cryptoflex-tool
4bin/dnie-tool 4bin/dnie-tool
5bin/egk-tool 5bin/egk-tool
6bin/eidenv 6bin/eidenv
7bin/gids-tool 7bin/gids-tool
8bin/goid-tool 8bin/goid-tool
9bin/iasecc-tool 9bin/iasecc-tool
10bin/netkey-tool 10bin/netkey-tool
11bin/npa-tool 11bin/npa-tool
12bin/openpgp-tool 12bin/openpgp-tool
13bin/opensc-asn1 13bin/opensc-asn1
14bin/opensc-explorer 14bin/opensc-explorer
15bin/opensc-notify 15bin/opensc-notify
16bin/opensc-tool 16bin/opensc-tool
17bin/piv-tool 17bin/piv-tool
18bin/pkcs11-register 18bin/pkcs11-register
19bin/pkcs11-tool 19bin/pkcs11-tool
20bin/pkcs15-crypt 20bin/pkcs15-crypt
21bin/pkcs15-init 21bin/pkcs15-init
22bin/pkcs15-tool 22bin/pkcs15-tool
23bin/sc-hsm-tool 23bin/sc-hsm-tool
24bin/westcos-tool 24bin/westcos-tool
25etc/xdg/autostart/pkcs11-register.desktop 
26lib/libopensc.la 25lib/libopensc.la
27lib/libsmm-local.la 26lib/libsmm-local.la
28lib/onepin-opensc-pkcs11.la 27lib/onepin-opensc-pkcs11.la
29lib/opensc-pkcs11.la 28lib/opensc-pkcs11.la
30lib/pkcs11-spy.la 29lib/pkcs11-spy.la
31lib/pkcs11/onepin-opensc-pkcs11.so 30lib/pkcs11/onepin-opensc-pkcs11.so
32lib/pkcs11/opensc-pkcs11.so 31lib/pkcs11/opensc-pkcs11.so
33lib/pkcs11/pkcs11-spy.so 32lib/pkcs11/pkcs11-spy.so
34lib/pkgconfig/opensc-pkcs11.pc 33lib/pkgconfig/opensc-pkcs11.pc
35man/man1/cardos-tool.1 34man/man1/cardos-tool.1
36man/man1/cryptoflex-tool.1 35man/man1/cryptoflex-tool.1
37man/man1/dnie-tool.1 36man/man1/dnie-tool.1
38man/man1/egk-tool.1 37man/man1/egk-tool.1
cvs diff -r1.17 -r1.18 pkgsrc/security/opensc/distinfo (expand / switch to unified diff)

--- pkgsrc/security/opensc/distinfo 2020/04/30 15:29:33 1.17
+++ pkgsrc/security/opensc/distinfo 2020/06/20 19:08:19 1.18
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
1$NetBSD: distinfo,v 1.17 2020/04/30 15:29:33 manu Exp $ 1$NetBSD: distinfo,v 1.18 2020/06/20 19:08:19 adam Exp $
2 2
3SHA1 (opensc-0.20.0.tar.gz) = a03dab062dd033c5662f11ee39e53b84106c2c0d 3SHA1 (opensc-0.20.0.tar.gz) = a03dab062dd033c5662f11ee39e53b84106c2c0d
4RMD160 (opensc-0.20.0.tar.gz) = 71003565bee88d9fb20723ad6b5ad68c627eff3b 4RMD160 (opensc-0.20.0.tar.gz) = 71003565bee88d9fb20723ad6b5ad68c627eff3b
5SHA512 (opensc-0.20.0.tar.gz) = 1360ee35f579cbeecf368777bb60d6c23ec2a80a2983328ea2c193530cc9b101a807ff1e2982ad34bfcc2bae2c867feecf300b6229d15057e796bd31ecffb02d 5SHA512 (opensc-0.20.0.tar.gz) = 1360ee35f579cbeecf368777bb60d6c23ec2a80a2983328ea2c193530cc9b101a807ff1e2982ad34bfcc2bae2c867feecf300b6229d15057e796bd31ecffb02d
6Size (opensc-0.20.0.tar.gz) = 1653931 bytes 6Size (opensc-0.20.0.tar.gz) = 1653931 bytes
7SHA1 (patch-aa) = 5ca9245c763a9f8a8aa273e7e76c75168c52d0cd 7SHA1 (patch-aa) = 5ca9245c763a9f8a8aa273e7e76c75168c52d0cd
8SHA1 (patch-ab) = 5ea2a3e623df6bc2c814c37ce89fed491149f8b4 8SHA1 (patch-ab) = 5ea2a3e623df6bc2c814c37ce89fed491149f8b4
9SHA1 (patch-configure.ac) = 9031a51162d883b3e3118820d400e07ef99dbad9 9SHA1 (patch-configure.ac) = 9031a51162d883b3e3118820d400e07ef99dbad9
10SHA1 (patch-doc_tools_Makefile.am) = 4535988c6fbe4b9f45838362f2f9604c91fecd53 10SHA1 (patch-doc_tools_Makefile.am) = 4535988c6fbe4b9f45838362f2f9604c91fecd53
11SHA1 (patch-src_common_compat__getopt.h) = a9c4fad2d1fd73f5b2c245a364cfd37d838f51eb 
12SHA1 (patch-src_common_compat__getopt__main.c) = 96d51499ea6d48bd53a17e3849c44ae4e0c9b669 
13SHA1 (patch-src_libopensc_log.c) = 00acff447b1890b05cd3bea10ece8d42e7b6cf26 11SHA1 (patch-src_libopensc_log.c) = 00acff447b1890b05cd3bea10ece8d42e7b6cf26
File Deleted: pkgsrc/security/opensc/patches/Attic/patch-src_common_compat__getopt.h
File Deleted: pkgsrc/security/opensc/patches/Attic/patch-src_common_compat__getopt__main.c