Add log prefix patch from bug 115515.

Package-Manager: portage-2.0.53

5 files changed, 30 insertions, 8 deletions

diff --git a/net-firewall/kmyfirewall/ChangeLog b/net-firewall/kmyfirewall/ChangeLog
index 064973e13791..ad4458055e18 100644
--- a/net-firewall/kmyfirewall/ChangeLog
+++ b/net-firewall/kmyfirewall/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/kmyfirewall
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/kmyfirewall/ChangeLog,v 1.25 2005/12/13 02:16:09 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/kmyfirewall/ChangeLog,v 1.26 2005/12/15 19:33:39 vanquirius Exp $
+
+*kmyfirewall-1.0-r2 (15 Dec 2005)
+
+  15 Dec 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/kmyfirewall-1.0-logprefix.diff, -kmyfirewall-1.0-r1.ebuild,
+  +kmyfirewall-1.0-r2.ebuild:
+  Add log prefix patch from bug 115515. Thanks to Matteo Azzali <matte dot az
+  at libero dot it>.
 
 *kmyfirewall-1.0-r1 (13 Dec 2005)
 
diff --git a/net-firewall/kmyfirewall/Manifest b/net-firewall/kmyfirewall/Manifest
index 1a40f20028f9..c33bbd17ce1b 100644
--- a/net-firewall/kmyfirewall/Manifest
+++ b/net-firewall/kmyfirewall/Manifest
@@ -1,8 +1,9 @@
-MD5 d691f7287dd05e5b84318e0f701b1b46 ChangeLog 5718
+MD5 c5658af71d6abce1300d603e89ce98e0 ChangeLog 6009
 MD5 a0940eb3f5939500bee4e738121dcb58 files/digest-kmyfirewall-0.9.6.2-r1 72
-MD5 64e05fa9eea935f51b863f14f1df89e9 files/digest-kmyfirewall-1.0-r1 69
+MD5 64e05fa9eea935f51b863f14f1df89e9 files/digest-kmyfirewall-1.0-r2 69
 MD5 80cc54abedc0473d0a3d399fdd43467a files/kmyfirewall-0.9.6.2-configure-arts.patch 3478
+MD5 e8a356fd4f71fc395c22bd89fb8a9347 files/kmyfirewall-1.0-logprefix.diff 495
 MD5 0f7cb84fcc791f920007ddf271e2a36d files/kmyfirewall-1.0_gentoo_multiport.diff 1820
 MD5 5a0451e37dbdd06bdde83c33ce1c2877 kmyfirewall-0.9.6.2-r1.ebuild 696
-MD5 e8a8fe2e491a7f47bd6a176a7f5017ee kmyfirewall-1.0-r1.ebuild 848
+MD5 37effcc0e0d706d45e1c096907134795 kmyfirewall-1.0-r2.ebuild 905
 MD5 51d7efd5419c5c86fff22e7335f45585 metadata.xml 542
diff --git a/net-firewall/kmyfirewall/files/digest-kmyfirewall-1.0-r1 b/net-firewall/kmyfirewall/files/digest-kmyfirewall-1.0-r2
index 23584f8e7974..23584f8e7974 100644
--- a/net-firewall/kmyfirewall/files/digest-kmyfirewall-1.0-r1
+++ b/net-firewall/kmyfirewall/files/digest-kmyfirewall-1.0-r2
diff --git a/net-firewall/kmyfirewall/files/kmyfirewall-1.0-logprefix.diff b/net-firewall/kmyfirewall/files/kmyfirewall-1.0-logprefix.diff
new file mode 100644
index 000000000000..b3f7bdb58879
--- /dev/null
+++ b/net-firewall/kmyfirewall/files/kmyfirewall-1.0-logprefix.diff
@@ -0,0 +1,12 @@
+diff -ruN kmyfirewall-1.0_old/kmyfirewall/core/iptchain.cpp kmyfirewall-1.0/kmyfirewall/core/iptchain.cpp
+--- kmyfirewall-1.0_old/kmyfirewall/core/iptchain.cpp	2005-12-13 15:52:51.000000000 +0100
++++ kmyfirewall-1.0/kmyfirewall/core/iptchain.cpp	2005-12-11 13:37:53.000000000 +0100
+@@ -432,7 +432,7 @@
+ 
+ 			log_prefix = curr.toElement().attribute( "prefix" );
+ 			if( !log_prefix.isEmpty() )
++				m_log_prefix = log_prefix;
+-				m_log_prefix = log_burst;
+ 		}
+ 		curr = curr.nextSibling();
+ 	}
diff --git a/net-firewall/kmyfirewall/kmyfirewall-1.0-r1.ebuild b/net-firewall/kmyfirewall/kmyfirewall-1.0-r2.ebuild
index b8cc1973bf5e..4a2e798dd417 100644
--- a/net-firewall/kmyfirewall/kmyfirewall-1.0-r1.ebuild
+++ b/net-firewall/kmyfirewall/kmyfirewall-1.0-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/kmyfirewall/kmyfirewall-1.0-r1.ebuild,v 1.1 2005/12/13 02:16:09 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/kmyfirewall/kmyfirewall-1.0-r2.ebuild,v 1.1 2005/12/15 19:33:39 vanquirius Exp $
 
 inherit kde eutils
 
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Graphical KDE iptables configuration tool"
 HOMEPAGE="http://kmyfirewall.sourceforge.net/"
@@ -25,4 +25,5 @@ src_unpack() {
 	echo -e "[PATHS]\nDistribution=gentoo\nIPTPath=${ROOT}sbin/iptables\nModprobePath=${ROOT}sbin/modprobe\nrcDefaultPath=${ROOT}etc/runlevels/default/" >> ${S}/kmyfirewall/kmyfirewallrc
 
 	epatch "${FILESDIR}/kmyfirewall-1.0_gentoo_multiport.diff"
-}
\ No newline at end of file
+	epatch "${FILESDIR}/${PN}-1.0-logprefix.diff"
+}