OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 05-Sep-2003 17:16:14
Branch: HEAD Handle: 2003090516161201
Added files:
openpkg-src/samhain samhain.patch
Modified files:
openpkg-src/samhain fsl.samhain rc.samhain samhain.spec
openpkg-web news.txt
Log:
Update nontracked version from 1.7.10 to 1.7.11, repaired logging and
fsl configuration, implemented features in ticket #202
Summary:
Revision Changes Path
1.5 +1 -1 openpkg-src/samhain/fsl.samhain
1.15 +5 -2 openpkg-src/samhain/rc.samhain
1.1 +12 -0 openpkg-src/samhain/samhain.patch
1.56 +4 -2 openpkg-src/samhain/samhain.spec
1.6421 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samhain/fsl.samhain
============================================================================
$ cvs diff -u -r1.4 -r1.5 fsl.samhain
--- openpkg-src/samhain/fsl.samhain 14 Jul 2003 18:32:45 -0000 1.4
+++ openpkg-src/samhain/fsl.samhain 5 Sep 2003 15:16:13 -0000 1.5
@@ -2,7 +2,7 @@
## fsl.samhain -- OSSP fsl configuration
##
-ident (Yule|Samhain)/.+ q{
+ident (samhain)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samhain/rc.samhain
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.samhain
--- openpkg-src/samhain/rc.samhain 22 Jul 2003 16:29:14 -0000 1.14
+++ openpkg-src/samhain/rc.samhain 5 Sep 2003 15:16:13 -0000 1.15
@@ -39,15 +39,18 @@
%start -u @l_susr@
rcService samhain enable yes || exit 0
+ rcService samhain active yes && exit 0
@l_prefix@/sbin/samhain -t check -D
%stop -u @l_susr@
rcService samhain enable yes || exit 0
+ rcService samhain active no && exit 0
samhain_signal TERM
samhain_wait
%restart -u @l_susr@
rcService samhain enable yes || exit 0
+ rcService samhain active no && exit 0
rc samhain stop
sleep 2
rc samhain start
@@ -58,8 +61,8 @@
# rotate logfile
shtool rotate -f \
-n ${samhain_log_numfiles} -s ${samhain_log_minsize} -d \
- -z ${samhain_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${samhain_log_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
-P "${samhain_log_prolog}" \
- -E "${samhain_log_epilog}" \
+ -E "${samhain_log_epilog} && rc samhain restart" \
@l_prefix@/var/samhain/samhain.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samhain/samhain.patch
============================================================================
$ cvs diff -u -r0 -r1.1 samhain.patch
--- /dev/null 2003-09-05 17:16:13.000000000 +0200
+++ samhain.patch 2003-09-05 17:16:13.000000000 +0200
@@ -0,0 +1,12 @@
+diff -Naur samhain-1.7.11.orig/sh_err_syslog.c samhain-1.7.11/sh_err_syslog.c
+--- samhain-1.7.11.orig/sh_err_syslog.c Fri Mar 21 21:24:50 2003
++++ samhain-1.7.11/sh_err_syslog.c Fri Sep 5 16:46:26 2003
+@@ -162,7 +162,7 @@
+
+ if (init == 0)
+ {
+- openlog (sh.prg_name, LOG_PID, my_syslog_facility);
++ openlog ("samhain", LOG_PID, my_syslog_facility);
+ init = 1;
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samhain/samhain.spec
============================================================================
$ cvs diff -u -r1.55 -r1.56 samhain.spec
--- openpkg-src/samhain/samhain.spec 28 Jul 2003 13:37:08 -0000 1.55
+++ openpkg-src/samhain/samhain.spec 5 Sep 2003 15:16:13 -0000 1.56
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: System
License: GPL
-Version: 1.7.10
-Release: 20030728
+Version: 1.7.11
+Release: 20030905
# package options
%option with_fsl yes
@@ -42,6 +42,7 @@
Source0: http://la-samhna.de/samhain/samhain-current.tar.gz
Source1: rc.samhain
Source2: fsl.samhain
+Patch0: samhain.patch
# build information
Prefix: %{l_prefix}
@@ -65,6 +66,7 @@
%prep
%setup -q -c samhain-%{version}
%{l_gzip} -d -c samhain-%{version}.tar.gz | %{l_tar} xf -
+ %patch -p0
%build
cd samhain-%{version}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6420 -r1.6421 news.txt
--- openpkg-web/news.txt 5 Sep 2003 11:21:25 -0000 1.6420
+++ openpkg-web/news.txt 5 Sep 2003 15:16:12 -0000 1.6421
@@ -1,3 +1,4 @@
+05-Sep-2003: Upgraded package: P<samhain-1.7.11-20030905>
05-Sep-2003: Upgraded package: P<kde-libs-3.1.3a-20030905>
05-Sep-2003: Upgraded package: P<kde-base-3.1.3-20030905>
05-Sep-2003: Upgraded package: P<kde-arts-1.1.3-20030905>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
