OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Apr-2004 16:12:14
Branch: OPENPKG_2_0_SOLID Handle: 2004040515121400
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/syslog-ng rc.syslog-ng syslog-ng.conf syslog-ng.spec
Log:
MFC: various essential packaging fixes
Summary:
Revision Changes Path
1.1.2.1 +8 -8 openpkg-src/syslog-ng/rc.syslog-ng
1.1.2.1 +5 -5 openpkg-src/syslog-ng/syslog-ng.conf
1.10.2.2 +3 -2 openpkg-src/syslog-ng/syslog-ng.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/syslog-ng/rc.syslog-ng
============================================================================
$ cvs diff -u -r1.1 -r1.1.2.1 rc.syslog-ng
--- openpkg-src/syslog-ng/rc.syslog-ng 2 Nov 2003 16:48:56 -0000 1.1
+++ openpkg-src/syslog-ng/rc.syslog-ng 5 Apr 2004 14:12:14 -0000 1.1.2.1
@@ -22,34 +22,34 @@
%status -u @l_susr@ -o
syslog_ng_usable="unknown"
syslog_ng_active="no"
- rcService syslog_ng enable yes && \
+ rcService syslog-ng enable yes && \
syslog_ng_signal 0 && syslog_ng_active="yes"
echo "syslog_ng_enable=\"$syslog_ng_enable\""
echo "syslog_ng_usable=\"$syslog_ng_usable\""
echo "syslog_ng_active=\"$syslog_ng_active\""
%start -p 100 -u @l_susr@
- rcService syslog_ng enable yes || exit 0
- rcService syslog_ng active yes && exit 0
+ rcService syslog-ng enable yes || exit 0
+ rcService syslog-ng active yes && exit 0
@l_prefix@/sbin/syslog-ng \
-f ${syslog_ng_cfgfile} \
-p ${syslog_ng_pidfile} \
${syslog_ng_flags}
%stop -p 100 -u @l_susr@
- rcService syslog_ng enable yes || exit 0
- rcService syslog_ng active no && exit 0
+ rcService syslog-ng enable yes || exit 0
+ rcService syslog-ng active no && exit 0
syslog_ng_signal TERM
sleep 2
rm -f $syslog_ng_pidfile >/dev/null 2>&1 || true
%restart -p 100 -u @l_susr@
- rcService syslog_ng enable yes || exit 0
- rcService syslog_ng active no && exit 0
+ rcService syslog-ng enable yes || exit 0
+ rcService syslog-ng active no && exit 0
rc syslog_ng stop start
%daily -u @l_susr@
- rcService syslog_ng enable yes || exit 0
+ rcService syslog-ng enable yes || exit 0
shtool rotate -f \
-n ${syslog_ng_log_numfiles} -s ${syslog_ng_log_minsize} -d \
-z ${syslog_ng_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/syslog-ng/syslog-ng.conf
============================================================================
$ cvs diff -u -r1.1 -r1.1.2.1 syslog-ng.conf
--- openpkg-src/syslog-ng/syslog-ng.conf 2 Nov 2003 16:48:56 -0000 1.1
+++ openpkg-src/syslog-ng/syslog-ng.conf 5 Apr 2004 14:12:14 -0000 1.1.2.1
@@ -21,8 +21,8 @@
unix-dgram("@l_prefix@/var/syslog-ng/syslog-ng.sock");
};
source s_remote {
- udp(ip(127.0.0.1) port(514) max-connections(20));
- tcp(ip(127.0.0.1) port(514) max-connections(20));
+ udp(ip(0.0.0.0) port(514));
+ tcp(ip(0.0.0.0) port(514) max-connections(20));
};
# message destinations
@@ -36,7 +36,7 @@
file("/dev/console");
};
destination d_logfile {
- file("@l_prefix@/var/syslogd/syslog-ng.log"
+ file("@l_prefix@/var/syslog-ng/syslog-ng.log"
template("$ISODATE $HOUR:$MIN:$SEC $TZ $HOST [$LEVEL] $MSG\n")
template_escape(no)
);
@@ -44,7 +44,7 @@
# message filters
filter f_tty_all {
- level(emerg)
+ level(emerg);
};
filter f_tty_root {
level(emerg,alert) or
@@ -55,6 +55,7 @@
(level(error, warning, notice) and facility(auth, kern));
};
filter f_logfile {
+ level(emerg);
};
# message logging
@@ -81,4 +82,3 @@
filter(f_tty_all);
destination(d_tty_all);
};
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/syslog-ng/syslog-ng.spec
============================================================================
$ cvs diff -u -r1.10.2.1 -r1.10.2.2 syslog-ng.spec
--- openpkg-src/syslog-ng/syslog-ng.spec 18 Feb 2004 14:51:56 -0000
1.10.2.1
+++ openpkg-src/syslog-ng/syslog-ng.spec 5 Apr 2004 14:12:14 -0000
1.10.2.2
@@ -40,7 +40,7 @@
Group: System
License: GPL
Version: %{V_sl_major}.%{V_sl_minor}
-Release: 2.0.0
+Release: 2.0.1
# list of sources
Source0:
http://www.balabit.com/downloads/syslog-ng/%{V_sl_major}/src/syslog-ng-%{V_sl_major}.%{V_sl_minor}.tar.gz
@@ -125,7 +125,8 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/etc/syslog-ng \
- $RPM_BUILD_ROOT%{l_prefix}/share/syslog-ng
+ $RPM_BUILD_ROOT%{l_prefix}/share/syslog-ng \
+ $RPM_BUILD_ROOT%{l_prefix}/var/syslog-ng
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.syslog-ng} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{l_shtool} install -c -m 644 %{l_value -s -a} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
