Fix rc for bug #159786

Package-Manager: portage-2.1.1-r2

3 files changed, 16 insertions, 12 deletions

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 589e165ab6bf..12f464b42ee6 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/mrtg
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.60 2006/11/04 22:21:55 eroyf Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.61 2007/01/03 22:55:38 cedk Exp $
+
+  03 Jan 2007; Cedric Krier <cedk@gentoo.org> files/mrtg.rc:
+  Fix rc for bug #159786
 
   04 Nov 2006; Alexander H. Færøy <eroyf@gentoo.org> mrtg-2.14.5.ebuild:
   stable on alpha.
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index da9c7ea0b9ec..26819bfde25c 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -2,10 +2,10 @@ AUX mrtg.confd 512 RMD160 ad2824f21df0ecf864b53250b1e50912b1f17777 SHA1 b3248d27
 MD5 a8d246d324b90fd1e37cc912d4651372 files/mrtg.confd 512
 RMD160 ad2824f21df0ecf864b53250b1e50912b1f17777 files/mrtg.confd 512
 SHA256 fb929fd0e3658bc614f2ba51b9fba748050dbc76c0f1c0ac1bc233559bd2b4e7 files/mrtg.confd 512
-AUX mrtg.rc 1322 RMD160 25135addcd22b07163a6af2deb42fd72c39445f7 SHA1 0c9417fa364f3eba2a1ebf5f2ac2e0677b09c2f1 SHA256 a4ca79dae0e158e17828a58ed7609cb2d4e09bbc7f0243980aac4a48b0390ae8
-MD5 241f78c774f4dad22beee79906e14460 files/mrtg.rc 1322
-RMD160 25135addcd22b07163a6af2deb42fd72c39445f7 files/mrtg.rc 1322
-SHA256 a4ca79dae0e158e17828a58ed7609cb2d4e09bbc7f0243980aac4a48b0390ae8 files/mrtg.rc 1322
+AUX mrtg.rc 1380 RMD160 99f68fd47fab126827c598dd3b79ce0e868ef48b SHA1 f93b5ef2943b2380384e37917b518b7c8878a7f9 SHA256 75c720a44afda19e69cb4dbb2106776347291608fc7733213a46c00c26c85aa2
+MD5 65f611e90211c1c1e7fc23192e8deb9b files/mrtg.rc 1380
+RMD160 99f68fd47fab126827c598dd3b79ce0e868ef48b files/mrtg.rc 1380
+SHA256 75c720a44afda19e69cb4dbb2106776347291608fc7733213a46c00c26c85aa2 files/mrtg.rc 1380
 DIST mrtg-2.11.1.tar.gz 1118175 RMD160 665ee0e49de26753a3a771a30ad1e19f1c57a7a0 SHA1 cc682e23db63696b83438a0ee21d0718f04104cb SHA256 84221a9e0eab99fd382af5da06985c011c1b5029db2f43ac7b1eba98c8b2d8d1
 DIST mrtg-2.14.5.tar.gz 1100574 RMD160 08597e98a555c5e7dc8e2e3eca23fedf2fbef487 SHA1 2c9fe80a50e0611516122c2b95b028c39b735cec SHA256 8274d440165d3b6d6daaf976a9b240d311184f7fa86cd1b3a72b39834bc949f1
 DIST mrtg-2.14.7.tar.gz 1061341 RMD160 e7c57aaef0160ef3a1144e2f9f9720c483192c65 SHA1 dd97dfb75dffe0c4abfabb26c73951641994ffc5 SHA256 5e82446a6b2b4c334771d3ac49b9f45f5c0188eaa300d7b612fe87915056ef57
@@ -21,10 +21,10 @@ EBUILD mrtg-2.14.7.ebuild 966 RMD160 90086d6f32dc44e27f7c7ca902f06b62c9bc4c42 SH
 MD5 0baae54d43e9a22626ce028bdc099634 mrtg-2.14.7.ebuild 966
 RMD160 90086d6f32dc44e27f7c7ca902f06b62c9bc4c42 mrtg-2.14.7.ebuild 966
 SHA256 2ad7fe183a090cb1ea0189909d8b2f2da347216d9c0c04732a2902f7b7b3e230 mrtg-2.14.7.ebuild 966
-MISC ChangeLog 7779 RMD160 c35724436a9666040a86ff78ef51782b97aa09a2 SHA1 be8fac552dbed7c42e951df8ac7caa70a3f884bc SHA256 455f52727ca9aa048a04bf8708b63545d790597fc02f948b828bac93d695efc8
-MD5 e0090ef42c0540b6d8b7c39047d3a4f3 ChangeLog 7779
-RMD160 c35724436a9666040a86ff78ef51782b97aa09a2 ChangeLog 7779
-SHA256 455f52727ca9aa048a04bf8708b63545d790597fc02f948b828bac93d695efc8 ChangeLog 7779
+MISC ChangeLog 7865 RMD160 77899e7be96ee6b9efca2658f9f4e0c82e29a33f SHA1 19431d75e1f77d26c639fa299691d07b41529b34 SHA256 b131bb1e14a7646ebf7d207aea0ac7467df248a97dee0338414738ec79aa2558
+MD5 4def60987adffb7cc9fb319cccef6f68 ChangeLog 7865
+RMD160 77899e7be96ee6b9efca2658f9f4e0c82e29a33f ChangeLog 7865
+SHA256 b131bb1e14a7646ebf7d207aea0ac7467df248a97dee0338414738ec79aa2558 ChangeLog 7865
 MISC metadata.xml 221 RMD160 6a612dbdb85b7cbc15a4f4924fc62b435900bee4 SHA1 59ce39c64900516f7d583951daacb16fc01f0ea1 SHA256 80bafe9d61de4580c061d796ca9c244633349b7a6da85aeae6e11bbaad597110
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
 RMD160 6a612dbdb85b7cbc15a4f4924fc62b435900bee4 metadata.xml 221
diff --git a/net-analyzer/mrtg/files/mrtg.rc b/net-analyzer/mrtg/files/mrtg.rc
index ef7e573d50a4..e4c7f16c2ea3 100644
--- a/net-analyzer/mrtg/files/mrtg.rc
+++ b/net-analyzer/mrtg/files/mrtg.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.4 2006/05/11 11:03:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.5 2007/01/03 22:55:38 cedk Exp $
 
 depend() {
     need net
@@ -22,7 +22,8 @@ checkconfig() {
 
 start() {
 	# mrtg will not run if LANG=*utf8
-	[[ "${LANG}" =~ '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$' ]] \
+	# use grep instead of bash regexp for bug #159786
+	[[ "$(echo $LANG|grep -v -e '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$')" ]] \
 	&& LANG='C'
 
 	checkconfig || return $?