From 36295e847b3b87274ef6a2d3d7321a567d704451 Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Tue, 14 Dec 2004 23:16:47 +0000 Subject: Fix syslog-ng.conf net dependency again #74428 --- app-admin/syslog-ng/ChangeLog | 8 ++- app-admin/syslog-ng/Manifest | 13 ++--- .../syslog-ng/files/digest-syslog-ng-1.6.5-r1 | 1 - .../syslog-ng/files/digest-syslog-ng-1.6.5-r2 | 1 + app-admin/syslog-ng/files/syslog-ng.rc6 | 4 +- app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild | 57 ---------------------- app-admin/syslog-ng/syslog-ng-1.6.5-r2.ebuild | 57 ++++++++++++++++++++++ 7 files changed, 74 insertions(+), 67 deletions(-) delete mode 100644 app-admin/syslog-ng/files/digest-syslog-ng-1.6.5-r1 create mode 100644 app-admin/syslog-ng/files/digest-syslog-ng-1.6.5-r2 delete mode 100644 app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild create mode 100644 app-admin/syslog-ng/syslog-ng-1.6.5-r2.ebuild (limited to 'app-admin') diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog index c2499ecddc29..307c9b75aa09 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-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.75 2004/12/02 06:33:35 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.76 2004/12/14 23:16:47 agriffis Exp $ + +*syslog-ng-1.6.5-r2 (14 Dec 2004) + + 14 Dec 2004; Aron Griffis files/syslog-ng.rc6, + -syslog-ng-1.6.5-r1.ebuild, +syslog-ng-1.6.5-r2.ebuild: + Fix syslog-ng.conf net dependency again #74428 01 Dec 2004; Michael Sterrett -files/syslog-ng.conf.sample, syslog-ng-1.6.5-r1.ebuild: diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 44adcff61328..37142efd1283 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,8 +1,9 @@ -MD5 1674964b30df0d1bb562a831bc6e0981 ChangeLog 11354 -MD5 c99708e3630ff4fea73915f8bb235fc8 syslog-ng-1.6.5-r1.ebuild 1661 +MD5 0cb1f3d0bf9e2127e623d07d2c2a8d53 ChangeLog 11568 MD5 06a2fa1e0308f065f818db6fae959fe9 metadata.xml 257 -MD5 5b474be9a74bb0c72edecc60ed7f0309 files/syslog-ng.conf.debian 5444 -MD5 ec03b691f321f282bc875862b147922c files/syslog-ng.conf.gentoo 1068 -MD5 fe66a527c7f36a560197b4187ad6d9db files/syslog-ng.logrotate 342 -MD5 df8c4758a11ded9f1bfed606f821168b files/syslog-ng.rc6 1519 +MD5 c99708e3630ff4fea73915f8bb235fc8 syslog-ng-1.6.5-r2.ebuild 1661 MD5 ed7691a108eb1acf100c3a7c540de262 files/digest-syslog-ng-1.6.5-r1 67 +MD5 fe66a527c7f36a560197b4187ad6d9db files/syslog-ng.logrotate 342 +MD5 ec03b691f321f282bc875862b147922c files/syslog-ng.conf.gentoo 1068 +MD5 5b474be9a74bb0c72edecc60ed7f0309 files/syslog-ng.conf.debian 5444 +MD5 9b0031a7897a2b224a8c80f2b43e5221 files/syslog-ng.rc6 1527 +MD5 ed7691a108eb1acf100c3a7c540de262 files/digest-syslog-ng-1.6.5-r2 67 diff --git a/app-admin/syslog-ng/files/digest-syslog-ng-1.6.5-r1 b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.5-r1 deleted file mode 100644 index 22be901fc672..000000000000 --- a/app-admin/syslog-ng/files/digest-syslog-ng-1.6.5-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 ce70b4230e73ad79191618530c8c3a72 syslog-ng-1.6.5.tar.gz 396947 diff --git a/app-admin/syslog-ng/files/digest-syslog-ng-1.6.5-r2 b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.5-r2 new file mode 100644 index 000000000000..22be901fc672 --- /dev/null +++ b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.5-r2 @@ -0,0 +1 @@ +MD5 ce70b4230e73ad79191618530c8c3a72 syslog-ng-1.6.5.tar.gz 396947 diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6 b/app-admin/syslog-ng/files/syslog-ng.rc6 index c5852dcfc1a5..5b9609b7366f 100644 --- a/app-admin/syslog-ng/files/syslog-ng.rc6 +++ b/app-admin/syslog-ng/files/syslog-ng.rc6 @@ -1,14 +1,14 @@ #!/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,v 1.16 2004/09/29 03:00:09 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.17 2004/12/14 23:16:47 agriffis 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) + *source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*) need net ;; esac diff --git a/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild b/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild deleted file mode 100644 index 3801f2e7f360..000000000000 --- a/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# 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/syslog-ng-1.6.5-r1.ebuild,v 1.9 2004/12/02 06:33:35 mr_bones_ Exp $ - -inherit flag-o-matic - -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 hppa ia64 mips ppc ppc64 s390 sparc x86" -IUSE="static tcpd" - -RDEPEND=">=dev-libs/libol-0.3.14 - 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}/doc/sgml" - tar xzf syslog-ng.html.tar.gz -} - -src_compile() { - use static && append-ldflags -static - LDFLAGS="${LDFLAGS}" \ - econf \ - $(use_enable tcpd tcp-wrapper) || die "econf failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - prepallman - - dodoc AUTHORS ChangeLog INSTALL NEWS PORTS README \ - doc/{syslog-ng.conf.sample,syslog-ng.conf.demo,stresstest.sh} \ - doc/sgml/{syslog-ng.dvi,syslog-ng.ps,syslog-ng.sgml,syslog-ng.txt} \ - contrib/syslog2ng "${FILESDIR}/syslog-ng.conf.debian" - dohtml doc/sgml/syslog-ng.html/* - - # Install default configuration - insinto /etc/syslog-ng - newins "${FILESDIR}/syslog-ng.conf.gentoo" syslog-ng.conf - - # 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" syslog-ng -} diff --git a/app-admin/syslog-ng/syslog-ng-1.6.5-r2.ebuild b/app-admin/syslog-ng/syslog-ng-1.6.5-r2.ebuild new file mode 100644 index 000000000000..7b437f62f582 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-1.6.5-r2.ebuild @@ -0,0 +1,57 @@ +# 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/syslog-ng-1.6.5-r2.ebuild,v 1.1 2004/12/14 23:16:47 agriffis Exp $ + +inherit flag-o-matic + +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 hppa ia64 mips ppc ppc64 s390 sparc x86" +IUSE="static tcpd" + +RDEPEND=">=dev-libs/libol-0.3.14 + 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}/doc/sgml" + tar xzf syslog-ng.html.tar.gz +} + +src_compile() { + use static && append-ldflags -static + LDFLAGS="${LDFLAGS}" \ + econf \ + $(use_enable tcpd tcp-wrapper) || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + prepallman + + dodoc AUTHORS ChangeLog INSTALL NEWS PORTS README \ + doc/{syslog-ng.conf.sample,syslog-ng.conf.demo,stresstest.sh} \ + doc/sgml/{syslog-ng.dvi,syslog-ng.ps,syslog-ng.sgml,syslog-ng.txt} \ + contrib/syslog2ng "${FILESDIR}/syslog-ng.conf.debian" + dohtml doc/sgml/syslog-ng.html/* + + # Install default configuration + insinto /etc/syslog-ng + newins "${FILESDIR}/syslog-ng.conf.gentoo" syslog-ng.conf + + # 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" syslog-ng +} -- cgit v1.2.3-65-gdbad