Hello community,
here is the log from the commit of package openslp for openSUSE:Factory checked
in at 2018-04-16 12:42:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openslp (Old)
and /work/SRC/openSUSE:Factory/.openslp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openslp"
Mon Apr 16 12:42:51 2018 rev:50 rq:595666 version:2.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openslp/openslp.changes 2018-03-20
21:51:21.857116648 +0100
+++ /work/SRC/openSUSE:Factory/.openslp.new/openslp.changes 2018-04-16
12:42:53.158435125 +0200
@@ -1,0 +2,7 @@
+Wed Apr 11 14:39:03 CEST 2018 - m...@suse.de
+
+- move systemd notification before the chroot() call, otherwise
+ the notify function cannot reach systend's unix domain socket
+ [bnc#1089097]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openslp.sd_notify.diff ++++++
--- /var/tmp/diff_new_pack.AgsGZJ/_old 2018-04-16 12:42:54.142399320 +0200
+++ /var/tmp/diff_new_pack.AgsGZJ/_new 2018-04-16 12:42:54.146399174 +0200
@@ -1,24 +1,5 @@
---- slpd/slpd_main.c.orig
-+++ slpd/slpd_main.c
-@@ -59,6 +59,8 @@
- #include "slp_net.h"
- #include "slp_network.h"
-
-+#include <systemd/sd-daemon.h>
-+
- int G_SIGALRM;
- int G_SIGTERM;
- int G_SIGHUP;
-@@ -748,6 +750,7 @@ int main(int argc, char * argv[])
- alarm(2);
-
- /* Main loop */
-+ sd_notify(0, "READY=1");
- SLPDLog("Startup complete entering main run loop ...\n\n");
- G_SIGALRM = 0;
- G_SIGTERM = 0;
---- configure.ac.orig
-+++ configure.ac
+--- ./configure.ac.orig 2013-06-08 04:58:54.000000000 +0000
++++ ./configure.ac 2018-04-11 12:36:14.299642065 +0000
@@ -35,6 +35,10 @@ AC_CHECK_LIB([nsl], [gethostbyname])
AC_CHECK_LIB([m], [log10])
AC_CHECK_LIB([pthread], [pthread_create])
@@ -30,8 +11,8 @@
#
# Checks for header files
#
---- slpd/Makefile.am.orig
-+++ slpd/Makefile.am
+--- ./slpd/Makefile.am.orig 2018-04-11 12:35:51.810698096 +0000
++++ ./slpd/Makefile.am 2018-04-11 12:36:14.300642062 +0000
@@ -95,5 +95,5 @@ noinst_HEADERS = \
slpd_initda.h
@@ -39,3 +20,24 @@
-slpd_LDADD = ../common/libcommonslpd.la ../libslpattr/libslpattr.la
+slpd_LDADD = $(SYSTEMD_LIBS) ../common/libcommonslpd.la
../libslpattr/libslpattr.la
+--- ./slpd/slpd_main.c.orig 2018-04-11 12:35:51.814698086 +0000
++++ ./slpd/slpd_main.c 2018-04-11 12:38:04.513363806 +0000
+@@ -59,6 +59,8 @@
+ #include "slp_net.h"
+ #include "slp_network.h"
+
++#include <systemd/sd-daemon.h>
++
+ int G_SIGALRM;
+ int G_SIGTERM;
+ int G_SIGHUP;
+@@ -704,6 +706,9 @@ int main(int argc, char * argv[])
+ /* init watcher */
+ SLPDDatabaseWatcher();
+
++ /* tell systemd what we are ready */
++ sd_notify(0, "READY=1");
++
+ /* drop privileges to reduce security risk */
+ if (DropPrivileges())
+ SLPDFatal("Could not drop privileges\n");
