c213227f60
Update to rpcbind 0.2.2 and port most patches to it. 6 are still missing. - Split off 0003-systemd-no-dualmode.patch from 0001-systemd-enhancements.patch for easier upstream submission. - Split off 0004-systemd-sd_notify.patch from 0001-systemd-enhancements.patch for easier upstream submission. - Rename 0001-systemd-enhancements.patch to 0001-systemd-unit-files.patch - Update to latest rpcbind 0.2.2 upstream release. - Following patches are upstream: - 0001-Fix-building-one-systems-w-out-nss.h.patch - 0002-Rename-configure.in-to-configure.ac.patch - 0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch - 0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch - Adjust following patches: - 0005-Remove-obsolete-function-in6_fillscopeid.patch - 0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch - 0018-configure-check-for-nss.h.patch - Obsolete patches: - 0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch - 0016-Notify-systemd-unconditionally.patch - 0012-Support-systemd-activation.patch - 0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch - 0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch - 0025-rpcinfo-warmstat_no-warning-about-missing-file.patch - 0026-systemd-no-default-dep - 0027-socket-before-service.patch - 0028-rpcbind-after-var-run.patch - 0029-rpcbind-sd-notify-stupid-errmsg.patch - New patches: - 0001-systemd-enhancements.patch - 0002-rpcinfo_warmstart-no_warning_about_missing_file.patch OBS-URL: https://build.opensuse.org/request/show/264790 OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=51
66 lines
1.5 KiB
Diff
66 lines
1.5 KiB
Diff
Add systemd unit files
|
|
|
|
Signed-off-by: Thorsten Kukuk <kukuk@suse.de>
|
|
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am 2014/12/10 13:27:31
|
|
@@ -45,6 +45,14 @@
|
|
AM_CPPFLAGS += $(SYSTEMD_CFLAGS) -DSYSTEMD
|
|
|
|
rpcbind_LDADD += $(SYSTEMD_LIBS)
|
|
+
|
|
+systemd/rpcbind.service: systemd/rpcbind.service.in Makefile
|
|
+ sed -e 's,@bindir\@,$(bindir),g' \
|
|
+ < $< > $@ || rm $@
|
|
+
|
|
+systemdsystemunit_DATA = \
|
|
+ systemd/rpcbind.service \
|
|
+ systemd/rpcbind.socket
|
|
endif
|
|
|
|
rpcinfo_SOURCES = src/rpcinfo.c
|
|
--- a/systemd/.gitignore
|
|
+++ b/systemd/.gitignore 2014/12/10 13:27:31
|
|
@@ -0,0 +1 @@
|
|
+rpcbind.service
|
|
--- a/systemd/rpcbind.service.in
|
|
+++ b/systemd/rpcbind.service.in 2014/12/10 13:27:31
|
|
@@ -0,0 +1,16 @@
|
|
+[Unit]
|
|
+Description=RPC Bind
|
|
+Documentation=man:rpcbind(8)
|
|
+DefaultDependencies=no
|
|
+Requires=rpcbind.socket
|
|
+Wants=var-run.mount
|
|
+After=var-run.mount
|
|
+
|
|
+[Service]
|
|
+Type=notify
|
|
+EnvironmentFile=-/etc/sysconfig/rpcbind
|
|
+ExecStart=@bindir@/rpcbind $RPCBIND_OPTIONS -w -f
|
|
+
|
|
+[Install]
|
|
+WantedBy=multi-user.target
|
|
+Also=rpcbind.socket
|
|
--- a/systemd/rpcbind.socket
|
|
+++ b/systemd/rpcbind.socket 2014/12/10 13:27:58
|
|
@@ -0,0 +1,18 @@
|
|
+[Unit]
|
|
+Description=RPCbind Server Activation Socket
|
|
+DefaultDependencies=no
|
|
+Wants=rpcbind.target
|
|
+Before=rpcbind.target
|
|
+
|
|
+[Socket]
|
|
+ListenStream=/run/rpcbind.sock
|
|
+
|
|
+# RPC netconfig can't handle ipv6/ipv4 dual sockets
|
|
+BindIPv6Only=ipv6-only
|
|
+ListenStream=0.0.0.0:111
|
|
+ListenDatagram=0.0.0.0:111
|
|
+ListenStream=[::]:111
|
|
+ListenDatagram=[::]:111
|
|
+
|
|
+[Install]
|
|
+WantedBy=sockets.target
|