Fix bug 38475 by adding conditional dep on network in initscript. Didn't bump the rev since I don't think a lot of people care about this change. Also bumped the version to 1.6.2 for testing.

6 files changed, 90 insertions, 12 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 5bb3b732a35d..e9aca6989b43 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/syslog-ng
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.45 2004/01/05 05:08:09 brad_mssw Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.46 2004/02/15 01:11:37 agriffis Exp $
+
+*syslog-ng-1.6.2 (14 Feb 2004)
+
+  14 Feb 2004; Aron Griffis <agriffis@gentoo.org> syslog-ng-1.6.2.ebuild,
+  files/syslog-ng.rc6:
+  Fix bug 38475 by adding conditional dep on network in initscript. Didn't bump
+  the rev since I don't think a lot of people care about this change. Also
+  bumped the version to 1.6.2 for testing.
 
   05 Jan 2004; Brad House <brad_mssw@gentoo.org>
   syslog-ng-1.6.0_rc3-r1.ebuild:
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 2f32cdd94f81..fc73fd59215e 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,12 +1,15 @@
-MD5 01b00adc1ceeabb20c09a5fb3155b0c9 ChangeLog 7791
+MD5 1373ca2977791a71b603f97977d02eeb syslog-ng-1.6.0_rc3-r1.ebuild 2091
 MD5 e842163b9f78e2bbb688e5b30e5d932e syslog-ng-1.4.16-r2.ebuild 1297
 MD5 8a3a61ae58c2eca6eee2dbc6d4830f6c syslog-ng-1.6.0_rc1-r2.ebuild 2069
-MD5 1373ca2977791a71b603f97977d02eeb syslog-ng-1.6.0_rc3-r1.ebuild 2091
+MD5 c0e6f023dc318550de12470e62fc2bef syslog-ng-1.6.2.ebuild 1835
+MD5 01b00adc1ceeabb20c09a5fb3155b0c9 ChangeLog 7791
 MD5 06a2fa1e0308f065f818db6fae959fe9 metadata.xml 257
-MD5 839ff13317bf86060c90e4d870c68ea4 files/digest-syslog-ng-1.4.16-r2 68
+MD5 1373ca2977791a71b603f97977d02eeb syslog-ng-1.6.0_rc3-r2.ebuild 2091
+MD5 e8a440e8948386dfd73e6844897d16d8 files/syslog-ng.conf.sample 3731
+MD5 b48d452f2ef894e02ff2b247086944d6 files/digest-syslog-ng-1.6.2 67
 MD5 50d7756f32c32672482ecf192dd69ce3 files/digest-syslog-ng-1.6.0_rc1-r2 70
 MD5 2f74ad6ee4a5100535a90c156a866ecd files/digest-syslog-ng-1.6.0_rc3-r1 70
-MD5 3616c4aa203d3e3f1fd54c773213ff9f files/syslog-ng.conf.gentoo 1066
-MD5 e8a440e8948386dfd73e6844897d16d8 files/syslog-ng.conf.sample 3731
+MD5 839ff13317bf86060c90e4d870c68ea4 files/digest-syslog-ng-1.4.16-r2 68
+MD5 548f20e31b0441b7c455f861ca4eb3c3 files/syslog-ng.rc6 1388
 MD5 581c44e616907a96e8dbebde1def848d files/syslog-ng.logrotate 340
-MD5 18cdd4fe0da2cc59abe6f22363e0be69 files/syslog-ng.rc6 1208
+MD5 3616c4aa203d3e3f1fd54c773213ff9f files/syslog-ng.conf.gentoo 1066
diff --git a/app-admin/syslog-ng/files/digest-syslog-ng-1.6.2 b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.2
new file mode 100644
index 000000000000..240a71056f96
--- /dev/null
+++ b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.2
@@ -0,0 +1 @@
+MD5 c84bf2b80bc44a5716c9c20402c85eaf syslog-ng-1.6.2.tar.gz 306150
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6 b/app-admin/syslog-ng/files/syslog-ng.rc6
index 910111a6a299..aa71147eb96d 100644
--- a/app-admin/syslog-ng/files/syslog-ng.rc6
+++ b/app-admin/syslog-ng/files/syslog-ng.rc6
@@ -1,11 +1,15 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.11 2004/02/13 19:09:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.12 2004/02/15 01:11:37 agriffis Exp $
 
 opts="depend checkconfig start stop reload"
 
 depend() {
+	# make networking dependency conditional on configuration
+	sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf | \
+	grep -Eq '(source|destination).*(tcp|udp)' && need net
+
 	need clock hostname
 	provide logger
 }
diff --git a/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild b/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild
index 9cc0db753cad..c468a04f2bb1 100644
--- a/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild,v 1.9 2004/01/05 05:08:09 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild,v 1.10 2004/02/15 01:11:37 agriffis Exp $
 
 IUSE="tcpd"
 # The release candidates are named syslog-ng-1.6.0rc1 for example
@@ -14,9 +14,10 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc alpha hppa mips amd64 ia64 ppc64"
 
-DEPEND=">=dev-libs/libol-0.3.9
-	sys-devel/flex
+RDEPEND=">=dev-libs/libol-0.3.9
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
 
 PROVIDE="virtual/logger"
 
diff --git a/app-admin/syslog-ng/syslog-ng-1.6.2.ebuild b/app-admin/syslog-ng/syslog-ng-1.6.2.ebuild
new file mode 100644
index 000000000000..1ed07761cfad
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-1.6.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.6.2.ebuild,v 1.1 2004/02/15 01:11:37 agriffis Exp $
+
+IUSE="tcpd"
+# The release candidates are named syslog-ng-1.6.0rc1 for example
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="syslog replacement with advanced filtering features"
+SRC_URI="http://www.balabit.com/downloads/syslog-ng/${PV%.*}/src/${MY_P}.tar.gz"
+HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64"
+
+# I don't know if 0.3.13 is really required but why not?  It's the
+# current version and I don't know if 0.3.9 is new enough.  
+# (14 Feb 2004 agriffis)
+RDEPEND=">=dev-libs/libol-0.3.13
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+PROVIDE="virtual/logger"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/doc/sgml
+	tar xzf syslog-ng.html.tar.gz
+}
+
+src_compile() {
+	local myconf="$(use_enable tcpd tcp-wrapper)"
+	econf ${myconf} || die "econf failed"
+	emake prefix=${D}/usr all || die "emake failed"
+}
+
+src_install() {
+	einstall || die
+
+	prepallman
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS PORTS README
+	dodoc doc/{syslog-ng.conf.sample,syslog-ng.conf.demo,stresstest.sh}
+	dodoc doc/sgml/{syslog-ng.dvi,syslog-ng.ps,syslog-ng.sgml,syslog-ng.txt}
+	dodoc contrib/syslog2ng
+	dohtml doc/sgml/syslog-ng.html/*
+
+	# Install default configuration
+	dodir /etc/syslog-ng
+	insinto /etc/syslog-ng
+	newins ${FILESDIR}/syslog-ng.conf.gentoo syslog-ng.conf
+
+	# Install snippet for logrotate, which may or may not be installed
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins ${FILESDIR}/syslog-ng.logrotate syslog-ng
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/syslog-ng.rc6 syslog-ng
+}