add fsl support

cvsd/cvsd.spec

@@ -33,19 +33,27 @@ Distribution: OpenPKG [PLUS]
 Group:        SCM
 License:      GPL
 Version:      0.9.19
-Release:      20030608
+Release:      20030703
+
+#   package options
+%option       with_fsl  yes
 
 #   list of sources
 Source0:      http://tiefighter.et.tudelft.nl/~arthur/cvsd/cvsd-%{version}.tar.gz
 Source1:      cvsd.conf
 Source2:      rc.cvsd
+Source3:      fsl.cvsd
 Patch0:       cvsd.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, cvs, gcc
-PreReq:       OpenPKG, openpkg >= 20020206, cvs
+BuildPreReq:  OpenPKG, openpkg >= 20030415, cvs, gcc
+PreReq:       OpenPKG, openpkg >= 20030415, cvs
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -75,6 +83,8 @@ AutoReqProv:  no
     #   configure program
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
+    LDFLAGS="%{l_fsl_ldflags}" \
+    LIBS="%{l_fsl_libs}" \
     ./configure \
         --prefix=%{l_prefix}
 
@@ -83,30 +93,45 @@ AutoReqProv:  no
 
 %install
     rm -rf $RPM_BUILD_ROOT
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/cvsd \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
 
     #   perform standard installation procedure
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/init.d
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
 
-    #   install additional data
-    %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
-        $RPM_BUILD_ROOT%{l_prefix}/var/cvsd
-    %{l_shtool} install -c -m 755 \
-        -e 's;@l_prefix@;%{l_prefix};g' \
-        -e 's;@l_susr@;%{l_susr};g' \
-        -e 's;@l_musr@;%{l_musr};g' \
-        -e 's;@l_mgrp@;%{l_mgrp};g' \
-        %{SOURCE rc.cvsd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+    #   Creating configuration
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_nusr@;%{l_nusr};g' \
         -e 's;@l_ngrp@;%{l_ngrp};g' \
         %{SOURCE cvsd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/cvsd/cvsd.conf
 
-    #   determine installation extend
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+    #   Creating run-command script
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+    %{l_shtool} install -c -m 755 \
+        -e 's;@l_prefix@;%{l_prefix};g' \
+        -e 's;@l_susr@;%{l_susr};g' \
+        -e 's;@l_rusr@;%{l_rusr};g' \
+        -e 's;@l_rgrp@;%{l_rgrp};g' \
+        %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+    #   OSSP fake syslog library
+    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+    %{l_shtool} install -c -m 644 \
+        -e 's;@l_prefix@;%{l_prefix};g' \
+        %{SOURCE fsl.%{name}} \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+    #   determine installation files
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std} \
+        '%not %dir %{l_prefix}/etc/fsl' \
+        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
 
 %files -f files
 

cvsd/fsl.cvsd

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

cvsd/rc.cvsd

@@ -5,6 +5,11 @@
 
 %config
     cvsd_enable="yes"
+    cvsd_log_prolog="true"
+    cvsd_log_epilog="true"
+    cvsd_log_numfiles="10"
+    cvsd_log_minsize="1M"
+    cvsd_log_complevel="9"
 
 %start -p 200 -u @l_susr@
     if opServiceEnabled cvsd; then
@@ -27,3 +32,13 @@
         @l_prefix@/sbin/cvsd
     fi
 
+%daily -u @l_susr@
+    opServiceEnabled cvsd || exit 0
+
+    #   rotate logfile
+    shtool rotate -f \
+        -n${cvsd_log_numfiles} -s${cvsd_log_minsize} -d \
+        -z${cvsd_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
+        -P "${cvsd_log_prolog}" \
+        -E "${cvsd_log_epilog}" \
+        @l_prefix@/var/cvsd/cvsd.log