commit yast2-firewall for openSUSE:Factory - openSUSE Commits

27 Nov 2009

Hello community,
here is the log from the commit of package yast2-firewall for openSUSE:Factory
checked in at Fri Nov 27 19:33:05 CET 2009.
--------

--- yast2-firewall/yast2-firewall.changes	2009-10-24 22:10:51.000000000 +0200
+++ yast2-firewall/yast2-firewall.changes	2009-11-27 10:59:10.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Nov 26 19:20:16 CET 2009 - kmachalkova@suse.cz
+
+- Adapted to new Netmask API - prefix and netmask are now checked
+  by two separate functions
+- 2.19.0 
+
+-------------------------------------------------------------------
+Fri Nov 20 13:12:06 CET 2009 - locilka@suse.cz
+
+- Added description to the list of allowed services (FATE #306804).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
  yast2-firewall-2.18.1.tar.bz2
New:
----
  yast2-firewall-2.19.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firewall.spec ++++++
--- /var/tmp/diff_new_pack.tfUrXh/_old	2009-11-27 19:32:24.000000000 +0100
+++ /var/tmp/diff_new_pack.tfUrXh/_new	2009-11-27 19:32:24.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-firewall (Version 2.18.1)
+# spec file for package yast2-firewall (Version 2.19.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,17 +19,17 @@
Name:           yast2-firewall
-Version:        2.18.1
+Version:        2.19.0
 Release:        1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-firewall-2.18.1.tar.bz2
+Source0:        yast2-firewall-2.19.0.tar.bz2
 Prefix:         /usr
 Group:          System/YaST
-License:        GPL v2 or later
+License:        GPLv2+
 BuildRequires:  perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
 BuildRequires:  yast2 >= 2.16.47
-# SuSEFirewall::SetInstallPackagesIfMissing, bnc #388773
-Requires:       yast2 >= 2.17.6
+# Netmask::CheckPrefix4
+Requires:       yast2 >= 2.18.26
 # ButtonBox widget
 Conflicts:      yast2-ycp-ui-bindings < 2.17.3
 Provides:       yast2-config-firewall
@@ -43,7 +43,7 @@
 A YaST2 module to be used for configuring a firewall.
%prep
-%setup -n yast2-firewall-2.18.1
+%setup -n yast2-firewall-2.19.0
%build
 %{prefix}/bin/y2tool y2autoconf
++++++ yast2-firewall-2.18.1.tar.bz2 -> yast2-firewall-2.19.0.tar.bz2 ++++++
++++ 3149 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.18.1/VERSION new/yast2-firewall-2.19.0/VERSION
--- old/yast2-firewall-2.18.1/VERSION	2009-10-23 18:01:25.000000000 +0200
+++ new/yast2-firewall-2.19.0/VERSION	2009-11-26 19:21:47.000000000 +0100
@@ -1 +1 @@
-2.18.1
+2.19.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.18.1/configure.in new/yast2-firewall-2.19.0/configure.in
--- old/yast2-firewall-2.18.1/configure.in	2009-10-23 18:02:31.000000000 +0200
+++ new/yast2-firewall-2.19.0/configure.in	2009-11-27 10:51:58.000000000 +0100
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-firewall
 dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
-AC_INIT(yast2-firewall, 2.18.1, http://bugs.opensuse.org/, yast2-firewall)
+AC_INIT(yast2-firewall, 2.19.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.18.1"
+VERSION="2.19.0"
 RPMNAME="yast2-firewall"
 MAINTAINER="Lukas Ocilka locilka@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.18.1/missing new/yast2-firewall-2.19.0/missing
--- old/yast2-firewall-2.18.1/missing	2009-10-23 18:02:36.000000000 +0200
+++ new/yast2-firewall-2.19.0/missing	2009-11-27 10:52:04.000000000 +0100
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+#   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard pinard@iro.umontreal.ca, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,9 @@
 # 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, see http://www.gnu.org/licenses/.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,9 +89,6 @@
   tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create `y.tab.[ch]', if possible, from existing .[ch]
-Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and
-`g' are ignored when checking the name.
-
 Send bug reports to bug-automake@gnu.org."
     exit $?
     ;;
@@ -107,22 +106,15 @@
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
+# the program).
 case $1 in
-  lex*|yacc*)
+  lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
-  tar*)
+  tar)
     if test -n "$run"; then
        echo 1>&2 "ERROR: `tar' requires --run"
        exit 1
@@ -146,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case $program in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: `$1' is $msg.  You should only need it if
@@ -156,7 +148,7 @@
     touch aclocal.m4
     ;;
-  autoconf*)
+  autoconf)
     echo 1>&2 "\
 WARNING: `$1' is $msg.  You should only need it if
          you modified `${configure_ac}'.  You might want to install the
@@ -165,7 +157,7 @@
     touch configure
     ;;
-  autoheader*)
+  autoheader)
     echo 1>&2 "\
 WARNING: `$1' is $msg.  You should only need it if
          you modified `acconfig.h' or `${configure_ac}'.  You might want
