Changeset 548 for trunk

Timestamp:

May 6, 2019, 9:36:01 PM (6 years ago)

Author:

katerina

Message:

Update for ticket #439 (systemd support).

Location:

trunk

Files:

• Makefile.in (modified) (3 diffs)
• configure.ac (modified) (1 diff)
• init/samhain.startSystemd.in (added)
• samhain-install.sh.in (modified) (4 diffs)
• samhain.spec.in (modified) (2 diffs)

trunk/Makefile.in

@@ -375 +375 @@
 
 DISTCLEANFILES = Makefile samhain.spec sh_gpg_checksum.h sh_gpg_fp.h \
-        init/samhain.startLinux init/samhain.startGentoo \
+        init/samhain.startLinux init/samhain.startGentoo init/samhain.startSystemd \
         init/samhain.startLSB init/samhain.startFreeBSD \
         init/samhain.startSolaris init/samhain.startHPUX \
@@ -803 +803 @@
         echo $(sysconfdir)  | sed s,^/,, >> debian/dirs; \
         echo etc/init.d                  >> debian/dirs; \
+        echo lib/systemd/system          >> debian/dirs; \
         echo $(mydatadir)   | sed s,^/,, >> debian/dirs; \
         echo $(mylogdir)    | sed s,^/,, >> debian/dirs; \
@@ -819 +820 @@
         echo $(sysconfdir)  | sed s,^/,, >> debian/dirs; \
         echo etc/init.d                  >> debian/dirs; \
+        echo lib/systemd/system          >> debian/dirs; \
         echo $(mydatadir)   | sed s,^/,, >> debian/dirs; \
         echo $(mylogdir)    | sed s,^/,, >> debian/dirs; \

trunk/configure.ac

@@ -2694 +2694 @@
 init/samhain.startLSB
 init/samhain.startLinux
+init/samhain.startSystemd
 init/samhain.startGentoo
 init/samhain.startFreeBSD

trunk/samhain-install.sh.in

@@ -893 +893 @@
                 rc_dirz=
                 rc_inst="/usr/lib/lsb/install_initd /etc/init.d/@install_name@"
-                rc_uinst="/usr/lib/lsb/remove_initd /etc/init.d/@install_name@"
+                rc_uinst="test -f /etc/init.d/@install_name@ && /usr/lib/lsb/remove_initd /etc/init.d/@install_name@"
             else
                 rc_inst=
@@ -1032 +1032 @@
     fi
 
+    rc_systemd=
+    if command -v pkg-config >/dev/null 2>&1
+    then
+        if pkg-config --exists systemd >/dev/null 2>&1
+        then
+           rc_systemd=`pkg-config --variable=systemdsystemunitdir systemd`
+        fi
+    fi
+           
     if test x"${act}" = xboot 
     then
@@ -1106 +1115 @@
            fi
         fi
+
+        if test x"${rc_systemd}" != x
+        then
+            if test x"$DESTDIR" = x
+            then
+                :
+            else
+                ${mkinstalldirs} ${DESTDIR}/${rc_systemd}
+            fi
+            if test -f init/samhain.startSystemd
+            then
+                servicescript=init/samhain.startSystemd
+            elif test -f samhain.startSystemd
+            then
+                servicescript=samhain.startSystemd
+            else
+                echo "${0}: cannot find samhain.startSystemd in ./ or ./init"
+            fi
+            if test -f ${DESTDIR}/${rc_systemd}/${samhain}.service && test x"$force" != xyes
+            then
+                echo "  ${DESTDIR}/${rc_systemd}/${samhain}.service exists ... not overwritten (or use --force)"
+            else
+                ${INSTALL_DATA} ${servicescript} "${DESTDIR}/${rc_systemd}/${samhain}.service"
+            fi
+        fi
+
         echo "installing init scripts completed"
     fi
@@ -1123 +1158 @@
             do
               test -z "$verbose" || echo "  rm -f  ${rc_dirz}${ff}.d/S99${samhain}"
-              rm -f  ${rc_dirz}${ff}.d/S99${samhain}
+              rm -f  "${rc_dirz}${ff}.d/S99${samhain}"
               test -z "$verbose" || echo "  rm -f  ${rc_dirz}${ff}.d/S99${samhain}"
-              rm -f  ${rc_dirz}${ff}.d/K10${samhain}
+              rm -f  "${rc_dirz}${ff}.d/K10${samhain}"
             done
         fi
 
         test -z "$verbose" || echo "  rm -f ${rc_main}/${samhain}"
-        rm -f ${rc_main}/${samhain}
+        rm -f "${rc_main}/${samhain}"
+
+        if test x"${rc_systemd}" != x
+        then
+            test -z "$verbose" || echo "  rm -f  ${rc_systemd}/${samhain}.service"
+            rm -f "${rc_systemd}/${samhain}.service"
+        fi
 
         echo "  uninstalling init scripts completed"

trunk/samhain.spec.in

@@ -92 +92 @@
 # after the package is installed
 #
-install -m 700 samhain-install.sh init/samhain.startLinux init/samhain.startLSB ${RPM_BUILD_ROOT}@mydataroot@
+install -m 700 samhain-install.sh init/samhain.startLinux init/samhain.startLSB init/samhain.startSystemd ${RPM_BUILD_ROOT}@mydataroot@
 #
 # file list (helpful advice from Lars Kellogg-Stedman)
@@ -121 +121 @@
         rm -f ./samhain.startLSB
         rm -f ./samhain.startLinux
+        rm -f ./samhain.startSystemd
         if [ -f @sbindir@/@install_name@_stealth ]; then
                 rm -f samhain-install.sh