Fri Oct 2 12:38:44 2009 UTC ()
Adapt reader.conf handling to pcsc-lite changes.


(hasso)
diff -r0 -r1.1 pkgsrc/security/openct/DEINSTALL
diff -r0 -r1.1 pkgsrc/security/openct/INSTALL
diff -r1.5 -r1.6 pkgsrc/security/openct/Makefile
diff -r1.4 -r1.5 pkgsrc/security/openct/distinfo
diff -r0 -r1.1 pkgsrc/security/openct/patches/patch-ab
File Added: pkgsrc/security/openct/DEINSTALL
#!/bin/sh
# $NetBSD: DEINSTALL,v 1.1 2009/10/02 12:38:44 hasso Exp $

case ${STAGE} in
POST-DEINSTALL)
	if [ -x ${PREFIX}/sbin/update-reader.conf ]; then
		${PREFIX}/sbin/update-reader.conf
	fi
	;;
esac
File Added: pkgsrc/security/openct/INSTALL
#!/bin/sh
# $NetBSD: INSTALL,v 1.1 2009/10/02 12:38:44 hasso Exp $

case ${STAGE} in
POST-INSTALL)
	if [ -x ${PREFIX}/sbin/update-reader.conf ]; then
		${PREFIX}/sbin/update-reader.conf
	fi
	;;
esac
cvs diff -r1.5 -r1.6 pkgsrc/security/openct/Makefile (expand / switch to unified diff)

--- pkgsrc/security/openct/Makefile 2009/09/25 08:36:05 1.5
+++ pkgsrc/security/openct/Makefile 2009/10/02 12:38:44 1.6
@@ -1,37 +1,40 @@ @@ -1,37 +1,40 @@
1# $NetBSD: Makefile,v 1.5 2009/09/25 08:36:05 hasso Exp $ 1# $NetBSD: Makefile,v 1.6 2009/10/02 12:38:44 hasso Exp $
2 2
3DISTNAME= openct-0.6.18 3DISTNAME= openct-0.6.18
 4PKGREVISION= 1
4CATEGORIES= security 5CATEGORIES= security
5MASTER_SITES= http://www.opensc-project.org/files/openct/ 6MASTER_SITES= http://www.opensc-project.org/files/openct/
6 7
7MAINTAINER= hasso@NetBSD.org 8MAINTAINER= hasso@NetBSD.org
8HOMEPAGE= http://www.opensc-project.org/openct/ 9HOMEPAGE= http://www.opensc-project.org/openct/
9COMMENT= Smart Card Reader drivers and middleware 10COMMENT= Smart Card Reader drivers and middleware
10LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
15USE_LIBTOOL= YES 16USE_LIBTOOL= YES
16USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
17 18
18.include "options.mk" 19.include "options.mk"
19 20
20CONFIGURE_ARGS+= --localstatedir=${VARBASE}/openct 21CONFIGURE_ARGS+= --localstatedir=${VARBASE}/openct
21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
22RCD_SCRIPTS= openct 23RCD_SCRIPTS= openct
23MAKE_DIRS+= ${VARBASE}/openct 24MAKE_DIRS+= ${VARBASE}/openct
24MAKE_DIRS+= ${VARBASE}/openct/run 25MAKE_DIRS+= ${VARBASE}/openct/run
25MAKE_DIRS+= ${VARBASE}/openct/run/openct 26MAKE_DIRS+= ${VARBASE}/openct/run/openct
 27MAKE_DIRS+= ${PKG_SYSCONFDIR}/reader.conf.d
26EGDIR= ${PREFIX}/share/examples/openct 28EGDIR= ${PREFIX}/share/examples/openct
27CONF_FILES+= ${EGDIR}/openct.conf ${PKG_SYSCONFDIR}/openct.conf 29CONF_FILES+= ${EGDIR}/openct.conf ${PKG_SYSCONFDIR}/openct.conf
 30CONF_FILES+= ${EGDIR}/reader.conf ${PKG_SYSCONFDIR}/reader.conf.d/openct-reader.conf
28 31
29BUILD_DEFS+= VARBASE 32BUILD_DEFS+= VARBASE
30INSTALLATION_DIRS= ${EGDIR} 33INSTALLATION_DIRS= ${EGDIR}
31 34
32post-install: 35post-install:
33 ${INSTALL_DATA} ${WRKSRC}/etc/openct.conf ${DESTDIR}${EGDIR} 36 ${INSTALL_DATA} ${WRKSRC}/etc/openct.conf ${DESTDIR}${EGDIR}
34 ${INSTALL_DATA} ${WRKSRC}/etc/reader.conf ${DESTDIR}${EGDIR} 37 ${INSTALL_DATA} ${WRKSRC}/etc/reader.conf ${DESTDIR}${EGDIR}
35 38
36.include "../../devel/libltdl/buildlink3.mk" 39.include "../../devel/libltdl/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/security/openct/distinfo (expand / switch to unified diff)

--- pkgsrc/security/openct/distinfo 2009/09/25 08:36:05 1.4
+++ pkgsrc/security/openct/distinfo 2009/10/02 12:38:44 1.5
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.4 2009/09/25 08:36:05 hasso Exp $ 1$NetBSD: distinfo,v 1.5 2009/10/02 12:38:44 hasso Exp $
2 2
3SHA1 (openct-0.6.18.tar.gz) = b0c5bfa92683fd6c608e21eb07559dfd666f1883 3SHA1 (openct-0.6.18.tar.gz) = b0c5bfa92683fd6c608e21eb07559dfd666f1883
4RMD160 (openct-0.6.18.tar.gz) = 377fe50775a5bd104aadf7770f14f494047a099a 4RMD160 (openct-0.6.18.tar.gz) = 377fe50775a5bd104aadf7770f14f494047a099a
5Size (openct-0.6.18.tar.gz) = 688931 bytes 5Size (openct-0.6.18.tar.gz) = 688931 bytes
6SHA1 (patch-aa) = d44e8daa9cc402c8276bf385a5fbbe5a498b37bb 6SHA1 (patch-aa) = d44e8daa9cc402c8276bf385a5fbbe5a498b37bb
 7SHA1 (patch-ab) = 117d4a1636620f65feb130deb295a31c4cb90d5a
File Added: pkgsrc/security/openct/patches/patch-ab
$NetBSD: patch-ab,v 1.1 2009/10/02 12:38:44 hasso Exp $

--- etc/reader.conf.in.orig	2009-10-02 15:25:50 +0300
+++ etc/reader.conf.in	2009-10-02 15:26:17 +0300
@@ -1,9 +1,9 @@
 # OpenCT configuration file for pcsc-lite
 # http://www.opensc.org/openct/
-
-FRIENDLYNAME     "OpenCT"
-DEVICENAME       /dev/null 
-LIBPATH          @libdir@/openct-ifd.so
-CHANNELID        0 
-
+#
+# FRIENDLYNAME     "OpenCT"
+# DEVICENAME       /dev/null 
+# LIBPATH          @libdir@/openct-ifd.so
+# CHANNELID        0 
+#
 # End of file