Hello community, here is the log from the commit of package yast2-firewall for openSUSE:Factory checked in at 2013-06-05 13:25:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-firewall (Old) and /work/SRC/openSUSE:Factory/.yast2-firewall.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firewall" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-firewall/yast2-firewall.changes 2013-04-24 12:23:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-firewall.new/yast2-firewall.changes 2013-06-05 13:25:43.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 6 15:08:31 CEST 2013 - [email protected] + +- Using fixed checking for correct network definition to correctly + support IPv6 (bnc#800592) +- Using ValidNetwork from IP module +- 2.24.0 + +------------------------------------------------------------------- Old: ---- yast2-firewall-2.21.4.tar.bz2 New: ---- yast2-firewall-2.24.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.dZe9Xx/_old 2013-06-05 13:25:44.000000000 +0200 +++ /var/tmp/diff_new_pack.dZe9Xx/_new 2013-06-05 13:25:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-firewall -Version: 2.21.4 +Version: 2.24.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,12 +25,13 @@ BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files -BuildRequires: yast2 >= 2.16.47 BuildRequires: yast2-devtools BuildRequires: yast2-testsuite +# IP::CheckNetwork +BuildRequires: yast2 >= 2.23.25 -# Netmask::CheckPrefix4 -Requires: yast2 >= 2.18.26 +# IP::CheckNetwork +Requires: yast2 >= 2.23.25 # ButtonBox widget Conflicts: yast2-ycp-ui-bindings < 2.17.3 ++++++ yast2-firewall-2.21.4.tar.bz2 -> yast2-firewall-2.24.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-2.21.4/VERSION new/yast2-firewall-2.24.0/VERSION --- old/yast2-firewall-2.21.4/VERSION 2013-04-16 09:41:31.000000000 +0200 +++ new/yast2-firewall-2.24.0/VERSION 2013-05-07 11:26:31.000000000 +0200 @@ -1 +1 @@ -2.21.4 +2.24.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-2.21.4/configure new/yast2-firewall-2.24.0/configure --- old/yast2-firewall-2.21.4/configure 2013-04-16 09:41:43.000000000 +0200 +++ new/yast2-firewall-2.24.0/configure 2013-05-28 14:09:58.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-firewall 2.21.4. +# Generated by GNU Autoconf 2.69 for yast2-firewall 2.24.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firewall' PACKAGE_TARNAME='yast2-firewall' -PACKAGE_VERSION='2.21.4' -PACKAGE_STRING='yast2-firewall 2.21.4' +PACKAGE_VERSION='2.24.0' +PACKAGE_STRING='yast2-firewall 2.24.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-firewall 2.21.4 to adapt to many kinds of systems. +\`configure' configures yast2-firewall 2.24.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-firewall 2.21.4:";; + short | recursive ) echo "Configuration of yast2-firewall 2.24.0:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-firewall configure 2.21.4 +yast2-firewall configure 2.24.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-firewall $as_me 2.21.4, which was +It was created by yast2-firewall $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='yast2-firewall' - VERSION='2.21.4' + VERSION='2.24.0' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.21.4" +VERSION="2.24.0" RPMNAME="yast2-firewall" MAINTAINER="YaST2 Maintainers <[email protected]>" @@ -3403,7 +3403,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-firewall $as_me 2.21.4, which was +This file was extended by yast2-firewall $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3456,7 +3456,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-firewall config.status 2.21.4 +yast2-firewall config.status 2.24.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-2.21.4/configure.in new/yast2-firewall-2.24.0/configure.in --- old/yast2-firewall-2.21.4/configure.in 2013-04-16 09:41:38.000000000 +0200 +++ new/yast2-firewall-2.24.0/configure.in 2013-05-28 14:09:55.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firewall, 2.21.4, http://bugs.opensuse.org/, yast2-firewall) +AC_INIT(yast2-firewall, 2.24.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.21.4" +VERSION="2.24.0" RPMNAME="yast2-firewall" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-2.21.4/src/uifunctions.ycp new/yast2-firewall-2.24.0/src/uifunctions.ycp --- old/yast2-firewall-2.21.4/src/uifunctions.ycp 2013-01-22 11:19:16.000000000 +0100 +++ new/yast2-firewall-2.24.0/src/uifunctions.ycp 2013-05-07 11:26:31.000000000 +0200 @@ -39,7 +39,6 @@ import "SuSEFirewallExpertRules"; import "PortAliases"; import "Popup"; - import "Address"; import "Wizard"; import "Report"; import "Label"; @@ -74,57 +73,6 @@ * */ - /** - * Checks the network entry which can be defined in several formats. - * - * @example - * CheckNetwork ("192.168.0.1") -> true - * CheckNetwork ("192.168.0.0/20") -> true - * CheckNetwork ("192.168.0.0/255.255.255.0") -> true - * CheckNetwork ("0/0") -> true - */ - boolean CheckNetwork (string network) { - boolean ret = nil; - - if (network == nil || network == "") { - ret = false; - - } else if (network == "0/0") { - ret = true; - - // 192.168.0.1, 0.8.55.999 - } else if (regexpmatch(network, "^[0123456789\.]+$")) { - ret = IP::Check4 (network); - - // 192.168.0.0/20, 0.8.55/158 - } else if (regexpmatch(network, "^[0123456789\.]+/[0123456789]+$")) { - string network_ip = regexpsub (network, "^([0123456789\.]+)/[0123456789]+$", "\\1"); - string network_mask = regexpsub (network, "^[0123456789\.]+/([0123456789]+)$", "\\1"); - - ret = (IP::Check4 (network_ip) && Netmask::CheckPrefix4 (network_mask)); - - // 192.168.0.0/255.255.255.0, 0.8.55/10.258.12 - } else if (regexpmatch(network, "^[0123456789\.]+/[0123456789\.]+$")) { - string network_ip = regexpsub (network, "^([0123456789\.]+)/[0123456789\.]+$", "\\1"); - string network_mask = regexpsub (network, "^[0123456789\.]+/([0123456789\.]+)$", "\\1"); - - ret = (IP::Check4 (network_ip) && Netmask::Check4 (network_mask)); - } - - if (ret != true && ! Mode::testsuite()) { - // TRANSLATORS: error message, %1 represents the erroneous network definition - Report::Error (sformat (_("Invalid network definition '%1'. -Network can be defined as an IP or IP with slash and netmask. - -For instance: 192.168.0.1 -or 192.168.0.0/20 -or 192.168.0.0/255.255.255.0 -or 0/0"), network)); - } - - return ret; - } - // UI Functions /** @@ -937,13 +885,15 @@ boolean CheckIP(string ui_id) { string ip = (string) UI::QueryWidget(`id(ui_id), `Value); - if (!Address::Check4(ip)) { + if (!IP::Check(ip)) { UI::SetFocus(`id(ui_id)); Popup::Error( - // TRANSLATORS: popup message, right definition is two lines belos this message + // TRANSLATORS: popup message, right definition is two lines below this message _("Invalid IP definition.") + "\n\n" + - Address::Valid4() + IP::Valid4() + + "\n" + + IP::Valid6() ); return false; } @@ -1350,9 +1300,11 @@ string add_options = (string) UI::QueryWidget(`id("add_options"), `Value); // network is mandatory - if (add_source_network == "" || ! CheckNetwork (add_source_network)) { + if (add_source_network == "" || ! IP::CheckNetwork(add_source_network)) { UI::SetFocus (`id ("add_source_network")); - Report::Error (sformat (_("Invalid network definition '%1'"), add_source_network) + "\n" + SuSEFirewallExpertRules::ValidNetwork()); + Report::Error( + sformat (_("Invalid network definition '%1'"), add_source_network) + "\n" + + IP::ValidNetwork()); continue; } @@ -1366,7 +1318,9 @@ } } else if (! CheckPortNameOrNumber (add_destination_port)) { UI::SetFocus (`id ("add_destination_port")); - Report::Error (sformat (_("Invalid port name or number '%1'"), add_destination_port) + "\n" + PortAliases::AllowedPortNameOrNumber()); + Report::Error( + sformat (_("Invalid port name or number '%1'"), add_destination_port) + "\n" + + PortAliases::AllowedPortNameOrNumber()); continue; } } @@ -1381,7 +1335,9 @@ } } else if (! CheckPortNameOrNumber (add_source_port)) { UI::SetFocus (`id ("add_source_port")); - Report::Error (sformat (_("Invalid port name or number '%1'"), add_source_port) + "\n" + PortAliases::AllowedPortNameOrNumber()); + Report::Error( + sformat (_("Invalid port name or number '%1'"), add_source_port) + "\n" + + PortAliases::AllowedPortNameOrNumber()); continue; } } @@ -1510,15 +1466,19 @@ return true; } - if (! SuSEFirewallExpertRules::IsValidNetwork (network)) { + if (! IP::CheckNetwork (network)) { UI::SetFocus (`id (`network)); - Report::Error (sformat (_("Invalid network definition '%1'"), network) + "\n" + SuSEFirewallExpertRules::ValidNetwork()); + Report::Error( + sformat (_("Invalid network definition '%1'"), network) + "\n" + + IP::ValidNetwork()); return false; } if (! PortAliases::IsAllowedPortName (port)) { UI::SetFocus (`id (`port)); - Report::Error (sformat (_("Invalid port name or number '%1'"), port) + "\n" + PortAliases::AllowedPortNameOrNumber()); + Report::Error( + sformat (_("Invalid port name or number '%1'"), port) + "\n" + + PortAliases::AllowedPortNameOrNumber()); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-2.21.4/testsuite/tests/Functions.out new/yast2-firewall-2.24.0/testsuite/tests/Functions.out --- old/yast2-firewall-2.21.4/testsuite/tests/Functions.out 2013-01-22 11:19:16.000000000 +0100 +++ new/yast2-firewall-2.24.0/testsuite/tests/Functions.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -Read .target.tmpdir nil -Log Failed to set temporary directory: nil -Dir .product.features.section: [] -Dump -Dump == Checking Functions == -Return true -Return true -Return true -Return true -Return true -Return true -Return true -Return true -Return true -Return true -Return false -Return false -Return false -Return false -Return false -Dump diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-2.21.4/testsuite/tests/Functions.ycp new/yast2-firewall-2.24.0/testsuite/tests/Functions.ycp --- old/yast2-firewall-2.21.4/testsuite/tests/Functions.ycp 2013-01-22 11:19:16.000000000 +0100 +++ new/yast2-firewall-2.24.0/testsuite/tests/Functions.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -/**************************************************************************** - -Copyright (c) 2000 - 2012 Novell, Inc. -All Rights Reserved. - -This program is free software; you can redistribute it and/or -modify it under the terms of version 2 of the GNU General Public License as -published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, contact Novell, Inc. - -To contact Novell about this file by physical or electronic mail, -you may find current contact information at www.novell.com - -****************************************************************************/ -{ - include "testsuite.ycp"; - - include "firewall/subdialogs.ycp"; - include "firewall/uifunctions.ycp"; - - map READ = $[ - "target" : $[ - "tmpdir" : "/tmp", - ], - ]; - map WRITE = $[]; - map EXECUTE = $[]; - - TESTSUITE_INIT([READ, WRITE, EXECUTE], nil); - - DUMP (""); - - DUMP ("== Checking Functions =="); - - TEST (``(CheckNetwork("192.168.0.1")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("192.168.0.255")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("192.168.0.1/20")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("192.168.0.255/32")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("192.168.0.1/255.240.0.0")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("192.168.0.255/255.255.255.255")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("192.168.0.1/0")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("172.55.0.0/1")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("0/0")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("255.255.255.255/255.255.255.255")), [READ, WRITE, EXECUTE], nil); - - TEST (``(CheckNetwork("172.55.0.0/33")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("256.168.0.255")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("172.55.0.0/125.85.5.5")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("192.168.0.255/5.5.5")), [READ, WRITE, EXECUTE], nil); - TEST (``(CheckNetwork("192.168.0.255/255.255.0.255")), [READ, WRITE, EXECUTE], nil); - - DUMP (""); -} \ No newline at end of file -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
