tags 683312 + pending
tags 692838 + pending
thanks

Dear maintainer,

I've prepared an NMU for uif (versioned as 1.0.6-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Davy Graham: Stan's Guitar
Binary files /home/gregoa/tmp/n_mpPpDXFI/uif-1.0.6/.git/index and /home/gregoa/tmp/LUmA9Ks3AE/uif-1.0.6/.git/index differ
diff -Nru uif-1.0.6/debian/changelog uif-1.0.6/debian/changelog
--- uif-1.0.6/debian/changelog	2011-08-24 08:06:18.000000000 +0200
+++ uif-1.0.6/debian/changelog	2013-01-14 20:49:43.000000000 +0100
@@ -1,3 +1,15 @@
+uif (1.0.6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "uif uses deprecated position of ! to negate rules":
+    patch uif.pl to put '!' before the parameters.
+    Thanks to Alex Owen for the bug report and the initial patch.
+    (Closes: #683312)
+  * Fix "New Japanese translation": add ja.po, thanks to victory.
+    (Closes: #692838)
+
+ -- gregor herrmann <gre...@debian.org>  Mon, 14 Jan 2013 20:48:18 +0100
+
 uif (1.0.6-1) unstable; urgency=low
 
   * New upstream version.
diff -Nru uif-1.0.6/debian/po/ja.po uif-1.0.6/debian/po/ja.po
--- uif-1.0.6/debian/po/ja.po	1970-01-01 01:00:00.000000000 +0100
+++ uif-1.0.6/debian/po/ja.po	2013-01-14 20:34:51.000000000 +0100
@@ -0,0 +1,149 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# victory <victory....@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uif\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-17 00:37+0000\n"
+"PO-Revision-Date: 2012-06-17 09:37+0900\n"
+"Last-Translator: victory <victory....@gmail.com>\n"
+"Language-Team: Japanese <debian-japan...@lists.debian.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "don't touch"
+msgstr "触らない"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "workstation"
+msgstr "ワークステーション"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid "Firewall configuration method"
+msgstr "ファイアウォール設定方法"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid ""
+"The firewall can be initialized using debconf, or using information you "
+"manually put into /etc/uif/uif.conf."
+msgstr ""
+"ファイアウォールは debconf を使って、あるいは /etc/uif/uif.conf に手作業で書き"
+"込んだ情報を元に初期設定できます。"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Enter trusted hosts and/or networks:"
+msgstr "信頼するホストやネットワークを入力してください:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"In workstation mode, you can specify some hosts or networks to be globally "
+"trusted. All incoming traffic coming from there will be allowed. Multiple "
+"entries have to be separate with spaces."
+msgstr ""
+"ワークステーションモードでは、全体的に信頼するホストやネットワークを指定できま"
+"す。そこからのトラフィックはすべて許可されます。エントリを複数入力する場合は、"
+"スペースで区切ってください。"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Example: 10.1.0.0/16 trust.mydomain.com 192.168.1.55"
+msgstr "例: 10.1.0.0/16 trust.mydomain.com 192.168.1.55"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid "Do you want your host to be reachable via ping?"
+msgstr "ホストを ping が到達可能にしますか?"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"Normally an Internet host should be reachable with pings. Choosing no here "
+"will disable pings which might be somewhat confusing when analyzing network "
+"problems."
+msgstr ""
+"通常、インターネットホストは ping が到達可能であるべきです。ここで no を選択す"
+"ると ping を無効にするため、ネットワーク問題の分析の際にやや混乱が生まれるかも"
+"しれません。"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Do you want your host to react to traceroutes?"
+msgstr "ホストを traceroute に反応するようにしますか?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Normally an Internet host should react to traceroutes. Choosing no here will "
+"disable this, which might be somewhat confusing when analyzing network "
+"problems."
+msgstr ""
+"通常、インターネットホストは traceroute に反応するべきです。ここで no を選択す"
+"るとこれを無効にするため、ネットワーク問題の分析の際にやや混乱が生まれるかも"
+"しれません。"
+
+#. Type: note
+#. Description
+#: ../templates:5001
+msgid "Firewall for simple workstation setups"
+msgstr "単純なワークステーション用設定によるファイアウォール"
+
+#. Type: note
+#. Description
+#: ../templates:5001
+msgid ""
+"Warning: This configuration provides a very simple firewall setup which is "
+"only able to trust certain hosts and configure global ping / traceroute "
+"behaviour."
+msgstr ""
+"警告: この設定が提供するのは非常に単純なファイアウォールで、できることは特定の"
+"ホストを信頼することと全体的な ping / traceroute の動作の設定だけです。"
+
+#. Type: note
+#. Description
+#: ../templates:5001
+msgid ""
+"If you need a more specific setup, use /etc/uif/uif.conf as a template and "
+"choose \"don't touch\" next time."
+msgstr ""
+"もっと具体的な設定が必要な場合は、/etc/uif/uif.conf をテンプレートとして使い、"
+"次回は「触らない」を選択してください。"
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid "Error in list of trusted hosts"
+msgstr "信頼するホスト一覧に誤りがあります"
+
+#. Type: error
+#. Description
+#: ../templates:6001
+msgid ""
+"Please check the hosts / networks you entered. One or more entries are not "
+"correct, contain no resolvable hosts, valid IP-addresses, valid network "
+"definitions or masks."
+msgstr ""
+"入力したホストやネットワークを確認してください。解決可能なホスト、有効な IP "
+"アドレス、有効なネットワーク定義またはマスクのない不正なエントリがあります。"
diff -Nru uif-1.0.6/uif.pl uif-1.0.6/uif.pl
--- uif-1.0.6/uif.pl	2011-08-24 08:07:24.000000000 +0200
+++ uif-1.0.6/uif.pl	2013-01-14 20:42:28.000000000 +0100
@@ -984,14 +984,14 @@
 				}
 				my $range;
 				foreach $range (@{$$rule{"\u$proto"}[2]}) {
-					push (@protocol, "-p $proto -m $proto --sport $not $range");
+					push (@protocol, "-p $proto -m $proto $not --sport $range");
 				}
 				foreach $range (@{$$rule{"\u$proto"}[3]}) {
-					push (@protocol, "-p $proto -m $proto --dport $not $range");
+					push (@protocol, "-p $proto -m $proto $not --dport $range");
 				}
 				foreach $range (@{$$rule{"\u$proto"}[4]}) {
 					$range =~ /^(.+)\/(.+)$/;
-					push (@protocol, "-p $proto -m $proto --sport $not $1 --dport $not $2");
+					push (@protocol, "-p $proto -m $proto $not --sport $1 $not --dport $2");
 				}
 			}
 		}
