From 3615bbf85bdc0c94d4a86fdf1948372e76c63bb9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Wed, 29 Nov 2006 17:43:29 +0000 Subject: [PATCH] Fixed bug #156585 where the init.d script could call eend twice with only one ebegin. Package-Manager: portage-2.1.2_rc2-r2 --- app-admin/syslog-ng/ChangeLog | 11 ++- .../files/digest-syslog-ng-1.6.11-r1 | 3 + .../syslog-ng/files/digest-syslog-ng-2.0.0-r1 | 3 + app-admin/syslog-ng/files/syslog-ng.rc6-r1 | 56 +++++++++++++++ app-admin/syslog-ng/metadata.xml | 4 +- .../syslog-ng/syslog-ng-1.6.11-r1.ebuild | 67 ++++++++++++++++++ app-admin/syslog-ng/syslog-ng-2.0.0-r1.ebuild | 68 +++++++++++++++++++ 7 files changed, 209 insertions(+), 3 deletions(-) create mode 100644 app-admin/syslog-ng/files/digest-syslog-ng-1.6.11-r1 create mode 100644 app-admin/syslog-ng/files/digest-syslog-ng-2.0.0-r1 create mode 100644 app-admin/syslog-ng/files/syslog-ng.rc6-r1 create mode 100644 app-admin/syslog-ng/syslog-ng-1.6.11-r1.ebuild create mode 100644 app-admin/syslog-ng/syslog-ng-2.0.0-r1.ebuild diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog index c7f963561242..e1881392b140 100644 --- a/app-admin/syslog-ng/ChangeLog +++ b/app-admin/syslog-ng/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-admin/syslog-ng # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.136 2006/11/02 20:51:37 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.137 2006/11/29 17:43:29 betelgeuse Exp $ + +*syslog-ng-2.0.0-r1 (29 Nov 2006) +*syslog-ng-1.6.11-r1 (29 Nov 2006) + + 29 Nov 2006; Petteri Räty + +files/syslog-ng.rc6-r1, +syslog-ng-1.6.11-r1.ebuild, + -syslog-ng-2.0.0.ebuild, +syslog-ng-2.0.0-r1.ebuild: + Fixed bug #156585 where the init.d script could call eend twice with only + one ebegin. *syslog-ng-2.0.0 (02 Nov 2006) diff --git a/app-admin/syslog-ng/files/digest-syslog-ng-1.6.11-r1 b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.11-r1 new file mode 100644 index 000000000000..388740510c81 --- /dev/null +++ b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.11-r1 @@ -0,0 +1,3 @@ +MD5 8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz 712166 +RMD160 2ddd5eaae12dbcef4b4e67f83d01a3bab8b2cce0 syslog-ng-1.6.11.tar.gz 712166 +SHA256 dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093 syslog-ng-1.6.11.tar.gz 712166 diff --git a/app-admin/syslog-ng/files/digest-syslog-ng-2.0.0-r1 b/app-admin/syslog-ng/files/digest-syslog-ng-2.0.0-r1 new file mode 100644 index 000000000000..41db1b198553 --- /dev/null +++ b/app-admin/syslog-ng/files/digest-syslog-ng-2.0.0-r1 @@ -0,0 +1,3 @@ +MD5 134db2e3d7b16bb70fd86d749cc2e4fd syslog-ng-2.0.0.tar.gz 337553 +RMD160 ed2c3ff8eea834c0c2fdae03ce2f9068a6d24128 syslog-ng-2.0.0.tar.gz 337553 +SHA256 6f1e22554eb7292d9322de0623fd13dbd11bdda8d52d66280c1d4e193a69fac7 syslog-ng-2.0.0.tar.gz 337553 diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6-r1 b/app-admin/syslog-ng/files/syslog-ng.rc6-r1 new file mode 100644 index 000000000000..9ec48b4051f6 --- /dev/null +++ b/app-admin/syslog-ng/files/syslog-ng.rc6-r1 @@ -0,0 +1,56 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6-r1,v 1.1 2006/11/29 17:43:29 betelgeuse Exp $ + +opts="depend checkconfig start stop reload" + +depend() { + # Make networking dependency conditional on configuration + case $(sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf) in + *source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*) + need net ;; + esac + + need clock hostname + provide logger +} + +checkconfig() { + if [ ! -e /etc/syslog-ng/syslog-ng.conf ] ; then + eerror "You need to create /etc/syslog-ng/syslog-ng.conf first." + eerror "An example can be found in /etc/syslog-ng/syslog-ng.conf.sample" + return 1 + fi + syslog-ng -s /etc/syslog-ng/syslog-ng.conf + + # the start and reload functions have their own eends so + # avoid calling this twice when there are no problems + [[ $? -eq 0 ]] || eend $? "Configuration error. Please fix your configfile (/etc/syslog-ng/syslog-ng.conf)" +} + +start() { + checkconfig || return 1 + ebegin "Starting syslog-ng" + [[ -n ${SYSLOG_NG_OPTS} ]] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}" + start-stop-daemon --start --quiet --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS} + eend $? "Failed to start syslog-ng" +} + +stop() { + ebegin "Stopping syslog-ng" + start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid + eend $? "Failed to stop syslog-ng" + sleep 1 # needed for syslog-ng to stop in case we're restarting +} + +reload() { + if [ ! -f /var/run/syslog-ng.pid ]; then + eerror "syslog-ng isn't running" + return 1 + fi + checkconfig || return 1 + ebegin "Reloading configuration and re-opening log files" + kill -HUP `cat /var/run/syslog-ng.pid` &>/dev/null + eend $? +} diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml index c608c33209b7..148e113bd9b3 100644 --- a/app-admin/syslog-ng/metadata.xml +++ b/app-admin/syslog-ng/metadata.xml @@ -3,7 +3,7 @@ no-herd - mr_bones_@gentoo.org - Michael Sterrett + mr_bones_@gentoo.org + Michael Sterrett diff --git a/app-admin/syslog-ng/syslog-ng-1.6.11-r1.ebuild b/app-admin/syslog-ng/syslog-ng-1.6.11-r1.ebuild new file mode 100644 index 000000000000..fba840b96c01 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-1.6.11-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.6.11-r1.ebuild,v 1.1 2006/11/29 17:43:29 betelgeuse Exp $ + +inherit fixheadtails + +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="http://www.balabit.com/products/syslog_ng/" +SRC_URI="http://www.balabit.com/downloads/syslog-ng/${PV%.*}/src/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="hardened selinux static tcpd" + +RDEPEND=">=dev-libs/libol-0.3.16 + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" +DEPEND="${RDEPEND} + >=sys-apps/portage-2.0.51 + sys-devel/flex" +PROVIDE="virtual/logger" + +src_unpack() { + unpack ${A} + cd "${S}" + ht_fix_file configure + # fix for bugs #104538 and bug #104475 + sed -i \ + -e "s:utils/::" \ + -e "s:--local-:--:" \ + configure \ + || die "sed failed" + cd "${S}/doc/sgml" + tar xzf syslog-ng.html.tar.gz || die "tar failed" +} + +src_compile() { + econf \ + --disable-dependency-tracking \ + --with-libol=${ROOT}/usr/bin \ + $(use_enable static full-static) \ + $(use_enable tcpd tcp-wrapper) || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS ChangeLog INSTALL NEWS PORTS README \ + doc/{syslog-ng.conf.sample,syslog-ng.conf.demo,stresstest.sh} \ + doc/sgml/syslog-ng.txt contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."* + dohtml doc/sgml/syslog-ng.html/* + + # Install default configuration + insinto /etc/syslog-ng + if use hardened || use selinux ; then + newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened" syslog-ng.conf + else + newins "${FILESDIR}/syslog-ng.conf.gentoo" syslog-ng.conf + fi + + # Install snippet for logrotate, which may or may not be installed + insinto /etc/logrotate.d + newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc6-r1" syslog-ng +} diff --git a/app-admin/syslog-ng/syslog-ng-2.0.0-r1.ebuild b/app-admin/syslog-ng/syslog-ng-2.0.0-r1.ebuild new file mode 100644 index 000000000000..41895647a883 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-2.0.0-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-2.0.0-r1.ebuild,v 1.1 2006/11/29 17:43:29 betelgeuse Exp $ + +inherit fixheadtails + +MY_PV=${PV/_/} +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="http://www.balabit.com/products/syslog_ng/" +SRC_URI="http://www.balabit.com/downloads/syslog-ng/2.0/src/${PN}-${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="hardened selinux static ipv6" + +RDEPEND=">=dev-libs/eventlog-0.2 + >=dev-libs/glib-2.2" +DEPEND="${RDEPEND} + sys-devel/flex" +PROVIDE="virtual/logger" + +S=${WORKDIR}/${PN}-${MY_PV} + +src_unpack() { + unpack ${A} + cd "${S}" + ht_fix_file configure + cd "${S}/doc/reference" + tar xzf syslog-ng.html.tar.gz || die "tar failed" +} + +src_compile() { + econf \ + --sysconfdir=/etc/syslog-ng \ + --disable-dependency-tracking \ + $(use_enable ipv6) \ + $(use_enable !static dynamic-linking) \ + $(use_enable static static-linking) \ + || die + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS ChangeLog NEWS README \ + doc/examples/{syslog-ng.conf.sample,syslog-ng.conf.solaris} \ + contrib/syslog-ng.conf* \ + doc/reference/syslog-ng.txt \ + contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."* + dohtml doc/reference/syslog-ng.html/* + + # Install default configuration + insinto /etc/syslog-ng + if use hardened || use selinux ; then + newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened" syslog-ng.conf + else + newins "${FILESDIR}/syslog-ng.conf.gentoo" syslog-ng.conf + fi + + # Install snippet for logrotate, which may or may not be installed + insinto /etc/logrotate.d + newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc6-r1" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng +} -- 2.26.2