From: Roy Marples Date: Wed, 14 Mar 2007 09:56:00 +0000 (+0000) Subject: init script ow works on non bash shells. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8747103f562412fcbeeebd4c306c3d6dc8cd7bbb;p=gentoo.git init script ow works on non bash shells. Package-Manager: portage-2.1.2.2 --- diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog index 0c6f915ff9d0..65df9fc452c1 100644 --- a/app-admin/syslog-ng/ChangeLog +++ b/app-admin/syslog-ng/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/syslog-ng # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.150 2007/02/16 18:51:07 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.151 2007/03/14 09:56:00 uberlord Exp $ + +*syslog-ng-1.6.12-r1 (14 Mar 2007) + + 14 Mar 2007; Roy Marples files/syslog-ng.rc6-r1, + +syslog-ng-1.6.12-r1.ebuild: + init script now works on non bash shells. 16 Feb 2007; Michael Sterrett syslog-ng-1.6.11-r1.ebuild, syslog-ng-1.6.12.ebuild: diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index e819fee00fa9..1354e3379c9a 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -22,10 +22,10 @@ AUX syslog-ng.rc6 1615 RMD160 8cb414bc09c48fdb591320203947035f9c32e968 SHA1 3752 MD5 b74c976f08eb333cd29db85f69ba5c36 files/syslog-ng.rc6 1615 RMD160 8cb414bc09c48fdb591320203947035f9c32e968 files/syslog-ng.rc6 1615 SHA256 d4e574597148ae1b7009a9bc14df97c0b7b05e54f61619607e532984b5903b73 files/syslog-ng.rc6 1615 -AUX syslog-ng.rc6-r1 1761 RMD160 69b9680782bad056d21b99cbf2df3218cc44889c SHA1 d3c55347c989ef31465b5a673695fc4a84222990 SHA256 b7ac98e3eb3eadb2ad797a2028d99d50ebd70ed99f8c7baaf006c86ae76468a9 -MD5 b13273b95d83a027295d0793d442da26 files/syslog-ng.rc6-r1 1761 -RMD160 69b9680782bad056d21b99cbf2df3218cc44889c files/syslog-ng.rc6-r1 1761 -SHA256 b7ac98e3eb3eadb2ad797a2028d99d50ebd70ed99f8c7baaf006c86ae76468a9 files/syslog-ng.rc6-r1 1761 +AUX syslog-ng.rc6-r1 1777 RMD160 e257f249a43dd79a5451ab918dfb2c678069c78b SHA1 11b5984adb1d62056aafb97a9f1cd0c32715d8a6 SHA256 45f791f624e2be8ca86aa4d0419a25004b2ef7419ea64654756a3f3de1214144 +MD5 5cdb80d55345ac370968dd383c7dfac1 files/syslog-ng.rc6-r1 1777 +RMD160 e257f249a43dd79a5451ab918dfb2c678069c78b files/syslog-ng.rc6-r1 1777 +SHA256 45f791f624e2be8ca86aa4d0419a25004b2ef7419ea64654756a3f3de1214144 files/syslog-ng.rc6-r1 1777 DIST syslog-ng-1.6.11.tar.gz 712166 RMD160 2ddd5eaae12dbcef4b4e67f83d01a3bab8b2cce0 SHA1 acbee602fd4cb6a1ca40238742642413cd6f1787 SHA256 dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093 DIST syslog-ng-1.6.12.tar.gz 717903 RMD160 b7a091bd2e6cfa1fd6eea50aee2ef016e8df6c40 SHA1 02bf683cd96f0ec213992a41835af04afb1a4ab7 SHA256 4f46f8ba0e96b3fa7657c84fbef104027c8c713d482fbd6357fc21be3768ae6c DIST syslog-ng-1.6.9.tar.gz 765341 RMD160 5220ee5b0859974cdf7e86fd884c1505f91228c6 SHA1 d9e92a9a82fdd5aa4642f0f6b1d164005c91f6f3 SHA256 e7f2d6dbeae17c14245cd20e9893d0144b969d98a29c230d4e8a0c9cc0f7dde9 @@ -34,6 +34,10 @@ EBUILD syslog-ng-1.6.11-r1.ebuild 1936 RMD160 7ca63adc2613ed97546de60a9e212f3388 MD5 8132657a66cd73c28d24252f7995774d syslog-ng-1.6.11-r1.ebuild 1936 RMD160 7ca63adc2613ed97546de60a9e212f33882ef841 syslog-ng-1.6.11-r1.ebuild 1936 SHA256 9da2d2f31c305cd5698edf142d6ecf97b5cbfc6a367c2fc71ad6a10c8d832b5b syslog-ng-1.6.11-r1.ebuild 1936 +EBUILD syslog-ng-1.6.12-r1.ebuild 1947 RMD160 6c8b34794a738ac70df29e097867e092718969e2 SHA1 68754a473e0f50685ebdae0069b615c21b5d5c43 SHA256 684d095b946ff574b46310bb4085b1582857e6c40497fbb31794d926382caf08 +MD5 67dd96251562ed018610ee132ad1730e syslog-ng-1.6.12-r1.ebuild 1947 +RMD160 6c8b34794a738ac70df29e097867e092718969e2 syslog-ng-1.6.12-r1.ebuild 1947 +SHA256 684d095b946ff574b46310bb4085b1582857e6c40497fbb31794d926382caf08 syslog-ng-1.6.12-r1.ebuild 1947 EBUILD syslog-ng-1.6.12.ebuild 1945 RMD160 8d486fd60dccbfd9d0fdcb14c602ad6f81203f5c SHA1 72596519ed8745d025f0dd2a25d92833ec8dc9a6 SHA256 9e4c94fc30eb0dca2cce9c69326f15c0113a43c561434b7d85a1c39b50f37cc5 MD5 09a003cc36e754efc22dac71b8584ab5 syslog-ng-1.6.12.ebuild 1945 RMD160 8d486fd60dccbfd9d0fdcb14c602ad6f81203f5c syslog-ng-1.6.12.ebuild 1945 @@ -46,10 +50,10 @@ EBUILD syslog-ng-2.0.2.ebuild 1954 RMD160 20bd42fa56547b8c1c3fd5abe8e68c2792ebc5 MD5 d5b628155158878bfcd3d3142bab3c43 syslog-ng-2.0.2.ebuild 1954 RMD160 20bd42fa56547b8c1c3fd5abe8e68c2792ebc548 syslog-ng-2.0.2.ebuild 1954 SHA256 97f4597d0b66e5b69cf6916b1a9046a6ccbb2164d032bcd39b907364c299f568 syslog-ng-2.0.2.ebuild 1954 -MISC ChangeLog 19888 RMD160 c7e6895de8e02106be6c05f557f94e6668ae67f8 SHA1 ca87ca25774c87486529f7a8a6301c693adfeda8 SHA256 948eb189338c6e54b5534e5f97af3bcab0972eb0305d0c5e7f1ad021607497b5 -MD5 40a661f09b2927e82d5de5d0b48a0486 ChangeLog 19888 -RMD160 c7e6895de8e02106be6c05f557f94e6668ae67f8 ChangeLog 19888 -SHA256 948eb189338c6e54b5534e5f97af3bcab0972eb0305d0c5e7f1ad021607497b5 ChangeLog 19888 +MISC ChangeLog 20072 RMD160 df9e53ec9a984c9589ae1df1bfc0f798ede10342 SHA1 507356df85fd66539e7e73b972cd84137948cf86 SHA256 2587e9874ae7bb2c7c19323c76ec7071141ea74ae1fc7e37c0f871fc0e7eb5c8 +MD5 9d74e9a745b56eb65d324692ef625e0b ChangeLog 20072 +RMD160 df9e53ec9a984c9589ae1df1bfc0f798ede10342 ChangeLog 20072 +SHA256 2587e9874ae7bb2c7c19323c76ec7071141ea74ae1fc7e37c0f871fc0e7eb5c8 ChangeLog 20072 MISC metadata.xml 255 RMD160 53f4041a04a683c1e6380721a5207730d986491f SHA1 6321fb4f7568a7f34494c3b8296c7c4d656a8dde SHA256 dbf6d5b64056da60b0e445af0dadc10592b84ed97e38b9c95acb9d723dcc98a3 MD5 ac145feedb4b5bc6a7ea80d08994c5aa metadata.xml 255 RMD160 53f4041a04a683c1e6380721a5207730d986491f metadata.xml 255 @@ -60,6 +64,9 @@ SHA256 80d13b2ee1f29d4b225e45aa097120679652e3ffd50863761bfa95bbc4484117 files/di MD5 7de326f1b31690d03bbb64217210c6bb files/digest-syslog-ng-1.6.12 250 RMD160 361ca27384b19801b2165e56b73d1a94d588c250 files/digest-syslog-ng-1.6.12 250 SHA256 1730a039e0126575f8c675e42aac189274a9927b33c0993eadc6c330283310c7 files/digest-syslog-ng-1.6.12 250 +MD5 7de326f1b31690d03bbb64217210c6bb files/digest-syslog-ng-1.6.12-r1 250 +RMD160 361ca27384b19801b2165e56b73d1a94d588c250 files/digest-syslog-ng-1.6.12-r1 250 +SHA256 1730a039e0126575f8c675e42aac189274a9927b33c0993eadc6c330283310c7 files/digest-syslog-ng-1.6.12-r1 250 MD5 b481e7ac2702faefd67cf6266d9c6a5b files/digest-syslog-ng-1.6.9 247 RMD160 b5be057a8fd361d942d01fe19d7af4cbf95deadc files/digest-syslog-ng-1.6.9 247 SHA256 138e95860913ab20fa8c785e48308d51bb6448136f24e60f0ffd35ff489fb853 files/digest-syslog-ng-1.6.9 247 diff --git a/app-admin/syslog-ng/files/digest-syslog-ng-1.6.12-r1 b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.12-r1 new file mode 100644 index 000000000000..3b3b64d69b2b --- /dev/null +++ b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.12-r1 @@ -0,0 +1,3 @@ +MD5 a3cbfdb6e1e5beea181a7349749719f3 syslog-ng-1.6.12.tar.gz 717903 +RMD160 b7a091bd2e6cfa1fd6eea50aee2ef016e8df6c40 syslog-ng-1.6.12.tar.gz 717903 +SHA256 4f46f8ba0e96b3fa7657c84fbef104027c8c713d482fbd6357fc21be3768ae6c syslog-ng-1.6.12.tar.gz 717903 diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6-r1 b/app-admin/syslog-ng/files/syslog-ng.rc6-r1 index 54f74c72e8ef..a3026104cef3 100644 --- a/app-admin/syslog-ng/files/syslog-ng.rc6-r1 +++ b/app-admin/syslog-ng/files/syslog-ng.rc6-r1 @@ -1,9 +1,9 @@ #!/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.2 2007/01/15 15:39:25 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6-r1,v 1.3 2007/03/14 09:56:00 uberlord Exp $ -opts="depend checkconfig start stop reload" +opts="checkconfig reload" depend() { # Make networking dependency conditional on configuration @@ -26,13 +26,13 @@ checkconfig() { # 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)" + [ $? -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}" + [ -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" } @@ -51,6 +51,7 @@ reload() { fi checkconfig || return 1 ebegin "Reloading configuration and re-opening log files" - kill -HUP `cat /var/run/syslog-ng.pid` &>/dev/null + start-stop-daemon --stop --oknodo --signal HUP \ + --pidfile /var/run/syslog-ng.pid eend $? } diff --git a/app-admin/syslog-ng/syslog-ng-1.6.12-r1.ebuild b/app-admin/syslog-ng/syslog-ng-1.6.12-r1.ebuild new file mode 100644 index 000000000000..9af0d0b1e640 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-1.6.12-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2007 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.12-r1.ebuild,v 1.1 2007/03/14 09:56:00 uberlord 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-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=/usr/bin \ + $(use_enable static full-static) \ + $(use_enable tcpd tcp-wrapper) || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake 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 +}