Introduction of FSL, PR #202, and corrections to paths, install logic, and comment style

nessus-tool/fsl.nessus

@@ -0,0 +1,16 @@
+##
+##  fsl.nessus -- OSSP fsl configuration
+##
+
+ident (nessus)/.+ q{
+    prefix(
+        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+    )
+    -> {
+        debug: file(
+            path="@l_prefix@/var/nessus/logs/nessusd.log",
+            perm=0644, jitter=1, monitor=3600
+        )
+    }
+};
+

nessus-tool/nessus-tool.spec

@@ -33,7 +33,10 @@ Distribution: OpenPKG [EVAL]
 Group:        Security
 License:      GPL
 Version:      2.0.9
-Release:      20031106
+Release:      20031111
+
+#   package options
+%option       with_fsl  yes
 
 #   list of sources
 Source0:      ftp://ftp.nessus.org/pub/nessus/nessus-%{version}/src/nessus-core-%{version}.tar.gz
@@ -42,6 +45,7 @@ Source2:      nessusd.conf
 Source3:      nessusd.rules
 Source4:      nessusd.users
 Source5:      rc.nessus
+Source6:      fsl.nessus
 Patch0:       nessus-tool.patch
 
 #   build information
@@ -51,6 +55,10 @@ BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, gcc, make
 PreReq:       OpenPKG, openpkg >= 20030103, X11
 BuildPreReq:  nessus-libs, glib, gtk, openssl
 PreReq:       nessus-libs, glib, gtk, openssl
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl >= 1.3.0
+PreReq:       fsl >= 1.3.0
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -71,7 +79,8 @@ AutoReqProv:  no
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       CPPFLAGS="%{l_cppflags}" \
-      LDFLAGS="%{l_ldflags}" \
+      LDFLAGS="%{l_fsl_ldflags}" \
+      LIBS="%{l_fsl_libs}" \
       ./configure \
           --prefix=%{l_prefix} \
           --localstatedir=%{l_prefix}/var \
@@ -99,7 +108,8 @@ AutoReqProv:  no
       CC="%{l_cc}" \
       CFLAGS="-I${nessus_core}/tmp%{l_prefix}/include/nessus %{l_cflags -O}" \
       CPPFLAGS="-I${nessus_core}/tmp%{l_prefix}/include/nessus %{l_cppflags}" \
-      LDFLAGS="%{l_ldflags}" \
+      LDFLAGS="%{l_fsl_ldflags}" \
+      LIBS="%{l_fsl_libs}" \
       ./configure \
           --prefix=%{l_prefix} \
           --enable-install="`%{l_shtool} echo -e %u`" \
@@ -132,7 +142,7 @@ AutoReqProv:  no
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
 
     #   install default configuration
-    %{l_shtool} install -c -m 644 \
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
         %{SOURCE nessusd.conf} \
         %{SOURCE nessusd.rules} \
         %{SOURCE nessusd.users} \
@@ -140,9 +150,12 @@ AutoReqProv:  no
 
     #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
         %{SOURCE rc.nessus} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        %{SOURCE fsl.nessus} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
 
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ -156,6 +169,13 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
 
 %post
+    #   after upgrade, restart service
+    if [ $1 -eq 2 ]; then
+        eval `%{l_rc} nessus status 2>/dev/null`
+        [ ".$nessus_active" = .yes ] && %{l_rc} nessus restart
+    fi
+
+    #   on every install, announce certificate
     if [ $1 -le 2 ]; then
         if [ ! -f $RPM_INSTALL_PREFIX/var/nessus/CA/servercert.pem ]; then
             ( echo "For the SSL/TLS based remote client/server connections"
@@ -166,10 +186,21 @@ AutoReqProv:  no
             ) | %{l_rpmtool} msg -b -t info
         fi
     fi
+
+    #   on initial install, announce useradd
     if [ $1 -eq 1 ]; then
         ( echo "Each Nessus user has to be created on the Nessus server"
           echo "Run the following command to create an individual user:"
           echo "  \$ $RPM_INSTALL_PREFIX/sbin/nessus-adduser"
         ) | %{l_rpmtool} msg -b -t info
     fi
+    exit 0
+
+%preun
+    #   before erase, stop service and remove log files
+    if [ $1 -eq 0 ]; then
+        %{l_rc} nessus stop 2>/dev/null
+        rm -f $RPM_INSTALL_PREFIX/var/nessus/logs/*.log* >/dev/null 2>&1 || true
+    fi
+    exit 0
 

nessus-tool/rc.nessus

@@ -56,5 +56,5 @@
         -z ${nessus_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
         -P "${nessus_log_prolog}" \
         -E "${nessus_log_epilog} && rc nessus restart" \
-        @l_prefix@/var/nessus/nessusd.log
+        @l_prefix@/var/nessus/logs/nessusd.log