Accepting request 593203 from home:dimstar:Factory

Add actual changelog entry for version 2.0.4
Fix the rebase done for 0001-systemd-unit-files.patch

OBS-URL: https://build.opensuse.org/request/show/593203
OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=78

0001-systemd-unit-files.patch

@@ -1,61 +1,14 @@
-Add systemd unit files
+Add EnvironmentFile=-/etc/sysconfig/rpcbind to rpcbind.service
 
-Signed-off-by: Thorsten Kukuk <kukuk@suse.de>
+Index: rpcbind-0.2.4/systemd/rpcbind.service.in
-
+===================================================================
---- a/Makefile.am
+--- rpcbind-0.2.4.orig/systemd/rpcbind.service.in
-+++ b/Makefile.am	2014/12/10 13:27:31
++++ rpcbind-0.2.4/systemd/rpcbind.service.in
-@@ -51,6 +51,10 @@
+@@ -11,6 +11,7 @@ After=rpcbind.socket
- 
+ [Service]
- rpcbind_LDADD += $(SYSTEMD_LIBS)
+ Type=notify
- 
+ # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
-+systemd/rpcbind.service: systemd/rpcbind.service.in Makefile
-+	sed -e 's,@bindir\@,$(bindir),g' \
-+		< $< > $@ || rm $@
-+
- systemdsystemunit_DATA = \
- 	systemd/rpcbind.service \
- 	systemd/rpcbind.socket
---- 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
+ ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f
-+
+ 
-+[Install]
+ [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

rpcbind.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Apr  3 12:06:36 UTC 2018 - dimstar@opensuse.org
+
+- Correctly rebase 0001-systemd-unit-files.patch: Since upstream
+  now ships systemd service files, we must no longer create full
+  unit files, but only correct the existing ones (adding
+  EnvironmentFile statement).
+
 -------------------------------------------------------------------
 Mon Mar 26 17:11:19 CEST 2018 - kukuk@suse.de
 
@@ -6,7 +14,10 @@ Mon Mar 26 17:11:19 CEST 2018 - kukuk@suse.de
 -------------------------------------------------------------------
 Sun Feb 18 19:48:56 UTC 2018 - avindra@opensuse.org
 
-- Update to 0.2.4
+- Update to 0.2.4:
+  + Memory corruption fix
+  + Moved the default state directory to /var/run
+  + Systemd unit files were added.
 - cleanup with spec-cleaner
 - don't ship NEWS or ChangeLog, these are not maintained
 - rebase 0001-systemd-unit-files.patch