@@ -999,16 +999,16 @@
 			my $type;
 			foreach $type (@{$$rule{'ICMP'}}) {
 				if ($type eq 'all') {
-					push (@protocol, "-p $not icmp");
+					push (@protocol, "$not -p icmp");
 				} else {
-					push (@protocol, "-p icmp -m icmp --icmp-type $not $type");
+					push (@protocol, "-p icmp -m icmp $not --icmp-type $type");
 				}
 			}
 		}
 		if (exists($$rule{'OtherProtocols'})) {
 			my $proto;
 			foreach $proto (@{$$rule{'OtherProtocols'}}) {
-				push (@protocol, "-p $not $proto");
+				push (@protocol, "$not -p $proto");
 			}
 		}
 		if (exists($$rule{'Source'})) {
@@ -1020,10 +1020,10 @@
 			my $source;
 			foreach $source (@{$$rule{'Source'}}) {
 				if ($source =~ /(.+)=(.+)/ && ($$rule{'Table'} eq 'filter')) {
-					push (@source, "-s $not $1 -m mac --mac-source $not $2");
+					push (@source, "$not -s $1 -m mac $not --mac-source $2");
 				} else {
 					$source =~ /([^=]+)/;
-					push (@source, "-s $not $1");
+					push (@source, "$not -s $1");
 				}
 			}
 		}
@@ -1036,7 +1036,7 @@
 			my $destination;
 			foreach $destination (@{$$rule{'Destination'}}) {
 				$destination =~ /([^=]+)/;
-				push (@destination, "-d $not $1");
+				push (@destination, "$not -d $1");
 			}
 		}
 		if (exists($$rule{'TranslatedSource'})) {
@@ -1093,7 +1093,7 @@
 			}
 			my $input;
 			foreach $input (@{$$rule{'InputInterface'}}) {
-				push (@inputinterface, "-i $not $input");
+				push (@inputinterface, "$not -i $input");
 			}
 		}
 		if (exists($$rule{'OutputInterface'})) {
@@ -1104,7 +1104,7 @@
 			}
 			my $output;
 			foreach $output (@{$$rule{'OutputInterface'}}) {
-				push (@outputinterface, "-o $not $output");
+				push (@outputinterface, "$not -o $output");
 			}
 		}
 		if (exists($$rule{'PhysicalInputInterface'})) {
@@ -1115,7 +1115,7 @@
 			}
 			my $input;
 			foreach $input (@{$$rule{'PhysicalInputInterface'}}) {
-				push (@physicalinputinterface, "-m physdev --physdev-in $not $input");
+				push (@physicalinputinterface, "-m physdev $not --physdev-in $input");
 			}
 		}
 		if (exists($$rule{'PhysicalOutputInterface'})) {
@@ -1126,7 +1126,7 @@
 			}
 			my $output;
 			foreach $output (@{$$rule{'PhysicalOutputInterface'}}) {
-				push (@physicaloutputinterface, "-m physdev --physdev-out $not $output");
+				push (@physicaloutputinterface, "-m physdev $not --physdev-out $output");
 			}
 		}
 		if (exists($$rule{'MarkMatch'})) {

Attachment: signature.asc
Description: Digital signature

Reply via email to