multiport rule fix

Package-Manager: portage-2.0.53

6 files changed, 52 insertions, 97 deletions

diff --git a/net-firewall/kmyfirewall/ChangeLog b/net-firewall/kmyfirewall/ChangeLog
index 92fe13e2f433..064973e13791 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.24 2005/12/12 18:24:25 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/kmyfirewall/ChangeLog,v 1.25 2005/12/13 02:16:09 carlo Exp $
+
+*kmyfirewall-1.0-r1 (13 Dec 2005)
+
+  13 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/kmyfirewall-1.0-configure-arts.patch,
+  +files/kmyfirewall-1.0_gentoo_multiport.diff, -kmyfirewall-1.0.ebuild,
+  +kmyfirewall-1.0-r1.ebuild:
+  multiport rule fix, thanks to Matteo Azzali #115355
 
 *kmyfirewall-1.0 (12 Dec 2005)
 
diff --git a/net-firewall/kmyfirewall/Manifest b/net-firewall/kmyfirewall/Manifest
index 1b0a470f824b..1a40f20028f9 100644
--- a/net-firewall/kmyfirewall/Manifest
+++ b/net-firewall/kmyfirewall/Manifest
@@ -1,8 +1,8 @@
-MD5 a227df765e225eba0d2fa24e3ad40461 ChangeLog 5434
+MD5 d691f7287dd05e5b84318e0f701b1b46 ChangeLog 5718
 MD5 a0940eb3f5939500bee4e738121dcb58 files/digest-kmyfirewall-0.9.6.2-r1 72
-MD5 64e05fa9eea935f51b863f14f1df89e9 files/digest-kmyfirewall-1.0 69
+MD5 64e05fa9eea935f51b863f14f1df89e9 files/digest-kmyfirewall-1.0-r1 69
 MD5 80cc54abedc0473d0a3d399fdd43467a files/kmyfirewall-0.9.6.2-configure-arts.patch 3478
-MD5 ac0d68cae6984b245345483aebc8d6ac files/kmyfirewall-1.0-configure-arts.patch 2324
+MD5 0f7cb84fcc791f920007ddf271e2a36d files/kmyfirewall-1.0_gentoo_multiport.diff 1820
 MD5 5a0451e37dbdd06bdde83c33ce1c2877 kmyfirewall-0.9.6.2-r1.ebuild 696
-MD5 90b59f5a11e4f78850679719308468a1 kmyfirewall-1.0.ebuild 825
+MD5 e8a8fe2e491a7f47bd6a176a7f5017ee kmyfirewall-1.0-r1.ebuild 848
 MD5 51d7efd5419c5c86fff22e7335f45585 metadata.xml 542
