commit yast2-printer

28 Apr 2006

Hello community,

here is the log from the commit of package yast2-printer
checked in at Fri Apr 28 21:16:28 CEST 2006.

--------

--- yast2-printer/yast2-printer.changes	2006-04-26 18:36:31.000000000 +0200
+++ STABLE/yast2-printer/yast2-printer.changes	2006-04-28 13:19:01.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Apr 28 13:15:12 CEST 2006 - mzugec@suse.cz
+
+- fixed #169689 -  warning for propose button 
+
+-------------------------------------------------------------------
+Fri Apr 28 11:09:35 CEST 2006 - mzugec@suse.cz
+
+- fixed #169763 - ignore not used zones 
+
+-------------------------------------------------------------------

Old:
----
  yast2-printer-2.13.12.tar.bz2

New:
----
  yast2-printer-2.13.13.tar.bz2

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

Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.O36oy5/_old	2006-04-28 21:16:23.000000000 +0200
+++ /var/tmp/diff_new_pack.O36oy5/_new	2006-04-28 21:16:23.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-printer (Version 2.13.12)
+# spec file for package yast2-printer (Version 2.13.13)
 #
 # 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-printer
-Version:        2.13.12
-Release:        1
+Version:        2.13.13
+Release:        2
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-printer-2.13.12.tar.bz2
+Source0:        yast2-printer-2.13.13.tar.bz2
 prefix:		/usr
 BuildRequires:  blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite
 Requires:       yast2 netcat zlib blocxx
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -n yast2-printer-2.13.12
+%setup -n yast2-printer-2.13.13
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -100,6 +100,10 @@
 %doc %{prefix}/share/doc/packages/yast2-printer
 
 %changelog -n yast2-printer
+* Fri Apr 28 2006 - mzugec@suse.cz
+- fixed #169689 -  warning for propose button
+* Fri Apr 28 2006 - mzugec@suse.cz
+- fixed #169763 - ignore not used zones
 * Wed Apr 26 2006 - mzugec@suse.cz
 - fixed #169750 - media size not saved properly
 * Wed Apr 26 2006 - mzugec@suse.cz