@@ -195,7 +187,7 @@
       while read f; do touch "$f"; done
     ;;
-  autom4te*)
+  autom4te)
     echo 1>&2 "\
 WARNING: `$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -218,7 +210,7 @@
     fi
     ;;
-  bison*|yacc*)
+  bison|yacc)
     echo 1>&2 "\
 WARNING: `$1' $msg.  You should only need it if
          you modified a `.y' file.  You may need the `Bison' package
@@ -248,7 +240,7 @@
     fi
     ;;
-  lex*|flex*)
+  lex|flex)
     echo 1>&2 "\
 WARNING: `$1' is $msg.  You should only need it if
          you modified a `.l' file.  You may need the `Flex' package
@@ -271,7 +263,7 @@
     fi
     ;;
-  help2man*)
+  help2man)
     echo 1>&2 "\
 WARNING: `$1' is $msg.  You should only need it if
     you modified a dependency of a manual page.  You may need the
@@ -285,11 +277,11 @@
     else
    test -z "$file" || exec >$file
    echo ".ab help2man is required to generate this page"
-	exit $?
+	exit 1
     fi
     ;;
-  makeinfo*)
+  makeinfo)
     echo 1>&2 "\
 WARNING: `$1' is $msg.  You should only need it if
          you modified a `.texi' or `.texinfo' file, or any other file
@@ -318,7 +310,7 @@
     touch $file
     ;;
-  tar*)
+  tar)
     shift
# We have already tried tar in the generic part.
@@ -371,6 +363,5 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
 # End:
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.18.1/src/subdialogs.ycp new/yast2-firewall-2.19.0/src/subdialogs.ycp
--- old/yast2-firewall-2.18.1/src/subdialogs.ycp	2009-10-17 21:59:37.000000000 +0200
+++ new/yast2-firewall-2.19.0/src/subdialogs.ycp	2009-11-26 19:20:11.000000000 +0100
@@ -4,7 +4,7 @@
  * Summary:     Configuration screens
  * Authors:     Lukas Ocilka locilka@suse.cz
  *
- * $Id: subdialogs.ycp 54536 2009-01-12 09:29:30Z locilka $
+ * $Id: subdialogs.ycp 59658 2009-11-20 12:16:59Z locilka $
  *
  * Configuration dialogs divided into smaller logic groups.
  * Both Expert and Simple.
@@ -210,7 +210,9 @@
    		`opt(`hstretch, `vstretch, `keepSorting),
    		`header (
    		    // TRANSLATORS: table header item
-			    _("Allowed Service")
+			    _("Allowed Service"),
+			    // TRANSLATORS: table header item
+			    _("Description")
        		), []
    	    ),
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.18.1/src/uifunctions.ycp new/yast2-firewall-2.19.0/src/uifunctions.ycp
--- old/yast2-firewall-2.18.1/src/uifunctions.ycp	2009-10-23 18:47:16.000000000 +0200
+++ new/yast2-firewall-2.19.0/src/uifunctions.ycp	2009-11-26 19:24:31.000000000 +0100
@@ -4,7 +4,7 @@
  * Summary:     Configuration dialogs handling functions
  * Authors:     Lukas Ocilka locilka@suse.cz
  *
- * $Id: uifunctions.ycp 59190 2009-10-23 16:46:57Z kmachalkova $
+ * $Id: uifunctions.ycp 59814 2009-11-26 18:24:30Z kmachalkova $
  *
  * Configuration dialogs handling.
  * Both Expert and Simple.
@@ -80,7 +80,7 @@
        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));
+	    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.]+$")) {
@@ -687,7 +687,7 @@
    } else {
        foreach (string service_name, string service_id, translations_to_service_ids, {
    	if (SuSEFirewall::IsServiceSupportedInZone(service_id, current_zone)) {
-		    allowed_services = add (allowed_services, `item(`id(service_id), service_name));
+		    allowed_services = add (allowed_services, `item(`id(service_id), service_name, SuSEFirewallServices::GetDescription(service_id)));
    	} else {
    	    not_allowed_services = add (not_allowed_services, `item(`id(service_id), service_name));
    	}
@@ -702,8 +702,6 @@
        ``(tolower(x[1]:"a") <= tolower(y[1]:"b"))
    );
-	y2milestone ("%1", not_allowed_services);
-
    UI::ChangeWidget(`id("table_allowed_services"), `Items, allowed_services);
    UI::ReplaceWidget(`id("allow_service_names_replacepoint"),
        // TRANSLATORS: select box
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    