Don't use xargs to concatenate lines; it breaks on uneven quoting #65520

5 files changed, 20 insertions, 14 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 91bebc4151c2..0c400712934c 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,10 @@
 # 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.67 2004/09/25 12:55:31 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.68 2004/09/29 03:00:09 agriffis Exp $
+
+  28 Sep 2004; Aron Griffis <agriffis@gentoo.org> files/syslog-ng.rc6,
+  -syslog-ng-1.6.5.ebuild:
+  Don't use xargs to concatenate lines; it breaks on uneven quoting #65520
 
   25 Sep 2004; Jason Wever <weeve@gentoo.org> syslog-ng-1.6.5.ebuild:
   Stable on sparc.
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 06222c4b54d0..ce23eef51cbf 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,14 +1,14 @@
-MD5 b1640173e67d13ef6a55baea7fb27d01 ChangeLog 10321
-MD5 06a2fa1e0308f065f818db6fae959fe9 metadata.xml 257
 MD5 1e59718f4b92bd26d38b9fd9834734a9 syslog-ng-1.6.0_rc3-r1.ebuild 2087
+MD5 b34e6dcaa98fae649615c8b8191a1c64 syslog-ng-1.6.5-r1.ebuild 1622
 MD5 589e3519209fd75963d4de420dfa7b78 syslog-ng-1.6.2.ebuild 1766
+MD5 1604adde678167aceb7c5cd52c6c949f ChangeLog 10498
+MD5 06a2fa1e0308f065f818db6fae959fe9 metadata.xml 257
 MD5 70bb2d5dfd0b8e1cdf52395aa51efdbc syslog-ng-1.6.4.ebuild 1613
-MD5 ecd9f861422f5d86884155f1bf41b70e syslog-ng-1.6.5.ebuild 1616
-MD5 2f74ad6ee4a5100535a90c156a866ecd files/digest-syslog-ng-1.6.0_rc3-r1 70
-MD5 b48d452f2ef894e02ff2b247086944d6 files/digest-syslog-ng-1.6.2 67
-MD5 ec03b691f321f282bc875862b147922c files/syslog-ng.conf.gentoo 1068
 MD5 f0f2cd6e0951bc82d74c7f92c4e3b417 files/syslog-ng.conf.sample 3735
-MD5 fe66a527c7f36a560197b4187ad6d9db files/syslog-ng.logrotate 342
-MD5 a21cc09cdd47f1858cc9e11c5d9cab33 files/syslog-ng.rc6 1498
+MD5 b48d452f2ef894e02ff2b247086944d6 files/digest-syslog-ng-1.6.2 67
 MD5 d55e983790598d0428f0a439bd098d09 files/digest-syslog-ng-1.6.4 67
-MD5 ed7691a108eb1acf100c3a7c540de262 files/digest-syslog-ng-1.6.5 67
+MD5 ed7691a108eb1acf100c3a7c540de262 files/digest-syslog-ng-1.6.5-r1 67
+MD5 2f74ad6ee4a5100535a90c156a866ecd files/digest-syslog-ng-1.6.0_rc3-r1 70
+MD5 df8c4758a11ded9f1bfed606f821168b files/syslog-ng.rc6 1519
+MD5 fe66a527c7f36a560197b4187ad6d9db files/syslog-ng.logrotate 342
+MD5 ec03b691f321f282bc875862b147922c files/syslog-ng.conf.gentoo 1068
diff --git a/app-admin/syslog-ng/files/digest-syslog-ng-1.6.5 b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.5-r1
index 22be901fc672..22be901fc672 100644
--- a/app-admin/syslog-ng/files/digest-syslog-ng-1.6.5
+++ b/app-admin/syslog-ng/files/digest-syslog-ng-1.6.5-r1
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6 b/app-admin/syslog-ng/files/syslog-ng.rc6
index 376f950057b5..c5852dcfc1a5 100644
--- a/app-admin/syslog-ng/files/syslog-ng.rc6
+++ b/app-admin/syslog-ng/files/syslog-ng.rc6
@@ -1,14 +1,16 @@
 #!/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.15 2004/08/18 16:42:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.16 2004/09/29 03:00:09 agriffis Exp $
 
 opts="depend checkconfig start stop reload"
 
 depend() {
 	# Make networking dependency conditional on configuration
-	sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf | xargs | \
-	grep -Eq '(source|destination).*(tcp|udp)' && need net
+	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
diff --git a/app-admin/syslog-ng/syslog-ng-1.6.5.ebuild b/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild
index f3ada1d0525d..18851280bd92 100644
--- a/app-admin/syslog-ng/syslog-ng-1.6.5.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.4 2004/09/25 12:55:31 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild,v 1.1 2004/09/29 03:00:09 agriffis Exp $
 
 inherit flag-o-matic