commit yast2-http-server

31 May 2006

Hello community,

here is the log from the commit of package yast2-http-server
checked in at Wed May 31 02:49:50 CEST 2006.

--------

--- yast2-http-server/yast2-http-server.changes	2006-05-15 11:30:04.000000000 +0200
+++ yast2-http-server/yast2-http-server.changes	2006-05-30 10:14:01.000000000 +0200
@@ -1,0 +2,10 @@
+Tue May 30 10:15:19 CEST 2006 - mzugec@suse.cz
+
+- fixed #176722 - assigned loopback for firewall 
+
+-------------------------------------------------------------------
+Tue May 30 09:02:51 CEST 2006 - mzugec@suse.cz
+
+- fixed #177797 - in wizard mode open/close firewall only for assigned zones
+
+-------------------------------------------------------------------

Old:
----
  yast2-http-server-2.13.15.tar.bz2

New:
----
  yast2-http-server-2.13.16.tar.bz2

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

Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.Opm9Kh/_old	2006-05-31 02:45:05.000000000 +0200
+++ /var/tmp/diff_new_pack.Opm9Kh/_new	2006-05-31 02:45:05.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-http-server (Version 2.13.15)
+# spec file for package yast2-http-server (Version 2.13.16)
 #
 # 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-http-server
-Version:        2.13.15
+Version:        2.13.16
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-http-server-2.13.15.tar.bz2
+Source0:        yast2-http-server-2.13.16.tar.bz2
 prefix:		/usr
 BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
 Requires:       yast2 yast2-network yast2-firewall yast2-perl-bindings libzio
@@ -34,7 +34,7 @@
     Stanislav Visnovsky <visnov@suse.cz>
 
 %prep
-%setup -n yast2-http-server-2.13.15
+%setup -n yast2-http-server-2.13.16
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -70,6 +70,10 @@
 %doc %{prefix}/share/doc/packages/yast2-http-server
 
 %changelog -n yast2-http-server
+* Tue May 30 2006 - mzugec@suse.cz
+- fixed #176722 - assigned loopback for firewall
+* Tue May 30 2006 - mzugec@suse.cz
+- fixed #177797 - in wizard mode open/close firewall only for assigned zones
 * Mon May 15 2006 - mzugec@suse.cz
 - fixed #175516 - open firewall on selected ports checkbox is always checked by default
 * Tue May 09 2006 - mzugec@suse.cz

++++++ yast2-http-server-2.13.15.tar.bz2 -> yast2-http-server-2.13.16.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.13.15/VERSION new/yast2-http-server-2.13.16/VERSION
--- old/yast2-http-server-2.13.15/VERSION	2006-05-15 11:27:24.000000000 +0200
+++ new/yast2-http-server-2.13.16/VERSION	2006-05-30 09:02:41.000000000 +0200
@@ -1 +1 @@
-2.13.15
+2.13.16
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.13.15/configure new/yast2-http-server-2.13.16/configure
--- old/yast2-http-server-2.13.15/configure	2006-05-15 11:22:40.000000000 +0200
+++ new/yast2-http-server-2.13.16/configure	2006-05-30 10:13:24.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-http-server 2.13.14.
+# Generated by GNU Autoconf 2.59 for yast2-http-server 2.13.16.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-http-server'
 PACKAGE_TARNAME='yast2-http-server'
-PACKAGE_VERSION='2.13.14'
-PACKAGE_STRING='yast2-http-server 2.13.14'
+PACKAGE_VERSION='2.13.16'
+PACKAGE_STRING='yast2-http-server 2.13.16'
 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-http-server 2.13.14 to adapt to many kinds of systems.