++++++ yast2-printer-2.13.12.tar.bz2 -> yast2-printer-2.13.13.tar.bz2 ++++++
++++    4126 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-printer-2.13.12/VERSION new/yast2-printer-2.13.13/VERSION
--- old/yast2-printer-2.13.12/VERSION	2006-04-26 18:33:24.000000000 +0200
+++ new/yast2-printer-2.13.13/VERSION	2006-04-28 13:17:42.000000000 +0200
@@ -1 +1 @@
-2.13.12
+2.13.13
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-printer-2.13.12/configure.in new/yast2-printer-2.13.13/configure.in
--- old/yast2-printer-2.13.12/configure.in	2006-04-26 18:24:26.000000000 +0200
+++ new/yast2-printer-2.13.13/configure.in	2006-04-28 12:55:52.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-printer, 2.13.11, http://www.suse.de/feedback, yast2-printer)
+AC_INIT(yast2-printer, 2.13.13, http://www.suse.de/feedback, yast2-printer)
 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.13"
 RPMNAME="yast2-printer"
 MAINTAINER="Michal Zugec <mzugec@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-printer-2.13.12/src/common/dialogs.ycp new/yast2-printer-2.13.13/src/common/dialogs.ycp
--- old/yast2-printer-2.13.12/src/common/dialogs.ycp	2006-04-26 16:55:30.000000000 +0200
+++ new/yast2-printer-2.13.13/src/common/dialogs.ycp	2006-04-28 13:16:12.000000000 +0200
@@ -8,7 +8,7 @@
  * Authors:
  *  Petr Blahos <pblahos@suse.cz>
  *
- * $Id: dialogs.ycp 30499 2006-04-26 14:55:25Z mzugec $
+ * $Id: dialogs.ycp 30573 2006-04-28 11:16:06Z mzugec $
  * Main dialogs.
  */
 {
@@ -2129,7 +2129,7 @@
   if (new_spooler == "cups")
       {
         list < map<string,any> > items = maplist (map i, Printer::printcap, ``{
-y2internal("printcap %1", i);
+	y2milestone("printcap %1", i);
 	string def = "";
 	if (i["name"]:"unknown" == Printer::default_queue) def="Default";
                 return  $[      "ID":Printerlib::getReplacedString(Printerlib::getUriDevice (i["uri"]:""), false), 
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-printer-2.13.12/src/common/misc.ycp new/yast2-printer-2.13.13/src/common/misc.ycp
--- old/yast2-printer-2.13.12/src/common/misc.ycp	2006-04-14 18:25:40.000000000 +0200
+++ new/yast2-printer-2.13.13/src/common/misc.ycp	2006-04-28 13:16:12.000000000 +0200
@@ -12,7 +12,7 @@
  *  Petr Blahos <pblahos@suse.cz>
  *  Jiri Srain <jsrain@suse.cz>   2002
  *
- * $Id: misc.ycp 30149 2006-04-14 16:25:31Z mzugec $
+ * $Id: misc.ycp 30573 2006-04-28 11:16:06Z mzugec $
  *
  * Miscelaneous defines.
  */
@@ -723,14 +723,14 @@
     }
 
 string parseWarn(string incoming_text){
- y2internal("%1", incoming_text);
+ y2milestone("warn text before parse: %1", incoming_text);
  list <string> rows = splitstring(incoming_text, "\n");
  rows = filter(string row, rows, {
 	 if (find(row, "PASS")!=-1 || find(row, "Obsolete PPD")!=-1 || find(row, "REF: Page")!=-1) return false;
 		else return true;
 	});
  incoming_text = mergestring(rows, "\n");
-y2internal("%1", rows);
+y2milestone("warn text after parse: %1", rows);
  return incoming_text;
 }
 
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-printer-2.13.12/src/cups/dialogs-cups.ycp new/yast2-printer-2.13.13/src/cups/dialogs-cups.ycp
--- old/yast2-printer-2.13.12/src/cups/dialogs-cups.ycp	2006-04-26 16:55:30.000000000 +0200
+++ new/yast2-printer-2.13.13/src/cups/dialogs-cups.ycp	2006-04-28 13:16:12.000000000 +0200
@@ -8,7 +8,7 @@
  * Authors:
  *  Petr Blahos <pblahos@suse.cz>
  *
- * $Id: dialogs-cups.ycp 30499 2006-04-26 14:55:25Z mzugec $
+ * $Id: dialogs-cups.ycp 30573 2006-04-28 11:16:06Z mzugec $
  *
  * Main dialogs.
  */
@@ -1019,7 +1019,6 @@
 	Wizard::SetContentsButtons (_("CUPS Server Settings"), contents, getCupsServerHelp () + firewall_help, Label::BackButton (), Label::NextButton ());
 
 	list<string> addresses = CUPS::cups_server_settings["BrowseAddress"]:[];
-y2internal("BrowseAddress %1", addresses);
 
 	UI::ChangeWidget (`id (`browsing), `CurrentButton, CUPS::cups_server_settings["Browsing"]:["On"] == ["Off"] ? `off : `on);
 	// selectionbox
@@ -1046,9 +1045,11 @@
 		break;
 	    else if (`propose_server == ret)
 	    {
-		CUPS::ProposeServerSettings ();
-		addresses = CUPS::cups_server_settings["BrowseAddress"]:[];
-		UI::ReplaceWidget (`id (`replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"), addresses));
+		if ((size(addresses)>0 && Popup::ContinueCancel(_("Really replace with proposed value?")))||(size(addresses)==0)){
+		 CUPS::ProposeServerSettings ();
+		 addresses = CUPS::cups_server_settings["BrowseAddress"]:[];
+		 UI::ReplaceWidget (`id (`replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"), addresses));
+		}
 	    }
 	    else if (`change == ret)
 	    {
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-printer-2.13.12/src/modules/Printer.ycp new/yast2-printer-2.13.13/src/modules/Printer.ycp
--- old/yast2-printer-2.13.12/src/modules/Printer.ycp	2006-04-11 10:18:58.000000000 +0200
+++ new/yast2-printer-2.13.13/src/modules/Printer.ycp	2006-04-28 11:11:25.000000000 +0200
@@ -12,7 +12,7 @@
  *  Petr Blahos <pblahos@suse.cz>
  *  Jiri Srain <jsrain@suse.cz>
  *
- * $Id: Printer.ycp 29965 2006-04-11 08:18:52Z mzugec $
+ * $Id: Printer.ycp 30564 2006-04-28 09:11:21Z mzugec $
  *
  * Well we all know what modules are for.
  */
@@ -1826,8 +1826,10 @@
 		if (! Mode::config () && SuSEFirewall::IsEnabled ())
 		{
 		    map<string,boolean> service_status = $[];
-		    map<string,map<string,boolean> > ifaces_info
-			= SuSEFirewall::GetServices ([ "ipp-udp" ]);
+		    map<string,map<string,boolean> > ifaces_info = SuSEFirewall::GetServices ([ "ipp-udp" ]);
+
+
+
 		    foreach (string s, map<string,boolean> status, ifaces_info,{
 			foreach (string iface, boolean en, status, {
 			    service_status[iface]
@@ -1846,6 +1848,16 @@
 		    {
 			return iface;
 		    });
+	// fixed #169763 - do not include not used zones
+	 list <string> used_zones = [];
+	 boolean others_in_EXT = contains(SuSEFirewall::GetSpecialInterfacesInZone("EXT"), "any");
+	 foreach(map<string, any> interface, SuSEFirewall::GetAllKnownInterfaces (), {
+	  string zone=(string)interface["zone"]:"";
+	  if (zone == nil && others_in_EXT==true) zone="EXT";
+	  if (!contains(used_zones, zone)) used_zones=add(used_zones, zone);
+	 });
+	allowed_interfaces = filter(string ifce, allowed_interfaces, {return (contains(used_zones, ifce));});
+
 		    if (size (allowed_interfaces) == 0)
 		    {
 			summary = add (summary, "<li>" + sformat (
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-printer-2.13.12/src/modules/Spooler.ycp new/yast2-printer-2.13.13/src/modules/Spooler.ycp
--- old/yast2-printer-2.13.12/src/modules/Spooler.ycp	2006-03-21 08:59:07.000000000 +0100
+++ new/yast2-printer-2.13.13/src/modules/Spooler.ycp	2006-04-28 13:16:12.000000000 +0200
@@ -11,7 +11,7 @@
  * Authors:
  *   Jiri Srain <jsrain@suse.cz>
  *
- * $Id: Spooler.ycp 25847 2005-10-10 13:14:32Z mzugec $
+ * $Id: Spooler.ycp 30573 2006-04-28 11:16:06Z mzugec $
  *
  * Printer library exported functions. What else?!?
  */
@@ -586,7 +586,6 @@
       * @return boolean true on success
       */
     global define boolean restartServices (boolean have_some_queue) ``{
-y2internal("restarting spooler by restartServices()");
 	Spooler::StopServices ();
 // always adjust CUPS to be run (bugzilla 29413)
 	if (have_some_queue || (Spooler::Get () == "cups"))


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)