commit yast2-firewall

2 Oct 2006

Hello community,

here is the log from the commit of package yast2-firewall
checked in at Mon Oct 2 11:42:20 CEST 2006.

--------

--- yast2-firewall/yast2-firewall.changes	2006-08-11 10:42:46.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-firewall/yast2-firewall.changes	2006-10-02 09:04:46.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Oct  2 09:02:40 CEST 2006 - locilka@suse.cz
+
+- Added missing firewall icon to all dialogs
+- Removed warning pop-up message that firewall will be
+  started/stopped when it gets enabled/disabled.
+- 2.13.12
+
+-------------------------------------------------------------------

Old:
----
  yast2-firewall-2.13.11.tar.bz2

New:
----
  yast2-firewall-2.13.12.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-firewall.spec ++++++
--- /var/tmp/diff_new_pack.PS264D/_old	2006-10-02 11:42:11.000000000 +0200
+++ /var/tmp/diff_new_pack.PS264D/_new	2006-10-02 11:42:11.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-firewall (Version 2.13.11)
+# spec file for package yast2-firewall (Version 2.13.12)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-firewall
-Version:        2.13.11
+Version:        2.13.12
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-firewall-2.13.11.tar.bz2
+Source0:        yast2-firewall-2.13.12.tar.bz2
 prefix:		/usr
 BuildRequires:  perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
 Requires:       yast2 >= 2.13.70
@@ -39,7 +39,7 @@
     Lukas Ocilka <locilka@suse.de>
 
 %prep
-%setup -n yast2-firewall-2.13.11
+%setup -n yast2-firewall-2.13.12
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -72,6 +72,11 @@
 %doc %{prefix}/share/doc/packages/yast2-firewall
 
 %changelog -n yast2-firewall
