OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 24-Jul-2002 14:27:42
Branch: HEAD Handle: 2002072413274200
Added files:
openpkg-src/inn fsl.inn
Modified files:
openpkg-src/inn inn.spec
openpkg-web news.txt
Log:
added support for OSSP lib_fsl
Summary:
Revision Changes Path
1.1 +21 -0 openpkg-src/inn/fsl.inn
1.36 +32 -1 openpkg-src/inn/inn.spec
1.1027 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/inn/fsl.inn
============================================================
$ cvs update -p -r1.1 fsl.inn
##
## 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);
};
};
Index: openpkg-src/inn/inn.spec
============================================================
$ cvs diff -u -r1.35 -r1.36 inn.spec
--- openpkg-src/inn/inn.spec 12 Jun 2002 14:39:43 -0000 1.35
+++ openpkg-src/inn/inn.spec 24 Jul 2002 12:27:42 -0000 1.36
@@ -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 @@
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 @@
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 @@
export PATH
# build faked syslog(3) library
+%if "%{with_fsl}" != "yes"
fakesyslogdir="`pwd`/fakesyslog"
( cd fakesyslog
CC="%{l_cc}" \
@@ -77,6 +93,7 @@
--with-logfile=%{l_prefix}/var/inn/log/news.log
%{l_make} %{l_mflags}
)
+%endif
cd inn-%{V_inn}
@@ -95,8 +112,13 @@
# 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 @@
-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
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1026 -r1.1027 news.txt
--- openpkg-web/news.txt 24 Jul 2002 12:23:41 -0000 1.1026
+++ openpkg-web/news.txt 24 Jul 2002 12:27:42 -0000 1.1027
@@ -1,3 +1,4 @@
+24-Jul-2002: Upgraded package: P<inn-2.3.3-20020724>
24-Jul-2002: Upgraded package: P<fsl-0.1.3-20020724>
24-Jul-2002: Upgraded package: P<gdb-5.2.1-20020724>
24-Jul-2002: Upgraded package: P<acroread-5.06-20020724>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
