[Pcsclite-cvs-commit] r5933 - in /trunk/PCSC: Makefile.am configure.in etc/ etc/Makefile.am etc/pcscd.service.in etc/pcscd.socket.in

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Sat Sep 3 21:43:36 UTC 2011


Author: rousseau
Date: Sat Sep  3 21:43:35 2011
New Revision: 5933

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5933
Log:
Install systemd service files

Thanks to Kalev Lember for the patch
http://archives.neohapsis.com/archives/dev/muscle/2011-q2/0139.html

Added:
    trunk/PCSC/etc/
    trunk/PCSC/etc/Makefile.am
    trunk/PCSC/etc/pcscd.service.in
    trunk/PCSC/etc/pcscd.socket.in
Modified:
    trunk/PCSC/Makefile.am
    trunk/PCSC/configure.in

Modified: trunk/PCSC/Makefile.am
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/Makefile.am?rev=5933&op=diff
==============================================================================
--- trunk/PCSC/Makefile.am (original)
+++ trunk/PCSC/Makefile.am Sat Sep  3 21:43:35 2011
@@ -1,9 +1,12 @@
-SUBDIRS = m4 src doc
+SUBDIRS = m4 src etc doc
 
 fix-rights:
 	$(MAKE) -C src $@
 
 ACLOCAL_AMFLAGS = -I m4
+
+DISTCHECK_CONFIGURE_FLAGS = \
+	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 EXTRA_DIST = DRIVERS SECURITY bootstrap HELP ChangeLog.svn
 

Modified: trunk/PCSC/configure.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/configure.in?rev=5933&op=diff
==============================================================================
--- trunk/PCSC/configure.in (original)
+++ trunk/PCSC/configure.in Sat Sep  3 21:43:35 2011
@@ -275,6 +275,14 @@
   AC_DEFINE(HAVE_LIBUSB, 1, [Libusb is available])
   PCSCLITE_FEATURES="${PCSCLITE_FEATURES} libusb"
 fi
+
+AC_ARG_WITH([systemdsystemunitdir],
+  AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+  [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+  AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
 
 # --disable-autostart
 AC_ARG_ENABLE(autostart,
@@ -385,17 +393,18 @@
 PTHREAD_LIBS:        ${PTHREAD_LIBS}
 PCSC_ARCH:           ${PCSC_ARCH}
 
-pcscd binary          ${PCSCD_BINARY}
-libudev support:      ${use_libudev}
-libusb support:       ${use_libusb}
-USB drop directory:   ${usbdropdir}
-ATR parsing messages: ${debugatr}
-ipcdir:               ${ipcdir}
-use serial:           ${use_serial}
-use usb:              ${use_usb}
-use autostart:        ${use_autostart}
-
-PCSCLITE_FEATURES:    ${PCSCLITE_FEATURES}
+pcscd binary            ${PCSCD_BINARY}
+libudev support:        ${use_libudev}
+libusb support:         ${use_libusb}
+USB drop directory:     ${usbdropdir}
+ATR parsing messages:   ${debugatr}
+ipcdir:                 ${ipcdir}
+use serial:             ${use_serial}
+use usb:                ${use_usb}
+use autostart:          ${use_autostart}
+systemd unit directory: ${with_systemdsystemunitdir}
+
+PCSCLITE_FEATURES:      ${PCSCLITE_FEATURES}
 
 EOF
 
@@ -408,6 +417,9 @@
 doc/pcscd.8
 doc/reader.conf.5
 doc/example/Makefile
+etc/Makefile
+etc/pcscd.service
+etc/pcscd.socket
 src/Makefile
 src/libpcsclite.pc
 src/pcscd.h

Added: trunk/PCSC/etc/Makefile.am
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/etc/Makefile.am?rev=5933&op=file
==============================================================================
--- trunk/PCSC/etc/Makefile.am (added)
+++ trunk/PCSC/etc/Makefile.am Sat Sep  3 21:43:35 2011
@@ -1,0 +1,9 @@
+if HAVE_SYSTEMD
+SCRIPT_IN_FILES = \
+	pcscd.service.in \
+	pcscd.socket.in
+
+systemdsystemunit_DATA = \
+	pcscd.service \
+	pcscd.socket
+endif

Added: trunk/PCSC/etc/pcscd.service.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/etc/pcscd.service.in?rev=5933&op=file
==============================================================================
--- trunk/PCSC/etc/pcscd.service.in (added)
+++ trunk/PCSC/etc/pcscd.service.in Sat Sep  3 21:43:35 2011
@@ -1,0 +1,13 @@
+[Unit]
+Description=PC/SC Smart Card Daemon
+Requires=pcscd.socket
+After=syslog.target
+
+[Service]
+ExecStart=@sbindir_exp@/pcscd -f
+ExecReload=@sbindir_exp@/pcscd -H
+StandardOutput=syslog
+
+[Install]
+WantedBy=multi-user.target
+Also=pcscd.socket

Added: trunk/PCSC/etc/pcscd.socket.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/etc/pcscd.socket.in?rev=5933&op=file
==============================================================================
--- trunk/PCSC/etc/pcscd.socket.in (added)
+++ trunk/PCSC/etc/pcscd.socket.in Sat Sep  3 21:43:35 2011
@@ -1,0 +1,8 @@
+[Unit]
+Description=PC/SC Smart Card Daemon Activation Socket
+
+[Socket]
+ListenStream=@ipcdir@/pcscd.comm
+
+[Install]
+WantedBy=sockets.target




More information about the Pcsclite-cvs-commit mailing list