+\`configure' configures yast2-http-server 2.13.16 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-http-server 2.13.14:";;
+     short | recursive ) echo "Configuration of yast2-http-server 2.13.16:";;
    esac
   cat <<\_ACEOF
 
@@ -908,7 +908,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-http-server configure 2.13.14
+yast2-http-server configure 2.13.16
 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-http-server $as_me 2.13.14, which was
+It was created by yast2-http-server $as_me 2.13.16, 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-http-server'
- VERSION='2.13.14'
+ VERSION='2.13.16'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
 
 
 
-VERSION="2.13.14"
+VERSION="2.13.16"
 RPMNAME="yast2-http-server"
 MAINTAINER="Michal Zugec <mzugec@suse.cz>"
 
@@ -2693,7 +2693,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by yast2-http-server $as_me 2.13.14, which was
+This file was extended by yast2-http-server $as_me 2.13.16, 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-http-server config.status 2.13.14
+yast2-http-server config.status 2.13.16
 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-http-server-2.13.15/configure.in new/yast2-http-server-2.13.16/configure.in
--- old/yast2-http-server-2.13.15/configure.in	2006-05-15 11:22:34.000000000 +0200
+++ new/yast2-http-server-2.13.16/configure.in	2006-05-30 10:13:20.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-http-server, 2.13.14, http://bugs.opensuse.org/, yast2-http-server)
+AC_INIT(yast2-http-server, 2.13.16, http://bugs.opensuse.org/, yast2-http-server)
 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.14"
+VERSION="2.13.16"
 RPMNAME="yast2-http-server"
 MAINTAINER="Michal Zugec <mzugec@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.13.15/src/HttpServer.ycp new/yast2-http-server-2.13.16/src/HttpServer.ycp
--- old/yast2-http-server-2.13.15/src/HttpServer.ycp	2006-05-15 11:28:19.000000000 +0200
+++ new/yast2-http-server-2.13.16/src/HttpServer.ycp	2006-05-30 10:15:37.000000000 +0200
@@ -4,7 +4,7 @@
  * Summary:	Data for configuration of http-server, input and output functions.
  * Authors:	Stanislav Visnovsky <visnov@suse.cz>
  *
- * $Id: HttpServer.ycp 30910 2006-05-15 09:27:55Z mzugec $
+ * $Id: HttpServer.ycp 31186 2006-05-30 08:13:09Z mzugec $
  *
  * Representation of the configuration of http-server.
  * Input and output routines.
@@ -276,7 +276,6 @@
    
     // now, check the firewall status to set up the original status correctly
     firewall = true;
-    
     foreach (map<string,any> listen, YaST::HTTPDData::GetCurrentListen (),
     {
 	// find out the port and host
@@ -376,22 +375,35 @@
     // the ones from deleted Listen statements were closed in WriteListen    
   if (firewall_first)
    {
+list<string> zones = [];
+foreach(map<string, any> ifc, SuSEFirewall::GetAllKnownInterfaces(), {
+ if (!contains(zones, ifc["zone"]:"")) zones = add(zones, ifc["zone"]:"");
+});
+y2milestone("Firewall zones %1", zones);
+
     foreach (map<string,any> listen, YaST::HTTPDData::GetCurrentListen (),
     {
 	// find out the port and host
 	string port = listen["PORT"]:"";
 	string ip = listen["ADDRESS"]:"";
-	
+	// fixed #176722 - assigned loopback for firewall
+        if(ip == "127.0.0.1") continue;
 	if (!firewall)
 	{
 	    y2milestone ("Removing service %1:%2", ip, port);
-	    SuSEFirewall::RemoveService ( port, "TCP", ip2device[ip]:"all");
+	 if (ip2device[ip]:""=="") foreach(string zone, zones, {
+				SuSEFirewall::RemoveService ( port, "TCP", zone);
+				});
+		else  SuSEFirewall::RemoveService ( port, "TCP", ip2device[ip]:"all");
 	}
 	else
 	{
 	    y2milestone ("Adding service %1:%2", ip, port);
-	    SuSEFirewall::AddService ( port, "TCP", ip2device[ip]:"all");
 
+	 if (ip2device[ip]:""=="") foreach(string zone, zones, {
+				SuSEFirewall::AddService ( port, "TCP", zone);
+				});
+		else  SuSEFirewall::AddService ( port, "TCP", ip2device[ip]:"all");
 	}
     });
    }


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



Remember to have fun...

    

commit yast2-http-server

root＠suse.de