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 16:43:39
Branch: HEAD Handle: 2003070315433701
Added files:
openpkg-src/sysmon fsl.sysmon
Modified files:
openpkg-src/sysmon rc.sysmon sysmon.spec
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.1 +15 -0 openpkg-src/sysmon/fsl.sysmon
1.4 +15 -0 openpkg-src/sysmon/rc.sysmon
1.24 +36 -8 openpkg-src/sysmon/sysmon.spec
1.5189 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sysmon/fsl.sysmon
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.sysmon
--- /dev/null 2003-07-03 16:43:38.000000000 +0200
+++ fsl.sysmon 2003-07-03 16:43:39.000000000 +0200
@@ -0,0 +1,15 @@
+##
+## fsl.sysmon -- OSSP fsl configuration
+##
+
+ident .*(sysmon[d]?)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/sysmon/sysmon.log",
+ append=1, perm=0644
+ )
+ }
+};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sysmon/rc.sysmon
============================================================================
$ cvs diff -u -r1.3 -r1.4 rc.sysmon
--- openpkg-src/sysmon/rc.sysmon 24 Jun 2003 12:08:11 -0000 1.3
+++ openpkg-src/sysmon/rc.sysmon 3 Jul 2003 14:43:38 -0000 1.4
@@ -5,6 +5,11 @@
%config
sysmon_enable="yes"
+ sysmon_log_prolog="true"
+ sysmon_log_epilog="true"
+ sysmon_log_numfiles="10"
+ sysmon_log_minsize="1M"
+ sysmon_log_complevel="9"
%common
sysmon_pidfile="@l_prefix@/var/sysmon/sysmon.pid"
@@ -25,3 +30,13 @@
fi
fi
+%daily -u @l_susr@
+ opServiceEnabled sysmon || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${sysmon_log_numfiles} -s${sysmon_log_minsize} -d \
+ -z${sysmon_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${sysmon_log_prolog}" \
+ -E "${sysmon_log_epilog}" \
+ @l_prefix@/var/sysmon/sysmon.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sysmon/sysmon.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 sysmon.spec
--- openpkg-src/sysmon/sysmon.spec 18 May 2003 06:53:48 -0000 1.23
+++ openpkg-src/sysmon/sysmon.spec 3 Jul 2003 14:43:38 -0000 1.24
@@ -33,18 +33,26 @@
Group: Network
License: GPL
Version: 0.91.19
-Release: 20030518
+Release: 20030703
+
+# package options
+%option with_fsl yes
# list of sources
Source0: ftp://puck.nether.net/pub/jared/sysmon-%{version}.tar.gz
Source1: sysmon.conf
Source2: rc.sysmon
+Source3: fsl.sysmon
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020826, ncurses, MTA, openssl, flex
-PreReq: OpenPKG, openpkg >= 20020826, ncurses, MTA
+BuildPreReq: OpenPKG, openpkg >= 20030415, ncurses, MTA, openssl, flex
+PreReq: OpenPKG, openpkg >= 20030415, ncurses, MTA
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -62,7 +70,8 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags ncurses}" \
- LDFLAGS="%{l_ldflags}" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix}
@@ -73,8 +82,8 @@
%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}/sbin \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/etc/sysmon \
$RPM_BUILD_ROOT%{l_prefix}/man/man5 \
$RPM_BUILD_ROOT%{l_prefix}/man/man8 \
@@ -87,10 +96,29 @@
docs/sysmon.man $RPM_BUILD_ROOT%{l_prefix}/man/man8/sysmon.8
%{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE sysmon.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/sysmon/
- %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
+
+ # 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' \
- %{SOURCE rc.sysmon} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ -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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5188 -r1.5189 news.txt
--- openpkg-web/news.txt 3 Jul 2003 14:31:30 -0000 1.5188
+++ openpkg-web/news.txt 3 Jul 2003 14:43:37 -0000 1.5189
@@ -1,3 +1,4 @@
+03-Jul-2003: Upgraded package: P<sysmon-0.91.19-20030703>
03-Jul-2003: Upgraded package: P<snmp-5.0.8-20030703>
03-Jul-2003: Upgraded package: P<scponly-3.8-20030703>
03-Jul-2003: Upgraded package: P<j2se-1.3.1-20030703>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