+* Mon Oct 02 2006 - locilka@suse.cz
+- Added missing firewall icon to all dialogs
+- Removed warning pop-up message that firewall will be
+  started/stopped when it gets enabled/disabled.
+- 2.13.12
 * Fri Aug 11 2006 - locilka@suse.cz
 - Fixed BuildRequires loop: removing yast2-installation (#198412).
 - Added missing SuSEFirewallUI module.

++++++ yast2-firewall-2.13.11.tar.bz2 -> yast2-firewall-2.13.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.11/VERSION new/yast2-firewall-2.13.12/VERSION
--- old/yast2-firewall-2.13.11/VERSION	2006-08-11 10:41:34.000000000 +0200
+++ new/yast2-firewall-2.13.12/VERSION	2006-10-02 09:04:56.000000000 +0200
@@ -1 +1 @@
-2.13.11
+2.13.12
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.11/configure new/yast2-firewall-2.13.12/configure
--- old/yast2-firewall-2.13.11/configure	2006-08-11 10:45:58.000000000 +0200
+++ new/yast2-firewall-2.13.12/configure	2006-10-02 09:06:12.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-firewall 2.13.11.
+# Generated by GNU Autoconf 2.59 for yast2-firewall 2.13.12.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-firewall'
 PACKAGE_TARNAME='yast2-firewall'
-PACKAGE_VERSION='2.13.11'
-PACKAGE_STRING='yast2-firewall 2.13.11'
+PACKAGE_VERSION='2.13.12'
+PACKAGE_STRING='yast2-firewall 2.13.12'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 
 ac_unique_file="RPMNAME"
@@ -728,7 +728,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.13.11 to adapt to many kinds of systems.
+\`configure' configures yast2-firewall 2.13.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -795,7 +795,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yast2-firewall 2.13.11:";;
+     short | recursive ) echo "Configuration of yast2-firewall 2.13.12:";;
    esac
   cat <<\_ACEOF
 
@@ -908,7 +908,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-firewall configure 2.13.11
+yast2-firewall configure 2.13.12
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.13.11, which was
+It was created by yast2-firewall $as_me 2.13.12, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1652,7 +1652,7 @@
 
 # Define the identity of the package.
  PACKAGE='yast2-firewall'
- VERSION='2.13.11'
+ VERSION='2.13.12'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
 
 
 
-VERSION="2.13.11"
+VERSION="2.13.12"
 RPMNAME="yast2-firewall"
 MAINTAINER="Lukas Ocilka <locilka@suse.cz>"
 
@@ -2693,7 +2693,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by yast2-firewall $as_me 2.13.11, which was
+This file was extended by yast2-firewall $as_me 2.13.12, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-yast2-firewall config.status 2.13.11
+yast2-firewall config.status 2.13.12
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.11/configure.in new/yast2-firewall-2.13.12/configure.in
--- old/yast2-firewall-2.13.11/configure.in	2006-08-11 10:45:54.000000000 +0200
+++ new/yast2-firewall-2.13.12/configure.in	2006-10-02 09:06:08.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-firewall, 2.13.11, http://bugs.opensuse.org/, yast2-firewall)
+AC_INIT(yast2-firewall, 2.13.12, http://bugs.opensuse.org/, yast2-firewall)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -17,7 +17,7 @@
 AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
 
 dnl Important YaST2 variables
-VERSION="2.13.11"
+VERSION="2.13.12"
 RPMNAME="yast2-firewall"
 MAINTAINER="Lukas Ocilka <locilka@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.11/src/dialogs.ycp new/yast2-firewall-2.13.12/src/dialogs.ycp
--- old/yast2-firewall-2.13.11/src/dialogs.ycp	2006-08-10 10:22:34.000000000 +0200
+++ new/yast2-firewall-2.13.12/src/dialogs.ycp	2006-10-02 09:05:32.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:     Configuration dialogs and workflow
  * Authors:     Lukas Ocilka <locilka@suse.cz>
  *
- * $Id: dialogs.ycp 31930 2006-07-18 12:59:16Z locilka $
+ * $Id: dialogs.ycp 33202 2006-10-02 07:05:30Z locilka $
  *
  * Configuration dialogs and workflow.
  * Both Expert and Simple.
@@ -255,6 +255,7 @@
 	    HelpForDialog("box-summary"),
 	    Label::BackButton (), Label::AcceptButton ()
 	);
+	Wizard::SetDesktopIcon("firewall");
 	UI::ChangeWidget(`id(`back), `Enabled, true);
 
 	InitBoxSummary([]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.11/src/uifunctions.ycp new/yast2-firewall-2.13.12/src/uifunctions.ycp
--- old/yast2-firewall-2.13.11/src/uifunctions.ycp	2006-08-10 10:22:34.000000000 +0200
+++ new/yast2-firewall-2.13.12/src/uifunctions.ycp	2006-10-02 09:05:32.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:     Configuration dialogs handling functions
  * Authors:     Lukas Ocilka <locilka@suse.cz>
  *
- * $Id: uifunctions.ycp 31903 2006-07-17 14:00:01Z locilka $
+ * $Id: uifunctions.ycp 33202 2006-10-02 07:05:30Z locilka $
  *
  * Configuration dialogs handling.
  * Both Expert and Simple.
@@ -55,6 +55,7 @@
      * Fake function for CWM Tree Widget.
      */
     void DisableBackButton (string key) {
+	Wizard::SetDesktopIcon("firewall");
 	UI::ChangeWidget(`id(`back), `Enabled, false);
     }
 
@@ -165,6 +166,7 @@
      * Function initializes Interfaces table and known_device_names
      */
     void InitFirewallInterfaces (string key) {
+	Wizard::SetDesktopIcon("firewall");
 
 	// initializing names of interfaces
 	known_device_names = $[];
@@ -608,6 +610,8 @@
     }
 
     void InitAllowedServices (string key) {
+	Wizard::SetDesktopIcon("firewall");
+
 	if (SuSEFirewall::GetProtectFromInternalZone()) {
 	    UI::ChangeWidget(`id("protect_from_internal"), `Value, true);
 	} else {
@@ -712,6 +716,8 @@
     }
 
     void InitMasquerading (string key) {
+	Wizard::SetDesktopIcon("firewall");
+    
 	boolean masquerade = SuSEFirewall::GetMasquerade();
 	boolean masquerade_possible = IsMasqueradingPossible();
 
@@ -934,6 +940,8 @@
     }
 
     void InitRedirectToMasqueradedIP (string key) {
+	Wizard::SetDesktopIcon("firewall");
+	
 	RedrawRedirectToMasqueradedIPTable();
     }
 
@@ -955,6 +963,8 @@
 
     // IPsec support opens IPsec traffic from external zone
     void InitIPsecSupport (string key) {
+	Wizard::SetDesktopIcon("firewall");
+	
 	boolean supported = SuSEFirewall::IsServiceSupportedInZone("ipsec", "EXT");
 	UI::ChangeWidget(`id("ispsec_support"), `Value, supported);
     }    
@@ -975,6 +985,8 @@
     }
 
     void InitLoggingLevel (string key) {
+	Wizard::SetDesktopIcon("firewall");
+	
 	UI::ChangeWidget(`id("logging_ACCEPT"), `Value, SuSEFirewall::GetLoggingSettings("ACCEPT"));
 	UI::ChangeWidget(`id("logging_DROP"),   `Value, SuSEFirewall::GetLoggingSettings("DROP"));
     }
@@ -987,6 +999,8 @@
     }
 
     void InitBroadcastConfigurationSimple (string key) {
+	Wizard::SetDesktopIcon("firewall");
+	
 	term replace_dialog = `VBox();
 
 	map <string, list <string> > allowed_bcast_ports = SuSEFirewall::GetBroadcastAllowedPorts ();
@@ -1030,47 +1044,6 @@
     }
 
     void SetEnableFirewall (boolean new_state) {
-	// Checks the current firewall service state
-	if (SuSEFirewall::GetEnableService() == new_state) {
-	    return;
-	}
-
-	if (Mode::config() || Mode::installation() || Mode::normal()) {
-	    string question_headline = "";
-	    string question_text = "";
-
-	    // enabling firewall
-	    if (new_state) {
-		// TRANSLATORS: popup question headline
-		question_headline = _("Enabling Firewall");
-		// TRANSLATORS: popup question, enabling firewall
-		question_text = _("You are just about to enable the firewall service.
-This will enable the firewall in the boot process and also start it
-immediately after the firewall configuration gets written.
-
-Are you sure you want to enable it?");
-		// disabling firewall
-	    } else {
-		// TRANSLATORS: popup question headline
-		question_headline = _("Disabling Firewall");
-		// TRANSLATORS: popup question, disabling firewall
-		question_text = _("You are just about to disable the firewall service.
-This will disable the firewall in the boot process and also start it
-immediately after the firewall configuration gets written.
-
-Are you sure you want to disable it?");
-	    }
-
-	    // Ask users whether they are sure to do it
-	    if (! Popup::YesNoHeadline (
-		question_headline,
-		question_text
-	    )) {
-		// denied
-		return;
-	    }
-	}
-	    
 	y2milestone("New Settings - Firewall Enabled: %1, Firewall Started: %1 (after Write())", new_state);
 	
 	// Changes the default values - Enable and Start at once


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)