this patch is untested, but it fixes: * use "--enable-usb" on kfreebsd in configure flags. * add Build-Depends: libusb-dev for the two freebsd architectures. * add Build-Conflicts: libubsb-dev for all other architectures. * Recommends: udev (openct no longer uses hal, control wasn't updated) * merge improved README.debian from ubuntu * merge patches/doc_Makefile.patch from ubuntu * merge patches/init-script.patch from ubuntu * update patches/series
sorry, not even compile tested so far :( in the meantime "drazzib" on #debian-kbsd has written and tested a patch for kfreebsd too, and will post it here later. maybe you can merge both patches into a new package? or I will try to do so, and post again with an updated patch later. Thanks, Andreas
diff -udrNPp debian/openct-0.6.20/debian/control openct-0.6.20/debian/control --- debian/openct-0.6.20/debian/control 2010-02-28 10:49:23.000000000 +0100 +++ openct-0.6.20/debian/control 2010-04-07 22:38:39.000000000 +0200 @@ -2,7 +2,8 @@ Source: openct Section: utils Priority: extra Maintainer: Eric Dorland <e...@debian.org> -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5.0.45), libpcsclite-dev (>= 1.4.0), pkg-config, libltdl3-dev +Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5.0.45), libpcsclite-dev (>= 1.4.0), pkg-config, libltdl3-dev, libusb2-dev [kfreebsd-i386 kfreebsd-amd64] +Build-Conflicts: libusb-dev [alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc] Standards-Version: 3.8.3 Homepage: http://www.opensc-project.org/ Vcs-Git: git://git.debian.org/git/pkg-opensc/openct.git @@ -53,7 +54,7 @@ Package: openct Architecture: any Provides: pcsc-ifd-handler Depends: ${shlibs:Depends}, dpkg (>= 1.7.0), adduser, ${misc:Depends} -Recommends: hal +Recommends: udev Description: middleware framework for smart card terminals OpenCT is an open source implementation providing card terminal drivers. It provides a native OpenCT, CT-API and PC/SC Lite IFD diff -udrNPp debian/openct-0.6.20/debian/openct.README.Debian openct-0.6.20/debian/openct.README.Debian --- debian/openct-0.6.20/debian/openct.README.Debian 2010-02-28 10:49:23.000000000 +0100 +++ openct-0.6.20/debian/openct.README.Debian 2010-02-11 17:16:45.000000000 +0100 @@ -5,19 +5,19 @@ This package adds an scard group to your give access to the card readers must be added to that group. Note that root always has access to any card readers in the system. -OpenCT was migrated to use hal for configuration. Linux Hotplug developers -suggested this move and currently only support hald setup (while udev -setup might work or not). +If a new USB smart card reader or crypto token is plugged in, +openct has to notice this somehow. This package is configured to +rely on the linux kernel and udev to do that with these files: + /lib/udev/rules.d/60-openct.rules + /lib/udev/openct_pcmcia + /lib/udev/openct_usb + /lib/udev/openct_serial -If you want to disable hald setup, this package includes an fdi file -as example, all you have to do is copy it to /etc/hal/fdi/policy. - cp /usr/share/doc/examples/openct-disable.fdi /etc/hal/fdi/policy/ -will do that for you. +If you install OpenCT and PCSC-Lite with CCID driver at the same +time, you end up with two drivers for one device. OpenCT is configured +with a one second delay, so CCID driver for PCSC-Lite will "win" this +conflict. -Usualy you want to run pcsc-lite with libccid, or openct, but please don't -install all three packages unless you exactly know what you are doing. -People doing that had problems with openct and libccid fighting over CCID -usb smart card readers. Latest OpenCT has now a small delay build in, so -usualy pcscd with libccid will win in such situations. + -- Eric Dorland <e...@debian.org>, Thu, 11 Feb 2010 11:03:15 +0100 - -- Eric Dorland <e...@debian.org>, Mon, 15 Jun 2009 00:56:57 -0400 + diff -udrNPp debian/openct-0.6.20/debian/patches/doc_Makefile.patch openct-0.6.20/debian/patches/doc_Makefile.patch --- debian/openct-0.6.20/debian/patches/doc_Makefile.patch 1970-01-01 01:00:00.000000000 +0100 +++ openct-0.6.20/debian/patches/doc_Makefile.patch 2010-02-11 17:14:47.000000000 +0100 @@ -0,0 +1,26 @@ +Index: openct-0.6.19/doc/Makefile.am +=================================================================== +--- openct-0.6.19.orig/doc/Makefile.am 2010-02-11 16:12:55.433842105 +0000 ++++ openct-0.6.19/doc/Makefile.am 2010-02-11 16:13:23.393545800 +0000 +@@ -18,7 +18,7 @@ + api.out: $(top_srcdir)/src/include/openct/*.h \ + $(srcdir)/*.gif \ + doxygen.conf +- -rm -fr api.out ++ -rm -f api.out + $(DOXYGEN) doxygen.conf + cp "$(srcdir)"/*.gif api.out/html + else +Index: openct-0.6.19/doc/Makefile.in +=================================================================== +--- openct-0.6.19.orig/doc/Makefile.in 2010-02-11 16:14:16.363830226 +0000 ++++ openct-0.6.19/doc/Makefile.in 2010-02-11 16:14:43.413830403 +0000 +@@ -669,7 +669,7 @@ + @svn_checkout_t...@api.out: $(top_srcdir)/src/include/openct/*.h \ + @SVN_CHECKOUT_TRUE@ $(srcdir)/*.gif \ + @SVN_CHECKOUT_TRUE@ doxygen.conf +...@svn_checkout_true@ -rm -fr api.out +...@svn_checkout_true@ -rm -f api.out + @SVN_CHECKOUT_TRUE@ $(DOXYGEN) doxygen.conf + @SVN_CHECKOUT_TRUE@ cp "$(srcdir)"/*.gif api.out/html + @svn_checkout_fa...@api.out/html/*: $(abs_builddir)/api.out diff -udrNPp debian/openct-0.6.20/debian/patches/init-script.patch openct-0.6.20/debian/patches/init-script.patch --- debian/openct-0.6.20/debian/patches/init-script.patch 1970-01-01 01:00:00.000000000 +0100 +++ openct-0.6.20/debian/patches/init-script.patch 2010-02-11 17:12:27.000000000 +0100 @@ -0,0 +1,13 @@ +Index: openct-0.6.19/etc/init-script.in +=================================================================== +--- openct-0.6.19.orig/etc/init-script.in 2010-02-10 11:20:35.000000000 +0000 ++++ openct-0.6.19/etc/init-script.in 2010-02-10 11:20:35.000000000 +0000 +@@ -24,7 +24,7 @@ + + # create the directory for our status and socket files, + # if it does not exist. +-if ! test -e "$STATUS_DIR" ++if ! test -d "$STATUS_DIR" + then + mkdir "$STATUS_DIR" + diff -udrNPp debian/openct-0.6.20/debian/patches/series openct-0.6.20/debian/patches/series --- debian/openct-0.6.20/debian/patches/series 2010-02-28 10:53:25.000000000 +0100 +++ openct-0.6.20/debian/patches/series 2010-02-11 17:12:43.000000000 +0100 @@ -1 +1,3 @@ debian-changes +init-script.patch +doc_Makefile.patch diff -udrNPp debian/openct-0.6.20/debian/rules openct-0.6.20/debian/rules --- debian/openct-0.6.20/debian/rules 2010-02-28 10:49:23.000000000 +0100 +++ openct-0.6.20/debian/rules 2010-04-07 22:31:05.000000000 +0200 @@ -3,8 +3,13 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk +ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) +DEB_CONFIGURE_EXTRA_FLAGS = --enable-pcsc --with-udev=/lib/udev \ + --with-bundle=/usr/lib/pcsc/drivers --enable-usb +else DEB_CONFIGURE_EXTRA_FLAGS = --enable-pcsc --with-udev=/lib/udev \ --with-bundle=/usr/lib/pcsc/drivers +endif DEB_INSTALL_DOCS_ALL := NEWS TODO
