OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Nov-2006 14:22:55
Branch: HEAD Handle: 2006111413225500
Modified files:
openpkg-src/syslog-ng rc.syslog-ng syslog-ng.conf syslog-ng.spec
Log:
upgrade to syslog NG 2.0.0; add %post/%preun for daemon handling; fix
rcService calls; fix default config for listening on 127.0.0.1 by
default only
Summary:
Revision Changes Path
1.8 +7 -7 openpkg-src/syslog-ng/rc.syslog-ng
1.4 +2 -2 openpkg-src/syslog-ng/syslog-ng.conf
1.33 +50 -17 openpkg-src/syslog-ng/syslog-ng.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/syslog-ng/rc.syslog-ng
============================================================================
$ cvs diff -u -r1.7 -r1.8 rc.syslog-ng
--- openpkg-src/syslog-ng/rc.syslog-ng 13 Oct 2006 15:26:15 -0000
1.7
+++ openpkg-src/syslog-ng/rc.syslog-ng 14 Nov 2006 13:22:55 -0000
1.8
@@ -30,27 +30,27 @@
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 900 -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.3 -r1.4 syslog-ng.conf
--- openpkg-src/syslog-ng/syslog-ng.conf 11 Mar 2004 17:55:56 -0000
1.3
+++ openpkg-src/syslog-ng/syslog-ng.conf 14 Nov 2006 13:22:55 -0000
1.4
@@ -21,8 +21,8 @@
unix-dgram("@l_prefix@/var/syslog-ng/syslog-ng.sock");
};
source s_remote {
- udp(ip(0.0.0.0) port(514));
- tcp(ip(0.0.0.0) port(514) max-connections(20));
+ udp(ip(127.0.0.1) port(514));
+ tcp(ip(127.0.0.1) port(514) max-connections(20));
};
# message destinations
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/syslog-ng/syslog-ng.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 syslog-ng.spec
--- openpkg-src/syslog-ng/syslog-ng.spec 13 Oct 2006 17:34:42 -0000
1.32
+++ openpkg-src/syslog-ng/syslog-ng.spec 14 Nov 2006 13:22:55 -0000
1.33
@@ -23,10 +23,12 @@
##
# package version
-%define V_sl_major 1.6
-%define V_sl_minor 11
+%define V_sl_major 2.0
+%define V_sl_minor 0
%define V_ol_major 0.3
%define V_ol_minor 18
+%define V_el_major 0.2
+%define V_el_minor 5
# package information
Name: syslog-ng
@@ -39,19 +41,22 @@
Group: System
License: GPL
Version: %{V_sl_major}.%{V_sl_minor}
-Release: 20061013
+Release: 20061114
# 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
Source1:
http://www.balabit.com/downloads/libol/%{V_ol_major}/libol-%{V_ol_major}.%{V_ol_minor}.tar.gz
-Source2: rc.syslog-ng
-Source3: syslog-ng.conf
+Source2:
http://www.balabit.com/downloads/eventlog/%{V_el_major}/eventlog-%{V_el_major}.%{V_el_minor}.tar.gz
+Source3: rc.syslog-ng
+Source4: syslog-ng.conf
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, flex, gcc
+BuildPreReq: OpenPKG, openpkg >= 20060823, flex, gcc, pkgconfig
PreReq: OpenPKG, openpkg >= 20060823
+BuildPreReq: glib
+PreReq: glib
AutoReq: no
AutoReqProv: no
@@ -72,10 +77,17 @@
url = http://www.balabit.com/downloads/libol/__NEWVER__/
regex = libol-(__VER__)\.tar\.gz
}
+ prog syslog-ng:eventlog = {
+ version = %{V_el_major}.%{V_el_minor}
+ url = http://www.balabit.com/downloads/eventlog/
+ regex = (0\.\d+)
+ url = http://www.balabit.com/downloads/eventlog/__NEWVER__/
+ regex = eventlog-(__VER__)\.tar\.gz
+ }
prog syslog-ng:syslog-ng = {
version = %{V_sl_major}.%{V_sl_minor}
url = http://www.balabit.com/downloads/syslog-ng/
- regex = (1\.[6-8])
+ regex = (2\.\d+)
url =
http://www.balabit.com/downloads/syslog-ng/__NEWVER__/src/
regex = syslog-ng-(__VER__)\.tar\.gz
}
@@ -83,6 +95,7 @@
%prep
%setup -q
%setup -q -T -D -a 1
+ %setup -q -T -D -a 2
%build
# configure and build libol
@@ -97,21 +110,30 @@
%{l_make} %{l_mflags -O}
) || exit $?
+ # configure and build eventlog
+ ( cd eventlog-%{V_el_major}.%{V_el_minor}
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --disable-shared
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
+
# configure and build syslog-ng
%{l_shtool} subst \
- -e 's;ACLOCAL=aclocal;ACLOCAL=true;g' \
- -e 's;AUTOCONF=autoconf;AUTOCONF=true;;' \
- -e 's;AUTOMAKE=automake;AUTOMAKE=true;;' \
- -e 's;AUTOHEADER=autoheader;AUTOHEADER=true;;' \
- -e 's;MAKEINFO=makeinfo;MAKEINFO=true;;' \
+ -e 's;-Wl,-Bdynamic;;' \
configure
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
+ EVTLOG_CFLAGS="-I`pwd`/eventlog-%{V_el_major}.%{V_el_minor}/src" \
+ EVTLOG_LIBS="-L`pwd`/eventlog-%{V_el_major}.%{V_el_minor}/src/.libs
-levtlog" \
./configure \
- --prefix=%{l_prefix} \
- --with-libol="`pwd`/libol-%{V_ol_major}.%{V_ol_minor}"
+ --prefix=%{l_prefix}
%{l_make} %{l_mflags -O}
%install
@@ -130,9 +152,6 @@
%{SOURCE rc.syslog-ng} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE syslog-ng.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/syslog-ng/
- %{l_gzip} -d -c doc/sgml/syslog-ng.html.tar.gz | %{l_tar} xf -
- %{l_shtool} install -c -m 644 %{l_value -s -a} \
- syslog-ng.html/* $RPM_BUILD_ROOT%{l_prefix}/share/syslog-ng/
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ -144,3 +163,17 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} syslog-ng status 2>/dev/null`
+ [ ".$syslog_ng_active" = .yes ] && %{l_rc} syslog-ng restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} syslog-ng stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/syslog-ng/* >/dev/null 2>&1 || true
+ exit 0
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
