add patch from Marcel Pennewiß to improve flexibility (bug #373583)

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 1d37901da3c402ac2d766346bb3d095178db3bf0..55e156bd4d19dc4031c8d07628705480f5eb6d16 100644 (file)
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.306 2011/10/07 16:40:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.307 2011/10/18 20:21:58 mr_bones_ Exp $
+
+  18 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.1.ebuild,
+  +files/syslog-ng.rc6.3.3:
+  add patch from Marcel Pennewiß to improve flexibility (bug #373583)
 
   07 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.3.1.ebuild,
   +files/syslog-ng-3.3.1-ssl.patch:

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index aff9a54107449befa345cd9c3bb5dffbbd9109ec..a578d9591287ea230c075ac0c9d3b39863be0a37 100644 (file)
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -9,9 +9,10 @@ AUX syslog-ng.confd 150 RMD160 b5ab31e1c285fdd2f41324abc2c6b39bce59038d SHA1 c5d
 AUX syslog-ng.logrotate 354 RMD160 120e617e36299bd7bea2ec226c2cda6e1574b793 SHA1 64abb48d2222e9702cbb33bc223507c44dbe2e85 SHA256 e8e1b6d87f8217c77c0bfbe3095cac0c4edcb72473cbd1423bf2ae7bffee8ca3
 AUX syslog-ng.logrotate.hardened 1742 RMD160 fd60ca606aec32eae51e3c219fd86124ca1f8cf6 SHA1 675f800200b37496a0335cd27e289b24c8d4f259 SHA256 f2c9f99c7dd73e709e5edb7be99de5a13058baab29d3c922ab9366ddd50eda8f
 AUX syslog-ng.rc6.3 1843 RMD160 6643aad29c60c55c417c9ab93a3588a022d7f7e5 SHA1 5f5ef1380493b6fa527c3518043afad0ececd980 SHA256 9a6fcbf400828564d9a8c1db02672ac2bab0ee8ab7af9a74d22062a5055597d6
+AUX syslog-ng.rc6.3.3 2191 RMD160 0b4703ab38af9cae66f6b5c391ceadf0fc738b8a SHA1 6ce272bf0c0652c5018ce10c2fde06171b20290a SHA256 25b89094a69784c31dcd5dd793e5f34d82df25e853505c3dd7ab179f3382e554
 DIST syslog-ng_3.2.4.tar.gz 1435115 RMD160 2927ba4d9b8a913f7117a659806c1721fe3d244e SHA1 ff732f7223bd2bd0424d4b9028b523cf62133af1 SHA256 e7bbd53121b57ba49089a0f95bf10a393e62b27a575c83d08e668c9dc1fe2f15
 DIST syslog-ng_3.3.1.tar.gz 2405280 RMD160 f337db97ff445d8bb8a087d1894103443d8d2c2c SHA1 f084d66754c7fa1eada56946f77ef3066faa27a1 SHA256 2cd5e0102504cb9d7bb25570bbb3fdd8657aa1b1afdc18f7b9aa892d8f9c9089
 EBUILD syslog-ng-3.2.4.ebuild 3293 RMD160 6968178b4bc2d3d80e4e322a466bc3875cd04fc3 SHA1 e667079278b7a643518736171939b486b9c4e680 SHA256 0071029876f2a2a7029a7e356ad2f7f28de805dfe127d22f855a0a04feb7b985
-EBUILD syslog-ng-3.3.1.ebuild 3389 RMD160 8c7eb120058b520886279670829ac1791d4e1867 SHA1 2dca053abea924baa6d75197f2a166003cf130e7 SHA256 7e631d73629d4bb6fa2953544c416311ecc9e618e72a4c0691b9e913fbaa8828
-MISC ChangeLog 41846 RMD160 2297e9f2870a5e375d0ea55b3a50a97cfefe0e8d SHA1 b246aeb4df18e9317547eff38d5eee29fdef1126 SHA256 992f7886233d3eb9c107aca2b5d7d0181cf4b7c05baaddc0e860d0a8b4012ed6
+EBUILD syslog-ng-3.3.1.ebuild 3388 RMD160 1a6e4539a70ce9f0839cd2be659ad2195187bcf2 SHA1 ee4a5e27886ddd57ba0d3ac6534806a26228ab55 SHA256 4c76da8fe940b25d58838e0b47796bdc78750de58879313b15c11a44531c5233
+MISC ChangeLog 42025 RMD160 58a022b17db9a673e020cfc2d4880527361f9f59 SHA1 bc4220fa4f1e25af53408aaf661b88bdef41d02f SHA256 9098717cb1baded6f2b479cc432f754794c18993a2cfb2adc52d7c1ff4d3324b
 MISC metadata.xml 559 RMD160 ea078d9f0296f07dc3ffa3f0f8ae69f979ba4d3b SHA1 0ec5700dd8e3ae0ae458086778908b818349061a SHA256 b0a3c093ff517898bb36172559a8778e0290a5a95255df64e1fe223232837cd7

diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6.3.3 b/app-admin/syslog-ng/files/syslog-ng.rc6.3.3
new file mode 100644 (file)
index 0000000..c1ea45c
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.rc6.3.3
@@ -0,0 +1,69 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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.3.3,v 1.1 2011/10/18 20:21:58 mr_bones_ Exp $
+
+extra_commands="checkconfig reload"
+
+SYSLOG_NG_SERVICE=${SVCNAME#*.}
+SYSLOG_NG_SERVICE=${SYSLOG_NG_SERVICE:-syslog-ng}
+
+SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${SYSLOG_NG_SERVICE}.conf}
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-/var/run/${SVCNAME}.pid}
+SYSLOG_NG_OPTS="--cfgfile ${SYSLOG_NG_CONFIGFILE} --pidfile ${SYSLOG_NG_PIDFILE} ${SYSLOG_NG_OPTS}"
+
+depend() {
+       # Make networking dependency conditional on configuration
+       if [ -f "${SYSLOG_NG_CONFIGFILE}" ]; then
+               case `sed 's/#.*//' "${SYSLOG_NG_CONFIGFILE}"` in
+                       *source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*)
+                               need net
+                               use stunnel ;;
+               esac
+       fi
+
+       config "${SYSLOG_NG_CONFIGFILE}"
+       use clock
+       need hostname localmount
+       provide logger
+}
+
+checkconfig() {
+       if [ ! -e "${SYSLOG_NG_CONFIGFILE}" ] ; then
+               eerror "You need to create ${SYSLOG_NG_CONFIGFILE} first."
+               eerror "An example can be found in /usr/share/doc/syslog"
+
+               return 1
+       fi
+       syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+
+       # 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 (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start() {
+       checkconfig || return 1
+       ebegin "Starting ${SVCNAME}"
+       [ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
+       start-stop-daemon --start --pidfile "${SYSLOG_NG_PIDFILE}" --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
+       eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+       ebegin "Stopping ${SVCNAME}"
+       start-stop-daemon --stop --pidfile "${SYSLOG_NG_PIDFILE}"
+       eend $? "Failed to stop ${SVCNAME}"
+       sleep 1 # needed for syslog-ng to stop in case we're restarting
+}
+
+reload() {
+       if [ ! -f "${SYSLOG_NG_PIDFILE}" ]; then
+               eerror "${SVCNAME} isn't running"
+               return 1
+       fi
+       checkconfig || return 1
+       ebegin "Reloading configuration and re-opening log files"
+       start-stop-daemon --signal HUP --pidfile "${SYSLOG_NG_PIDFILE}"
+       eend $?
+}

diff --git a/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
index f8bc0b80a2467f027d04fac00852345ef9cb9e55..771278982f2c995eef2d486b52f10729c8fd47fd 100644 (file)
--- a/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild,v 1.3 2011/10/07 16:40:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild,v 1.4 2011/10/18 20:21:58 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools fixheadtails eutils multilib
@@ -98,7 +98,7 @@ src_install() {
                newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
        fi
 
-       newinitd "${FILESDIR}/syslog-ng.rc6.${PV%%.*}" syslog-ng || die
+       newinitd "${FILESDIR}/syslog-ng.rc6.${PV%.*}" syslog-ng || die
        newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
        keepdir /etc/syslog-ng/patterndb.d
        find "${D}" -type f -name '*.la' -exec rm {} + || die