From: Daiki Ueno <dueno@redhat.com>
Date: Tue, 28 Feb 2017 15:06:50 +0000 (+0100)
Subject: build: Remove systemd unit files for now
X-Git-Tag: 0.23.5~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a827b55fed09b72ffd0e176c6630cb7b591c6e04;p=p11-kit

build: Remove systemd unit files for now

Given that the remote proxy service shall be only used by NetworkManager
and not generally useful, revert commit
a4fb2bb587fb1a0146cf97f039b671d3258488f9 for now.

Once the necessary command that runs the proxy module is implemented in
p11-kit, maybe NetworkManager itself could install those files.
---

diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 4e97f90..6496e8d 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -112,23 +112,13 @@ install-exec-hook:
 	done
 	$(MKDIR_P) $(DESTDIR)$(p11_package_config_modules)
 
-install-data-hook:
-	$(MKDIR_P) $(DESTDIR)$(systemduserdir)/sockets.target.wants
-	$(LN_S) -f ../p11-kit-remote.socket $(DESTDIR)$(systemduserdir)/sockets.target.wants/p11-kit-remote.socket
-
 uninstall-local:
 	for i in so dylib; do \
 		rm -f $(DESTDIR)$(libdir)/p11-kit-proxy.$$i; \
 	done
-	rm -f $(DESTDIR)$(systemduserdir)/sockets.target.wants/p11-kit-remote.socket
 
 endif
 
-systemduserdir = $(prefix)/lib/systemd/user
-systemduser_DATA = \
-	p11-kit/p11-kit-remote.socket \
-	p11-kit/p11-kit-remote@.service
-
 if !OS_WIN32
 module_LTLIBRARIES += \
 	p11-kit-client.la
@@ -154,17 +144,8 @@ pkgconfig_DATA = p11-kit/p11-kit-1.pc
 exampledir = $(p11_system_config)
 example_DATA = p11-kit/pkcs11.conf.example
 
-p11-kit/p11-kit-remote@.service: p11-kit/p11-kit-remote@.service.in
-	$(AM_V_GEN) sed -e 's|@bindir[@]|$(bindir)|g' \
-			-e 's|@libdir[@]|$(libdir)|g' $< > $@.tmp && \
-		mv $@.tmp $@
-
-CLEANFILES += p11-kit/p11-kit-remote@.service
-
 EXTRA_DIST += \
 	p11-kit/docs.h \
-	p11-kit/p11-kit-remote.socket \
-	p11-kit/p11-kit-remote@.service.in \
 	$(NULL)
 
 bin_PROGRAMS += p11-kit/p11-kit
diff --git a/p11-kit/p11-kit-remote.socket b/p11-kit/p11-kit-remote.socket
deleted file mode 100644
index 37a277b..0000000
--- a/p11-kit/p11-kit-remote.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=PKCS#11 Remote Access Socket
-
-[Socket]
-Accept=true
-ListenStream=%t/p11-kit-remote
-SocketMode=0600
-
-[Install]
-WantedBy=sockets.target
diff --git a/p11-kit/p11-kit-remote@.service.in b/p11-kit/p11-kit-remote@.service.in
deleted file mode 100644
index f29196d..0000000
--- a/p11-kit/p11-kit-remote@.service.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=PKCS#11 Remote Access
-Documentation=man:p11-kit(8)
-Requires=p11-kit-remote.socket
-
-[Service]
-StandardInput=socket
-StandardOutput=socket
-StandardError=journal
-ExecStart=@bindir@/p11-kit remote @libdir@/p11-kit-proxy.so