Hi, The attached file is the diff for my knetfilter 3.5.0-1.2 NMU. The associated changelog entry is:
knetfilter (3.5.0-1.2) unstable; urgency=medium
* Non-maintainer upload.
* Fix bashism in /bin/sh script. Patch by Raphael Geissert
<[EMAIL PROTECTED]> (Closes: #472882)
* Bump Standards-Version to 3.8.0.
* Remove useless rpath from /usr/bin/knetfilter.
* Don't unnecessarily create /usr/sbin.
* Move menu section from deprecated "Apps/Net" to
"Applications/Network".
Regards,
--
Chris Lamb, UK [EMAIL PROTECTED]
GPG: 0x634F9A20
diff -Nru knetfilter-3.5.0/debian/changelog knetfilter-3.5.0/debian/changelog
--- knetfilter-3.5.0/debian/changelog 2008-07-11 19:37:18.000000000 +0100
+++ knetfilter-3.5.0/debian/changelog 2008-07-11 19:37:18.000000000 +0100
@@ -1,3 +1,16 @@
+knetfilter (3.5.0-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix bashism in /bin/sh script. Patch by Raphael Geissert
+ <[EMAIL PROTECTED]> (Closes: #472882)
+ * Bump Standards-Version to 3.8.0.
+ * Remove useless rpath from /usr/bin/knetfilter.
+ * Don't unnecessarily create /usr/sbin.
+ * Move menu section from deprecated "Apps/Net" to
+ "Applications/Network".
+
+ -- Chris Lamb <[EMAIL PROTECTED]> Fri, 11 Jul 2008 19:24:33 +0100
+
knetfilter (3.5.0-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru knetfilter-3.5.0/debian/control knetfilter-3.5.0/debian/control
--- knetfilter-3.5.0/debian/control 2008-07-11 19:37:18.000000000 +0100
+++ knetfilter-3.5.0/debian/control 2008-07-11 19:37:18.000000000 +0100
@@ -2,8 +2,8 @@
Section: kde
Priority: optional
Maintainer: Angel Ramos <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 5.0.0), zlib1g-dev, libjpeg62-dev, libqt3-mt-dev,
kdelibs4-dev, iptables
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>> 5.0.0), zlib1g-dev, libjpeg62-dev, libqt3-mt-dev,
kdelibs4-dev, iptables, chrpath
+Standards-Version: 3.8.0
Package: knetfilter
Architecture: any
diff -Nru knetfilter-3.5.0/debian/dirs knetfilter-3.5.0/debian/dirs
--- knetfilter-3.5.0/debian/dirs 2008-07-11 19:37:18.000000000 +0100
+++ knetfilter-3.5.0/debian/dirs 2008-07-11 19:37:18.000000000 +0100
@@ -1,2 +1 @@
usr/bin
-usr/sbin
diff -Nru knetfilter-3.5.0/debian/menu knetfilter-3.5.0/debian/menu
--- knetfilter-3.5.0/debian/menu 2008-07-11 19:37:18.000000000 +0100
+++ knetfilter-3.5.0/debian/menu 2008-07-11 19:37:18.000000000 +0100
@@ -1,6 +1,6 @@
?package(knetfilter):\
needs="x11"\
- section="Apps/Net"\
+ section="Applications/Network"\
hints="KDE"\
title="KNetfilter"\
command="/usr/bin/knetfilter"
diff -Nru knetfilter-3.5.0/debian/rules knetfilter-3.5.0/debian/rules
--- knetfilter-3.5.0/debian/rules 2008-07-11 19:37:18.000000000 +0100
+++ knetfilter-3.5.0/debian/rules 2008-07-11 19:37:18.000000000 +0100
@@ -75,6 +75,8 @@
mv debian/knetfilter/usr/share/icons/*png
debian/knetfilter/usr/share/icons/hicolor/16x16/actions
# mv debian/knetfilter/usr/share/icons/hicolor/16x16/actions/mark.png
debian/knetfilter/usr/share/icons/hicolor/16x16/actions/knet_mark.png
+ chrpath --delete $(CURDIR)/debian/knetfilter/usr/bin/knetfilter || true
+
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
diff -Nru knetfilter-3.5.0/src/scripts/kiptables-save
knetfilter-3.5.0/src/scripts/kiptables-save
--- knetfilter-3.5.0/src/scripts/kiptables-save 2002-05-12 23:06:05.000000000
+0100
+++ knetfilter-3.5.0/src/scripts/kiptables-save 2008-07-11 19:37:18.000000000
+0100
@@ -49,36 +49,36 @@
export input="`iptables -L INPUT -n | grep -v target | grep -v Chain |
awk '{print gensub (/spt:/, "--sport ", 1)}'| awk '{print gensub (/spts:/,
"--sport ", 1)}' | awk '{print gensub (/dpt:/, "--dport ", 1)}' | awk '{print
gensub (/dpts:/, "--dport ", 1)}' | awk '{print gensub (/type/, "--icmp-type ",
1)}' | awk '{print gensub (/reject-with icmp-port-unreachable/, " " ,1)}' | awk
'{print gensub (/flags:0x0216\/0x022/, "--syn " ,1)}' | awk '{print
gensub(/state/, "-m state --state", 1)}' | awk '{print gensub(/MARK match/, "-m
mark --mark", 1)}' | awk '{print gensub(/tcp/, " ", 2)}' | awk '{print
gensub(/udp/, " ", 2)}' | awk '{print gensub(/icmp/, " ", 2)}' | awk '{print
"iptables -A INPUT", "-p", $2, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,
"-s", $4, "-d", $5, "-j", $1, ";"}'`"
- echo -e $input >> /etc/iptables.cfg
+ printf "$input\n" >> /etc/iptables.cfg
export forward="`iptables -L FORWARD -n | grep -v target | grep -v
Chain | awk '{print gensub (/spt:/, "--sport ", 1)}'| awk '{print gensub
(/spts:/, "--sport ", 1)}' | awk '{print gensub (/dpt:/, "--dport ", 1)}' |
awk '{print gensub (/dpts:/, "--dport ", 1)}' | awk '{print gensub (/type/,
"--icmp-type ", 1)}' | awk '{print gensub (/reject-with icmp-port-unreachable/,
" " ,1)}' | awk '{print gensub (/flags:0x0216\/0x022/, "--syn " ,1)}' | awk
'{print gensub(/state/, "-m state --state", 1)}' | awk '{print gensub(/MARK
match/, "-m mark --mark", 1)}' | awk '{print gensub(/tcp/, " ", 2)}' | awk
'{print gensub(/udp/, " ", 2)}' | awk '{print gensub(/icmp/, " ", 2)}' | awk
'{print "iptables -A FORWARD", "-p", $2, $6, $7, $8, $9, $10, $11, $12, $13,
$14, $15, "-s", $4, "-d", $5, "-j", $1, ";"}'`"
- echo -e $forward >> /etc/iptables.cfg
+ printf "$forward\n" >> /etc/iptables.cfg
export output="`iptables -L OUTPUT -n | grep -v target | grep -v Chain
| awk '{print gensub (/spt:/, "--sport ", 1)}'| awk '{print gensub (/spts:/,
"--sport ", 1)}' | awk '{print gensub (/dpt:/, "--dport ", 1)}' | awk '{print
gensub (/dpts:/, "--dport ", 1)}' |awk '{print gensub (/type/, "--icmp-type ",
1)}' | awk '{print gensub (/reject-with icmp-port-unreachable/, " " ,1)}' | awk
'{print gensub (/flags:0x0216\/0x022/, "--syn " ,1)}' | awk '{print
gensub(/state/, "-m state --state", 1)}' | awk '{print gensub(/MARK match/, "-m
mark --mark", 1)}' | awk '{print gensub(/tcp/, " ", 2)}' | awk '{print
gensub(/udp/, " ", 2)}' | awk '{print gensub(/icmp/, " ", 2)}' | awk '{print
"iptables -A OUTPUT", "-p", $2, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,
"-s", $4, "-d", $5, "-j", $1, ";"}'`"
- echo -e $output >> /etc/iptables.cfg
+ printf "$output\n" >> /etc/iptables.cfg
export chain="`iptables -L -n -v | grep Chain | awk '{print "iptables
-P", $2, $4, ";"}'`"
- echo -e $chain >> /etc/iptables.cfg
+ printf "$chain\n" >> /etc/iptables.cfg
# NAT AND MASQUERADE
export nat_prerouting="`iptables -t nat -L PREROUTING -n | grep -v
target | grep -v Chain | awk '{print gensub(/spt:/, "--source-port ", 1)}' |
awk '{print gensub(/spts:/, "--source-port ", 1)}' | awk '{print gensub(/dpt:/,
"--destination-port ", 1)}' | awk '{print gensub(/dpts:/, "--destination-port
", 1)}' | awk '{print gensub(/redir ports/, "--to ", 1)}' | awk '{print
gensub(/to:/, "--to ", 1)}' | awk '{print gensub(/tcp/, " ", 2)}' | awk
'{print gensub(/udp/, " ", 2)}' | awk '{print gensub(/icmp/, " ", 2)}' | awk
'{print "iptables -t nat -A PREROUTING", "-p", $2, "-j", $1, "-s", $4, "-d",
$5, $6, $7, $8, $9, $10, $11, $12, ";"}'`"
- echo -e $nat_prerouting >> /etc/iptables.cfg
+ printf "$nat_prerouting\n" >> /etc/iptables.cfg
export nat_postrouting="`iptables -t nat -L POSTROUTING -n | grep -v
target | grep -v Chain | awk '{print gensub(/spt:/, "--source-port ", 1)}' |
awk '{print gensub(/spts:/, "--source-port ", 1)}' | awk '{print gensub(/dpt:/,
"--destination-port ", 1)}' | awk '{print gensub(/dpts:/, "--destination-port
", 1)}' | awk '{print gensub(/redir ports/, "--to ", 1)}' | awk '{print
gensub(/type/, "--icmp-type ", 1)}' | awk '{print gensub(/to:/, "--to ", 1)}' |
awk '{print gensub(/tcp/, " ", 2)}' | awk '{print gensub(/udp/, " ", 2)}' |
awk '{print gensub(/icmp/, " ", 2)}' | awk '{print "iptables -t nat -A
POSTROUTING", "-p", $2, "-j", $1, "-s", $4, "-d", $5, $6, $7, $8, $9, $10,
$11, $12, ";"}'`"
- echo -e $nat_postrouting >> /etc/iptables.cfg
+ printf "$nat_postrouting\n" >> /etc/iptables.cfg
export nat_output="`iptables -t nat -L OUTPUT -n | grep -v target |
grep -v Chain | awk '{print gensub(/spt:/, "--source-port ", 1)}' | awk
'{print gensub(/spts:/, "--source-port ", 1)}' | awk '{print gensub(/dpt:/,
"--destination-port ", 1)}' | awk '{print gensub(/dpts:/, "--destination-port
", 1)}' | awk '{print gensub(/redir ports/, "--to ", 1)}' | awk '{print
gensub(/to:/, "--to ", 1)}' | awk '{print gensub(/tcp/, " ", 2)}' | awk
'{print gensub(/udp/, " ", 2)}' | awk '{print gensub(/icmp/, " ", 2)}' | awk
'{print "iptables -t nat -A OUTPUT", "-p", $2, "-j", $1, "-s", $4, "-d", $5,
$6, $7, $8, $9, $10, $11, $12, ";"}'`"
- echo -e $nat_output >> /etc/iptables.cfg
+ printf "$nat_output\n" >> /etc/iptables.cfg
export nat_chain="`iptables -t nat -L -n -v | grep Chain | awk '{print
"iptables -t nat -P", $2, $4, ";"}'`"
- echo -e $nat_chain >> /etc/iptables.cfg
+ printf "$nat_chain\n" >> /etc/iptables.cfg
# MANGLE
@@ -91,7 +91,7 @@
echo $mangle_output >> /etc/iptables.cfg
export mangle_chain="`iptables -t mangle -L -n -v | grep Chain | awk
'{print "iptables -t mangle -P", $2, $4, ";"}'`"
- echo -e $mangle_chain >> /etc/iptables.cfg
+ printf "$mangle_chain\n" >> /etc/iptables.cfg
chmod 755 /etc/iptables.cfg
;;
signature.asc
Description: PGP signature
