added support for OSSP lib_fsl

inn/fsl.inn

@@ -0,0 +1,21 @@
+##
+##  fsl.inn -- OSSP fsl configuration for INN
+##
+
+#   use OSSP fsl to perform the equivalent of the
+#   following syslog.conf(5) configuration entries:
+#   news.crit    @l_prefix@/var/inn/log/news.crit
+#   news.err     @l_prefix@/var/inn/log/news.err
+#   news.notice  @l_prefix@/var/inn/log/news.notice
+ident inn/news q{
+    prefix(
+      prefix="%%b %%d %%H:%%M:%%S <%%L> [%%P]: ", 
+      timezone=local
+    ) -> 
+    {
+        critical: file(path="@l_prefix@/var/inn/log/news.crit",   append=1, perm=432);
+        error:    file(path="@l_prefix@/var/inn/log/news.err",    append=1, perm=432);
+        notice:   file(path="@l_prefix@/var/inn/log/news.notice", append=1, perm=432);
+    };
+};
+

inn/inn.spec

@@ -27,6 +27,11 @@
 %define       V_inn        2.3.3
 %define       V_cleanfeed  20010805
 
+#   package options
+%ifndef       with_fsl
+%define       with_fsl     no
+%endif
+
 #   package information
 Name:         inn
 Summary:      InterNetNews Usenet Server
@@ -37,19 +42,24 @@ Distribution: OpenPKG [REL]
 Group:        News
 License:      ISC
 Version:      %{V_inn}
-Release:      20020612
+Release:      20020724
 
 #   list of sources
 Source0:      ftp://ftp.isc.org/isc/inn/inn-%{V_inn}.tar.gz
 Source1:      http://www.bofh.it/~md/cleanfeed/cleanfeed-%{V_cleanfeed}.tgz
 Source2:      ftp://ftp.openpkg.org/DST/inn/fakesyslog.tar.gz
 Source3:      rc.inn
+Source4:      fsl.inn
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20020206, make, perl, db3, openssl, bison, flex
 PreReq:       OpenPKG, openpkg >= 20020206, perl, perl-crypto, MTA
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -58,10 +68,15 @@ AutoReqProv:  no
     NNTP server, and nnrpd, a newsreading server. INN separates hosts
     that feed you news from those that have users reading news.
 
+    Options
+    with_fsl=%{with_fsl}
+
 %prep
     %setup0 -q -c
     %setup1 -q -T -D -a 1
+%if "%{with_fsl}" != "yes"
     %setup2 -q -T -D -a 2
+%endif
 
 %build
     #   make sure INN finds our own files
@@ -69,6 +84,7 @@ AutoReqProv:  no
     export PATH
 
     #   build faked syslog(3) library
+%if "%{with_fsl}" != "yes"
     fakesyslogdir="`pwd`/fakesyslog"
     ( cd fakesyslog
       CC="%{l_cc}" \
@@ -77,6 +93,7 @@ AutoReqProv:  no
           --with-logfile=%{l_prefix}/var/inn/log/news.log
       %{l_make} %{l_mflags}
     )
+%endif
 
     cd inn-%{V_inn}
 
@@ -95,8 +112,13 @@ AutoReqProv:  no
     #   configure the source tree
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O} -I%{l_prefix}/include/db3 -I%{l_prefix}/include" \
+%if "%{with_fsl}" == "yes"
+    LDFLAGS="`%{l_prefix}/bin/fsl-config --ldflags`" \
+    LIBS="`%{l_prefix}/bin/fsl-config --libs`" \
+%else
     LDFLAGS="-L$fakesyslogdir -L%{l_prefix}/lib" \
     LIBS="-lfakesyslog" \
+%endif
     ./configure \
         --prefix=%{l_prefix} \
         --bindir=%{l_prefix}/libexec/inn \
@@ -201,6 +223,15 @@ AutoReqProv:  no
           -e 's;@l_mgrp@;%{l_mgrp};g' \
           %{SOURCE rc.inn} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+      #   optional OSSP fsl support
+%if "%{with_fsl}" == "yes"
+      %{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.inn} \
+          $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+%endif
     )
 
     #   install cleanfeed