Update to pcsc-lite-1.8.12

2014-09-26 12:11:01 +00:00 · 2014-09-26 12:11:01 +00:00 · b264fe4131
commit b264fe4131
parent 5c6f824db9
4 changed files with 5 additions and 76 deletions
--- a/security/pcsc-lite/Makefile
+++ b/security/pcsc-lite/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.25 2014/07/11 16:44:05 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.26 2014/09/26 12:11:01 dcoppa Exp $

 COMMENT=	resource manager for PC/SC

-V=		1.8.11
+V=		1.8.12
 DISTNAME=	pcsc-lite-${V}
 CATEGORIES=	security

@ -30,9 +30,7 @@ MODPY_ADJ_FILES=	src/spy/pcsc-spy

 USE_GMAKE=	Yes

-CONFIGURE_STYLE= autoconf
-
-AUTOCONF_VERSION= 2.69
+CONFIGURE_STYLE= gnu

 CONFIGURE_ARGS=	--disable-libudev \
 		--without-systemdsystemunitdir \
--- a/security/pcsc-lite/distinfo
+++ b/security/pcsc-lite/distinfo
@ -1,2 +1,2 @@
-SHA256 (pcsc-lite-1.8.11.tar.bz2) = lFBByUxTlZrlp2dhak7FCZ/mf1Sb/TROi9DP56PHGsY=
-SIZE (pcsc-lite-1.8.11.tar.bz2) = 571837
+SHA256 (pcsc-lite-1.8.12.tar.bz2) = 8sMKKrpoBfKFnt5fLso1HKbElaGNXTbXTGPniYs1PFE=
+SIZE (pcsc-lite-1.8.12.tar.bz2) = 580449
--- a/security/pcsc-lite/patches/patch-configure_ac
+++ b/security/pcsc-lite/patches/patch-configure_ac
@ -1,40 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2014/03/12 08:37:49 dcoppa Exp $
--- configure.ac.orig	Fri Feb 14 17:15:44 2014
-+++ configure.ac	Mon Feb 17 16:12:35 2014
-@@ -280,27 +280,7 @@ if test x$use_libusb = xyes; then
-   PCSCLITE_FEATURES="${PCSCLITE_FEATURES} libusb"
- fi
- 
-# --enable-polkit
-POLKIT_MINIMUM=0.111
-AC_ARG_ENABLE(polkit,
-	AS_HELP_STRING([--enable-polkit],
-		[Build with polkit support]),
-		use_polkit=$withval, use_polkit=no)
-if test "$use_polkit" != "no"; then
-	PKG_CHECK_MODULES(POLKIT, [polkit-gobject-1 >= $POLKIT_MINIMUM], [use_polkit=yes], [use_polkit=no])
-	if test "$use_polkit" != "no";then
-		AC_DEFINE([HAVE_POLKIT], 1, [Build polkit access control support])
-		polkit_policy_dir=$($PKG_CONFIG polkit-gobject-1 --variable=policydir)
-		AC_SUBST(POLICY_DIR, [$polkit_policy_dir])
-	else
-	        use_polkit=no
-	        AC_MSG_ERROR([[
-*** 
-*** polkit >= $POLKIT_MINIMUM was not found. Access control will be disabled.
-*** You may get it from http://www.freedesktop.org/software/polkit/
-*** ]])
-	fi
-fi
-+use_polkit=no
- AM_CONDITIONAL(ENABLE_POLKIT, test "$use_polkit" != "no")
- 
- # --with-systemdsystemunitdir=DIR
-@@ -413,7 +393,6 @@ PCSC_ARCH:           ${PCSC_ARCH}
- 
- pcscd binary            ${PCSCD_BINARY}
- polkit support:         ${use_polkit}
-polkit policy dir:      ${polkit_policy_dir}
- libudev support:        ${use_libudev}
- libusb support:         ${use_libusb}
- USB drop directory:     ${usbdropdir}
--- a/security/pcsc-lite/patches/patch-src_Makefile_in
+++ b/security/pcsc-lite/patches/patch-src_Makefile_in
@ -1,29 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.3 2014/03/12 08:37:49 dcoppa Exp $
--- src/Makefile.in.orig	Mon Feb 17 16:17:39 2014
-+++ src/Makefile.in	Mon Feb 17 16:17:56 2014
-@@ -391,8 +391,6 @@ PKG_CONFIG = @PKG_CONFIG@
- PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
- PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLICY_DIR = @POLICY_DIR@
-POLKIT_CFLAGS = @POLKIT_CFLAGS@
-POLKIT_LIBS = @POLKIT_LIBS@
- PTHREAD_CC = @PTHREAD_CC@
- PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
- PTHREAD_LIBS = @PTHREAD_LIBS@
-@@ -545,15 +543,13 @@ pcscd_SOURCES = \
- 	winscard_svc.h
- 
- pcscd_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS) $(LIBUDEV_CFLAGS) \
-	$(POLKIT_CFLAGS) \
- 	-DPCSCD -DSIMCLIST_NO_DUMPRESTORE
- 
- pcscd_LDFLAGS = $(LDFLAGS) -export-dynamic
- pcscd_LDADD = \
- 	$(PTHREAD_LIBS) $(COREFOUNDATION) \
- 	$(LIBUSB_LIBS) $(IOKIT) $(LIBUDEV_LIBS) \
-	$(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \
-	$(POLKIT_LIBS) 
-+	$(PTHREAD_LIBS) $(PTHREAD_CFLAGS)
- 
- testpcsc_SOURCES = testpcsc.c
- testpcsc_LDADD = libpcsclite.la