Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/opensc opensc: make it build again
details: https://anonhg.NetBSD.org/pkgsrc/rev/d8ab45f85a47
branches: trunk
changeset: 434705:d8ab45f85a47
user: adam <adam%pkgsrc.org@localhost>
date: Sat Jun 20 19:08:19 2020 +0000
description:
opensc: make it build again
diffstat:
security/opensc/Makefile | 62 +++------
security/opensc/PLIST | 3 +-
security/opensc/distinfo | 4 +-
security/opensc/patches/patch-src_common_compat__getopt.h | 41 ------
security/opensc/patches/patch-src_common_compat__getopt__main.c | 17 --
5 files changed, 26 insertions(+), 101 deletions(-)
diffs (179 lines):
diff -r 1a94e74131ef -r d8ab45f85a47 security/opensc/Makefile
--- a/security/opensc/Makefile Sat Jun 20 19:03:37 2020 +0000
+++ b/security/opensc/Makefile Sat Jun 20 19:08:19 2020 +0000
@@ -1,52 +1,38 @@
-# $NetBSD: Makefile,v 1.31 2020/06/02 08:24:41 adam Exp $
+# $NetBSD: Makefile,v 1.32 2020/06/20 19:08:19 adam Exp $
+
+DISTNAME= opensc-0.20.0
+PKGREVISION= 2
+CATEGORIES= security
+MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenSC/}
-OPENSC_PKG_VERSION= 0.20.0
-DISTNAME= opensc-${OPENSC_PKG_VERSION}
-#PKGREVISION= 1
-PKGREVISION= 1
-CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GITHUB:=opensc/}
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://github.com/OpenSC/OpenSC/wiki
+COMMENT= Smart Card drivers and middleware
+LICENSE= gnu-lgpl-v2.1
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/OpenSC/OpenSC/wiki
-COMMENT= Smart Card drivers and middleware
-LICENSE= gnu-lgpl-v2.1
+WRKSRC= ${WRKDIR}/OpenSC-${PKGVERSION_NOREV}
BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-USE_TOOLS+= gmake pkg-config
-WRKSRC= ${WRKDIR}/OpenSC-${OPENSC_PKG_VERSION}
-
-USE_TOOLS+= autoreconf autoconf automake
-AUTOCONF_REQD= 2.60
-AUTOMAKE_REQD= 1.15
-pre-configure:
- cd ${WRKSRC:Q} && \
- ./bootstrap \
- -s ${OPENSC_VERSION_SUFFIX:Q} \
- -r ${OPENSC_VERSION_REVISION:Q}
+USE_LIBTOOL= yes
+USE_TOOLS+= autoreconf autoconf automake gmake pkg-config
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-autostart-items
+CONFIGURE_ARGS+= --disable-strict # avoid -Werror
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+# The stylesheets are not found without this.
+CONFIGURE_ARGS+= --with-xsl-stylesheetsdir=${PREFIX}/share/xsl/docbook
+# This is perhaps an upstream bug.
+CONFIGURE_ENV+= PCSC_CFLAGS=-I${PREFIX}/include/PCSC
.include "options.mk"
-# Previous versions needed these, but 0.12.2 configure does not
-# recognize them.
-#CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
-#CONFIGURE_ARGS+= --disable-sensitive-logging
-
-# Is this necessary (and non-default)?
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-# This is perhaps an upstream bug.
-CONFIGURE_ENV+= PCSC_CFLAGS=-I${PREFIX}/include/PCSC
-
-# The stylesheets are not found without this.
-CONFIGURE_ARGS+= --with-xsl-stylesheetsdir=${PREFIX}/share/xsl/docbook
-
EGDIR= ${PREFIX}/share/examples/opensc
CONF_FILES+= ${EGDIR}/opensc.conf ${PKG_SYSCONFDIR}/opensc.conf
+pre-configure:
+ cd ${WRKSRC} && autoreconf -fi
+
INSTALLATION_DIRS= ${EGDIR}
post-install:
${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf.example ${DESTDIR}${EGDIR}/opensc.conf
diff -r 1a94e74131ef -r d8ab45f85a47 security/opensc/PLIST
--- a/security/opensc/PLIST Sat Jun 20 19:03:37 2020 +0000
+++ b/security/opensc/PLIST Sat Jun 20 19:08:19 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2020/04/30 15:29:33 manu Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/06/20 19:08:19 adam Exp $
bin/cardos-tool
bin/cryptoflex-tool
bin/dnie-tool
@@ -22,7 +22,6 @@
bin/pkcs15-tool
bin/sc-hsm-tool
bin/westcos-tool
-etc/xdg/autostart/pkcs11-register.desktop
lib/libopensc.la
lib/libsmm-local.la
lib/onepin-opensc-pkcs11.la
diff -r 1a94e74131ef -r d8ab45f85a47 security/opensc/distinfo
--- a/security/opensc/distinfo Sat Jun 20 19:03:37 2020 +0000
+++ b/security/opensc/distinfo Sat Jun 20 19:08:19 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2020/04/30 15:29:33 manu Exp $
+$NetBSD: distinfo,v 1.18 2020/06/20 19:08:19 adam Exp $
SHA1 (opensc-0.20.0.tar.gz) = a03dab062dd033c5662f11ee39e53b84106c2c0d
RMD160 (opensc-0.20.0.tar.gz) = 71003565bee88d9fb20723ad6b5ad68c627eff3b
@@ -8,6 +8,4 @@
SHA1 (patch-ab) = 5ea2a3e623df6bc2c814c37ce89fed491149f8b4
SHA1 (patch-configure.ac) = 9031a51162d883b3e3118820d400e07ef99dbad9
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) = 00acff447b1890b05cd3bea10ece8d42e7b6cf26
diff -r 1a94e74131ef -r d8ab45f85a47 security/opensc/patches/patch-src_common_compat__getopt.h
--- a/security/opensc/patches/patch-src_common_compat__getopt.h Sat Jun 20 19:03:37 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-src_common_compat__getopt.h,v 1.3 2015/09/07 19:59:42 gdt Exp $
-
-NetBSD has getopt_long but not getopt_long_only. Replacing
-getopt_long causes a type conflict with the built-in implementation.
-The replacement is unnecesssary because getopt_long_only is not
-actually used.
-
-Reported upstream:
-http://article.gmane.org/gmane.comp.encryption.opensc.user/5931
-
-The following is the original mail archive URL, but it currently
-yields a '404 not found' error:
-https://www.opensc-project.org/pipermail/opensc-devel/2012-November/018668.html
-
---- src/common/compat_getopt.h.orig 2015-05-16 20:30:24.000000000 +0000
-+++ src/common/compat_getopt.h
-@@ -30,7 +30,7 @@
- #include "config.h"
- #endif
-
--#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG) && defined(HAVE_GETOPT_LONG_ONLY)
-+#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG)
- #include <getopt.h>
- #else
-
-@@ -43,7 +43,6 @@ extern "C" {
-
- #define getopt my_getopt
- #define getopt_long my_getopt_long
--#define getopt_long_only my_getopt_long_only
- #define _getopt_internal _my_getopt_internal
- #define opterr my_opterr
- #define optind my_optind
-@@ -86,6 +85,6 @@ extern int _my_getopt_internal(int argc,
- }
- #endif
-
--#endif /* HAVE_GETOPT_H && HAVE_GETOPT_LONG && HAVE_GETOPT_LONG_ONLY */
-+#endif /* HAVE_GETOPT_H && HAVE_GETOPT_LONG */
-
- #endif /* MY_GETOPT_H_INCLUDED */
diff -r 1a94e74131ef -r d8ab45f85a47 security/opensc/patches/patch-src_common_compat__getopt__main.c
--- a/security/opensc/patches/patch-src_common_compat__getopt__main.c Sat Jun 20 19:03:37 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_common_compat__getopt__main.c,v 1.3 2015/09/07 19:59:42 gdt Exp $
-
-See comment in patch-src_common_compat__getopt.h. In addition, a
-kludge is added here to get the test file to build, pending a new
-release from upstream with the issue properly addressed.
-
---- src/common/compat_getopt_main.c.orig 2015-05-16 20:30:24.000000000 +0000
-+++ src/common/compat_getopt_main.c
-@@ -173,6 +173,8 @@ main(int argc, char * argv[])
- progname);
- }
-
-+#define getopt_long_only getopt_long
-+
- /* parse all options from the command line */
- while ((opt =
- getopt_long_only(argc, argv, shortopts, longopts, &longind)) != -1)
Home |
Main Index |
Thread Index |
Old Index