openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
Dr. Ralf S. Engelschall 19 years ago
parent
87e45b09d7
commit
5bb1741227
3 changed files with 59 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      syslog-ng/rc.syslog-ng
  2. 4
      syslog-ng/syslog-ng.conf
  3. 67
      syslog-ng/syslog-ng.spec

14
syslog-ng/rc.syslog-ng
Unescape View File

@ -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@ \

4
syslog-ng/syslog-ng.conf
Unescape View File

@ -21,8 +21,8 @@ source s_local {
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

67
syslog-ng/syslog-ng.spec
Unescape View File

@ -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 @@ Class: PLUS
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 @@ AutoReqProv: no
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 @@ AutoReqProv: no
%prep
%setup -q
%setup -q -T -D -a 1
%setup -q -T -D -a 2
%build
# configure and build libol
@ -97,21 +110,30 @@ AutoReqProv: no
%{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 @@ AutoReqProv: no
%{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 @@ AutoReqProv: no
%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

Write Preview
Loading…
Cancel
Save