OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 03-Jul-2003 15:17:08
Branch: HEAD Handle: 2003070314170701
Added files:
openpkg-src/samhain fsl.samhain
Modified files:
openpkg-src/samhain rc.samhain samhain.spec
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.1 +15 -0 openpkg-src/samhain/fsl.samhain
1.7 +15 -0 openpkg-src/samhain/rc.samhain
1.43 +32 -5 openpkg-src/samhain/samhain.spec
1.5185 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samhain/fsl.samhain
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.samhain
--- /dev/null 2003-07-03 15:17:08.000000000 +0200
+++ fsl.samhain 2003-07-03 15:17:08.000000000 +0200
@@ -0,0 +1,15 @@
+##
+## fsl.samhain -- OSSP fsl configuration
+##
+
+ident (Yule|Samhain)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/samhain/samhain.log",
+ append=1, perm=0644
+ )
+ }
+};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samhain/rc.samhain
============================================================================
$ cvs diff -u -r1.6 -r1.7 rc.samhain
--- openpkg-src/samhain/rc.samhain 24 Jun 2003 12:17:40 -0000 1.6
+++ openpkg-src/samhain/rc.samhain 3 Jul 2003 13:17:08 -0000 1.7
@@ -5,6 +5,11 @@
%config
samhain_enable="yes"
+ samhain_log_prolog="true"
+ samhain_log_epilog="true"
+ samhain_log_numfiles="10"
+ samhain_log_minsize="1M"
+ samhain_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled samhain || exit 0
@@ -16,3 +21,13 @@
kill -TERM `cat @l_prefix@/var/samhain/samhain.pid`
fi
+%daily -u @l_susr@
+ opServiceEnabled samhain || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${samhain_log_numfiles} -s${samhain_log_minsize} -d \
+ -z${samhain_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${samhain_log_prolog}" \
+ -E "${samhain_log_epilog}" \
+ @l_prefix@/var/samhain/samhain.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samhain/samhain.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 samhain.spec
--- openpkg-src/samhain/samhain.spec 2 Jul 2003 16:32:42 -0000 1.42
+++ openpkg-src/samhain/samhain.spec 3 Jul 2003 13:17:08 -0000 1.43
@@ -33,17 +33,25 @@
Group: System
License: GPL
Version: 1.7.9
-Release: 20030702
+Release: 20030703
+
+# package options
+%option with_fsl yes
# list of sources
Source0: http://la-samhna.de/samhain/samhain-current.tar.gz
Source1: rc.samhain
+Source2: fsl.samhain
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020826, gcc
-PreReq: OpenPKG, openpkg >= 20020826
+BuildPreReq: OpenPKG, openpkg >= 20030415, gcc
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -67,6 +75,8 @@
esac
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
@@ -85,6 +95,8 @@
%install
rm -rf $RPM_BUILD_ROOT
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
( cd samhain-%{version}
%{l_make} %{l_mflags} \
install-program install-man install-data \
@@ -100,14 +112,29 @@
%{l_shtool} install -c -m 644 \
samhain-%{version}/$rc \
$RPM_BUILD_ROOT%{l_prefix}/etc/samhain/samhainrc
+
+ # 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' \
- %{SOURCE rc.samhain} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ -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}' \
'%config %{l_prefix}/etc/samhain/samhainrc'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5184 -r1.5185 news.txt
--- openpkg-web/news.txt 3 Jul 2003 12:31:22 -0000 1.5184
+++ openpkg-web/news.txt 3 Jul 2003 13:17:07 -0000 1.5185
@@ -1,3 +1,4 @@
+03-Jul-2003: Upgraded package: P<samhain-1.7.9-20030703>
03-Jul-2003: Upgraded package: P<msntp-1.6-20030703>
03-Jul-2003: Upgraded package: P<kerberos-1.2.8-20030703>
03-Jul-2003: Upgraded package: P<ddd-3.3.1-20030703>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