diff --git a/net-firewall/kmyfirewall/files/digest-kmyfirewall-1.0 b/net-firewall/kmyfirewall/files/digest-kmyfirewall-1.0-r1
index 23584f8e7974..23584f8e7974 100644
--- a/net-firewall/kmyfirewall/files/digest-kmyfirewall-1.0
+++ b/net-firewall/kmyfirewall/files/digest-kmyfirewall-1.0-r1
diff --git a/net-firewall/kmyfirewall/files/kmyfirewall-1.0-configure-arts.patch b/net-firewall/kmyfirewall/files/kmyfirewall-1.0-configure-arts.patch
deleted file mode 100644
index 295394931b8b..000000000000
--- a/net-firewall/kmyfirewall/files/kmyfirewall-1.0-configure-arts.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --exclude='*~' -Naur kmyfirewall-1.0.orig/configure kmyfirewall-1.0/configure
---- kmyfirewall-1.0.orig/configure	2005-12-12 16:01:44.000000000 -0200
-+++ kmyfirewall-1.0/configure	2005-12-12 16:04:37.000000000 -0200
-@@ -31546,77 +31546,6 @@
- 
-         if test "$build_arts" '!=' "no"; then
- 
--   echo "$as_me:$LINENO: checking for mcopidl" >&5
--echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
--   if test -n "$MCOPIDL"; then
--        kde_cv_path="$MCOPIDL";
--   else
--        kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
--
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--        kde_cv_path="NONE"
--	kde_save_IFS=$IFS
--	IFS=':'
--	dirs=""
--	for dir in $PATH; do
--	  dirs="$dirs $dir"
--	done
--	if test -z ""; then  	  dirs="$kde_default_bindirs $dirs"
--        else  	  dirs="$dirs $kde_default_bindirs"
--	fi
--	IFS=$kde_save_IFS
--
--        for dir in $dirs; do
--	  if test -x "$dir/mcopidl"; then
--	    if test -n ""
--	    then
--              evalstr="$dir/mcopidl  2>&1 "
--	      if eval $evalstr; then
--                kde_cv_path="$dir/mcopidl"
--                break
--	      fi
--            else
--		kde_cv_path="$dir/mcopidl"
--                break
--	    fi
--          fi
--        done
--
--        eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
--      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
--   fi
--
--   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--
--    { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
--Please check whether you installed aRts correctly or use
----without-arts to compile without aRts support (this will remove functionality).
--" >&5
--echo "$as_me: error: The important program mcopidl was not found!
--Please check whether you installed aRts correctly or use
----without-arts to compile without aRts support (this will remove functionality).
--" >&2;}
--   { (exit 1); exit 1; }; }
--
--   else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
--      MCOPIDL=$kde_cv_path
--
--   fi
--
--
-    echo "$as_me:$LINENO: checking for artsc-config" >&5
- echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
-    if test -n "$ARTSCCONFIG"; then
diff --git a/net-firewall/kmyfirewall/files/kmyfirewall-1.0_gentoo_multiport.diff b/net-firewall/kmyfirewall/files/kmyfirewall-1.0_gentoo_multiport.diff
new file mode 100644
index 000000000000..6480713aeb47
--- /dev/null
+++ b/net-firewall/kmyfirewall/files/kmyfirewall-1.0_gentoo_multiport.diff
@@ -0,0 +1,29 @@
+diff -ruN kmyfirewall-1.0_old/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoption_protocol_option.xml kmyfirewall-1.0/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoption_protocol_option.xml
+--- kmyfirewall-1.0_old/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoption_protocol_option.xml	2005-12-11 16:55:16.000000000 +0100
++++ kmyfirewall-1.0/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoption_protocol_option.xml	2005-12-11 13:37:54.000000000 +0100
+@@ -9,10 +9,10 @@
+   <option guiName="Dest. Port:" command="--destination-port" />
+ </ruleoptiondefinition>
+ <ruleoptiondefinition name="udp_multiport_opt"  guiName="UDP Multiport">
++  <option guiName="" command="--match multiport" />
+-  <option guiName="" command="-p udp --match multiport" />
+   <option guiName="Src. Ports:" command="--source-ports" />
+   <option guiName="Dest. Ports:" command="--destination-ports" />
++  <option guiName="Equal. Ports:" command="--ports" />
+-  <option guiName="Equal. Ports:" command="--equal-ports" />
+ </ruleoptiondefinition>
+ <ruleoptiondefinition name="tcp_opt"  guiName="Protocol TCP">
+   <option guiName="" command="-p tcp" />
+@@ -22,10 +22,10 @@
+   <option guiName="TCP Option:" command="--tcp-option" />
+ </ruleoptiondefinition>
+ <ruleoptiondefinition name="tcp_multiport_opt"  guiName="TCP Multiport">
++  <option guiName="" command="--match multiport" />
+-  <option guiName="" command="-p tcp --match multiport" />
+   <option guiName="Src. Ports:" command="--source-ports" />
+   <option guiName="Dest. Ports:" command="--destination-ports" />
++  <option guiName="Equal. Ports:" command="--ports" />
+-  <option guiName="Equal. Ports:" command="--equal-ports" />
+ </ruleoptiondefinition>
+ <ruleoptiondefinition name="icmp_opt"  guiName="Match ICMP">
+   <option guiName="" command="-p icmp" />
diff --git a/net-firewall/kmyfirewall/kmyfirewall-1.0.ebuild b/net-firewall/kmyfirewall/kmyfirewall-1.0-r1.ebuild
index 7ae9cb02aeee..b8cc1973bf5e 100644
--- a/net-firewall/kmyfirewall/kmyfirewall-1.0.ebuild
+++ b/net-firewall/kmyfirewall/kmyfirewall-1.0-r1.ebuild
@@ -1,12 +1,15 @@
 # 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.ebuild,v 1.1 2005/12/12 18:24:25 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/kmyfirewall/kmyfirewall-1.0-r1.ebuild,v 1.1 2005/12/13 02:16:09 carlo Exp $
 
 inherit kde eutils
 
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="Graphical KDE iptables configuration tool"
 HOMEPAGE="http://kmyfirewall.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kmyfirewall/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/kmyfirewall/${MY_P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -18,12 +21,8 @@ need-kde 3
 
 src_unpack() {
 	kde_src_unpack
-	epatch "${FILESDIR}"/${P}-configure-arts.patch
-	sed -i 's:gentoo_mode=false:gentoo_mode=true:' \
-	"${S}"/kmyfirewall/kmyfirewallrc
-}
-
-pkg_postinst() {
-	ewarn "Please note that rulesets created with kmyfirewall earlier"
-	ewarn "than 1.0beta1 WILL NOT work."
-}
+
+	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