Hello community,
here is the log from the commit of package yast2-firewall for openSUSE:Factory
checked in at Mon Aug 29 16:51:06 CEST 2011.
--------
--- yast2-firewall/yast2-firewall.changes 2010-04-30 14:29:04.000000000
+0200
+++ /mounts/work_src_done/STABLE/yast2-firewall/yast2-firewall.changes
2011-08-29 13:16:08.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Aug 26 13:33:57 CEST 2011 - loci...@suse.cz
+
+- Fixed Custom Rules dialog to handle additional flags (bnc#712670)
+- 2.21.0
+
+-------------------------------------------------------------------
+Fri Aug 5 12:32:00 CEST 2011 - tgoettlic...@suse.de
+
+- fixed .desktop file (bnc #681249)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-firewall-2.19.1.tar.bz2
New:
----
yast2-firewall-2.21.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firewall.spec ++++++
--- /var/tmp/diff_new_pack.1iJYsS/_old 2011-08-29 16:49:54.000000000 +0200
+++ /var/tmp/diff_new_pack.1iJYsS/_new 2011-08-29 16:49:54.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-firewall (Version 2.19.1)
+# spec file for package yast2-firewall
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,16 @@
Name: yast2-firewall
-Version: 2.19.1
+Version: 2.21.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-firewall-2.19.1.tar.bz2
+Source0: yast2-firewall-2.21.0.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPLv2+
+License: GPL v2 or later
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools
yast2-testsuite
BuildRequires: yast2 >= 2.16.47
@@ -51,7 +51,7 @@
A YaST2 module to be used for configuring a firewall.
%prep
-%setup -n yast2-firewall-2.19.1
+%setup -n yast2-firewall-2.21.0
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-firewall-2.19.1.tar.bz2 -> yast2-firewall-2.21.0.tar.bz2 ++++++
++++ 4295 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-firewall-2.19.1/VERSION new/yast2-firewall-2.21.0/VERSION
--- old/yast2-firewall-2.19.1/VERSION 2010-04-30 14:26:03.000000000 +0200
+++ new/yast2-firewall-2.21.0/VERSION 2011-08-29 13:06:38.000000000 +0200
@@ -1 +1 @@
-2.19.1
+2.21.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-firewall-2.19.1/configure.in new/yast2-firewall-2.21.0/configure.in
--- old/yast2-firewall-2.19.1/configure.in 2010-04-30 14:26:31.000000000
+0200
+++ new/yast2-firewall-2.21.0/configure.in 2011-08-29 13:07:15.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-firewall, 2.19.1, http://bugs.opensuse.org/, yast2-firewall)
+AC_INIT(yast2-firewall, 2.21.0, http://bugs.opensuse.org/, yast2-firewall)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.19.1"
+VERSION="2.21.0"
RPMNAME="yast2-firewall"
MAINTAINER="Lukas Ocilka <loci...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-firewall-2.19.1/src/firewall.desktop
new/yast2-firewall-2.21.0/src/firewall.desktop
--- old/yast2-firewall-2.19.1/src/firewall.desktop 2010-01-15
11:14:05.000000000 +0100
+++ new/yast2-firewall-2.21.0/src/firewall.desktop 2011-08-05
15:08:45.000000000 +0200
@@ -3,7 +3,6 @@
Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Security;
X-KDE-ModuleType=Library
-X-KDE-RootOnly=true
X-KDE-HasReadOnlyMode=true
X-KDE-Library=yast2
X-SuSE-YaST-Call=firewall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-firewall-2.19.1/src/subdialogs.ycp
new/yast2-firewall-2.21.0/src/subdialogs.ycp
--- old/yast2-firewall-2.19.1/src/subdialogs.ycp 2009-11-24
15:15:05.000000000 +0100
+++ new/yast2-firewall-2.21.0/src/subdialogs.ycp 2011-08-26
13:41:53.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Configuration screens
* Authors: Lukas Ocilka <loci...@suse.cz>
*
- * $Id: subdialogs.ycp 59658 2009-11-20 12:16:59Z locilka $
+ * $Id: subdialogs.ycp 65402 2011-08-26 11:41:52Z locilka $
*
* Configuration dialogs divided into smaller logic groups.
* Both Expert and Simple.
@@ -903,7 +903,8 @@
_("Source Network"),
_("Protocol"),
_("Destination Port"),
- _("Source Port")
+ _("Source Port"),
+ _("Options")
),
[]
),
@@ -930,7 +931,8 @@
`item( `id("_rpc_"),
SuSEFirewall::GetProtocolTranslatedName("_rpc_")),
])),
`InputField (`id("add_destination_port"), `opt (`hstretch),
_("&Destination Port (Optional)")),
- `InputField (`id("add_source_port"), `opt (`hstretch),
_("&Source Port (Optional)"))
+ `InputField (`id("add_source_port"), `opt (`hstretch),
_("&Source Port (Optional)")),
+ `InputField (`id("add_options"), `opt (`hstretch),
_("Additiona &Options (Optional)"))
)
),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-firewall-2.19.1/src/summary.ycp
new/yast2-firewall-2.21.0/src/summary.ycp
--- old/yast2-firewall-2.19.1/src/summary.ycp 2009-11-24 15:15:05.000000000
+0100
+++ new/yast2-firewall-2.21.0/src/summary.ycp 2011-08-26 13:41:53.000000000
+0200
@@ -6,7 +6,7 @@
* Summary: Firewall configuration summary
* Authors: Lukas Ocilka <loci...@suse.cz>
*
- * $Id: summary.ycp 53819 2008-12-02 14:04:46Z locilka $
+ * $Id: summary.ycp 65402 2011-08-26 11:41:52Z locilka $
*
* Summary functions.
*/
@@ -280,11 +280,12 @@
foreach (map <string, string> one_rule, custom_rules, {
string proto = one_rule["protocol"]:"tcp";
string one_rule_s = li_start + sformat (
- _("Network: <i>%1</i>, Protocol: <i>%2</i>, Destination
port: <i>%3</i>, Source port: <i>%4</i>"),
+ _("Network: <i>%1</i>, Protocol: <i>%2</i>, Destination
port: <i>%3</i>, Source port: <i>%4</i>, Options: <i>%5</i>"),
String::EscapeTags (one_rule["network"]:_("All")),
String::EscapeTags
(SuSEFirewall::GetProtocolTranslatedName (one_rule["protocol"]:_("All"))),
(one_rule["dport"]:"" != "" ? String::EscapeTags
(UserReadablePortName (one_rule["dport"]:"", proto)) : _("All")),
- (one_rule["sport"]:"" != "" ? String::EscapeTags
(UserReadablePortName (one_rule["sport"]:"", proto)) : _("All"))
+ (one_rule["sport"]:"" != "" ? String::EscapeTags
(UserReadablePortName (one_rule["sport"]:"", proto)) : _("All")),
+ (one_rule["options"]:"" != "" ? String::EscapeTags
(one_rule["options"]:"") : _("None"))
) + li_end;
rules = rules + one_rule_s;
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-firewall-2.19.1/src/uifunctions.ycp
new/yast2-firewall-2.21.0/src/uifunctions.ycp
--- old/yast2-firewall-2.19.1/src/uifunctions.ycp 2009-11-30
10:26:35.000000000 +0100
+++ new/yast2-firewall-2.21.0/src/uifunctions.ycp 2011-08-26
13:41:53.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Configuration dialogs handling functions
* Authors: Lukas Ocilka <loci...@suse.cz>
*
- * $Id: uifunctions.ycp 59814 2009-11-26 18:24:30Z kmachalkova $
+ * $Id: uifunctions.ycp 65402 2011-08-26 11:41:52Z locilka $
*
* Configuration dialogs handling.
* Both Expert and Simple.
@@ -1244,7 +1244,8 @@
one_rule["network"]:"",
SuSEFirewall::GetProtocolTranslatedName
(one_rule["protocol"]:""),
UserReadablePortName (one_rule["dport"]:"",
one_rule["protocol"]:""),
- UserReadablePortName (one_rule["sport"]:"", "")
+ UserReadablePortName (one_rule["sport"]:"", ""),
+ one_rule["options"]:""
);
});
@@ -1324,6 +1325,7 @@
string add_protocol = (string)
UI::QueryWidget(`id("add_protocol"), `Value);
string add_destination_port = (string)
UI::QueryWidget(`id("add_destination_port"), `Value);
string add_source_port = (string)
UI::QueryWidget(`id("add_source_port"), `Value);
+ string add_options = (string)
UI::QueryWidget(`id("add_options"), `Value);
// network is mandatory
if (add_source_network == "" || ! CheckNetwork
(add_source_network)) {
@@ -1367,8 +1369,9 @@
$[
"network" : add_source_network,
"protocol" : add_protocol,
- "dport" : add_destination_port,
- "sport" : add_source_port
+ "dport" : add_destination_port,
+ "sport" : add_source_port,
+ "options" : add_options,
]
);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
