Mailinglist Archive: opensuse-commit (1500 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package yast2
checked in at Mon Nov 13 15:04:33 CET 2006.

--------
--- yast2/yast2.changes	2006-11-08 09:44:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes	2006-11-13 14:43:24.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Nov 13 14:27:39 CET 2006 - locilka@xxxxxxx
+
+- Calling /sbin/SuSEfirewall2 (start|stop) instead of
+  Service::Start()/Service::Stop() for SuSEfirewall2_(init && setup)
+  (#215416).
+- Extended testsuite of SuSEFirewall module.
+- 2.14.11
+
+-------------------------------------------------------------------

Old:
----
  yast2-2.14.10.tar.bz2

New:
----
  yast2-2.14.11.tar.bz2

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

Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.lZLhPe/_old	2006-11-13 15:02:51.000000000 +0100
+++ /var/tmp/diff_new_pack.lZLhPe/_new	2006-11-13 15:02:51.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2 (Version 2.14.10)
+# spec file for package yast2 (Version 2.14.11)
 #
 # 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
-Version:        2.14.10
+Version:        2.14.11
 Release:        1
 License:        GNU General Public License (GPL) - all versions
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-2.14.10.tar.bz2
+Source0:        yast2-2.14.11.tar.bz2
 prefix:		/usr
 BuildRequires:  perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
 # Need the new file popups
@@ -97,7 +97,7 @@
     Steffen Winterfeldt <snwint@xxxxxxx>
 
 %prep
-%setup -n yast2-2.14.10
+%setup -n yast2-2.14.11
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -197,6 +197,12 @@
 %doc %{prefix}/share/doc/packages/yast2/wizard
 
 %changelog -n yast2
+* Mon Nov 13 2006 - locilka@xxxxxxx
+- Calling /sbin/SuSEfirewall2 (start|stop) instead of
+  Service::Start()/Service::Stop() for SuSEfirewall2_(init && setup)
+  (#215416).
+- Extended testsuite of SuSEFirewall module.
+- 2.14.11
 * Wed Nov 08 2006 - mvidner@xxxxxxx
 - Resubmitting to fix the build.
 - 2.14.10

++++++ yast2-2.14.10.tar.bz2 -> yast2-2.14.11.tar.bz2 ++++++
++++    9602 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-2.14.10/Makefile.am new/yast2-2.14.11/Makefile.am
--- old/yast2-2.14.10/Makefile.am	2006-10-23 14:02:51.000000000 +0200
+++ new/yast2-2.14.11/Makefile.am	2006-11-13 14:33:37.000000000 +0100
@@ -7,8 +7,7 @@
 #
 
 #where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
 
 VERSION			= $(shell cat $(srcdir)/VERSION)
 RPMNAME 		= $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
 # do we do Makefile.am for devtools? It is a little special...
 IS_DEVTOOLS		= $(findstring yast2-devtools,$(RPMNAME))
 
-DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
 ALL_PACKAGES		= $(DEVTOOLS_DIR)/admin/all-packages
 LEGALESE_DIR		= $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
 
@@ -34,7 +33,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 # where devtools instal m4 snippets
 # argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
 ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
 
 Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
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-2.14.10/VERSION new/yast2-2.14.11/VERSION
--- old/yast2-2.14.10/VERSION	2006-11-08 09:42:59.000000000 +0100
+++ new/yast2-2.14.11/VERSION	2006-11-13 14:27:33.000000000 +0100
@@ -1 +1 @@
-2.14.10
+2.14.11
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-2.14.10/configure.in new/yast2-2.14.11/configure.in
--- old/yast2-2.14.10/configure.in	2006-10-23 14:02:50.000000000 +0200
+++ new/yast2-2.14.11/configure.in	2006-11-13 14:33:36.000000000 +0100
@@ -1,9 +1,9 @@
 dnl configure.in for yast2
 dnl
-dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2, 2.14.6, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.14.11, http://bugs.opensuse.org/, yast2)
 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.14.6"
+VERSION="2.14.11"
 RPMNAME="yast2"
 MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"
 
@@ -120,6 +120,8 @@
     AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
 fi
 
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
 devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
 devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
 
@@ -152,6 +154,9 @@
 if test "$YCPC" = "false"; then
     AC_MSG_ERROR([ycpc is not installed])
 fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+    AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
 
 dnl Check packages expect and dejagnu
 AC_PATH_PROG(MYEXPECT, expect, 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-2.14.10/library/modules/Version.ycp new/yast2-2.14.11/library/modules/Version.ycp
--- old/yast2-2.14.10/library/modules/Version.ycp	2006-11-08 09:45:09.000000000 +0100
+++ new/yast2-2.14.11/library/modules/Version.ycp	2006-11-13 14:33:53.000000000 +0100
@@ -20,7 +20,7 @@
 /**
  * Version of the yast2 package
  */
-global string yast2 = "2.14.10";
+global string yast2 = "2.14.11";
 
 /* EOF */
 }
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-2.14.10/library/network/src/SuSEFirewall.ycp new/yast2-2.14.11/library/network/src/SuSEFirewall.ycp
--- old/yast2-2.14.10/library/network/src/SuSEFirewall.ycp	2006-11-03 10:45:25.000000000 +0100
+++ new/yast2-2.14.11/library/network/src/SuSEFirewall.ycp	2006-11-13 14:18:19.000000000 +0100
@@ -1023,14 +1023,32 @@
     global define boolean StartServices () {
 	boolean all_ok = true;
 
-	foreach (string service, firewall_services, {
-	    y2debug("Starting service: %1", service);
-
-	    if (! Service::Start(service)) {
-		all_ok = false;
-		y2error("Error starting service: %1", service);
-	    } 
-	});
+	// bug #215416
+	// SuSEfirewall2_init doesn't need to be called, only enabled
+	//foreach (string service, firewall_services, {
+	//    y2debug("Starting service: %1", service);
+	//
+	//    if (! Service::Start(service)) {
+	//	all_ok = false;
+	//	y2error("Error starting service: %1", service);
+	//    } 
+	//});
+
+	string tmpdir_file = (string) SCR::Read(.target.tmpdir);
+	if (tmpdir_file == nil || tmpdir_file == "") tmpdir_file = "/tmp";
+	tmpdir_file = tmpdir_file + "/SuSEfirewall2_YaST_output";
+	string command = sformat(
+	    "/sbin/SuSEfirewall2 start 2>'%1'; cat '%1'; rm -rf '%1'",
+	    tmpdir_file
+	);
+	y2milestone ("Starting firewall...");
+	map cmd = (map) SCR::Execute (.target.bash_output, command);
+	if (cmd["exit"]:nil != 0) {
+	    y2error ("Starting firewall: >%1< returned %2", command, cmd);
+	    all_ok = false;
+	} else {
+	    y2milestone ("Started");
+	}
 	
 	return all_ok;
     }
@@ -1043,14 +1061,32 @@
     global define boolean StopServices () {
 	boolean all_ok = true;
 
-	foreach (string service, firewall_services_reverse, {
-	    y2debug("Stopping service: %1", service);
-
-	    if (! Service::Stop (service)) {
-		y2error("Error stopping service: %1", service);
-		all_ok = false;
-	    }
-	});
+	// bug #215416
+	// SuSEfirewall2_init doesn't need to be called, only disabled
+	//foreach (string service, firewall_services_reverse, {
+	//    y2debug("Stopping service: %1", service);
+	//
+	//    if (! Service::Stop (service)) {
+	//	y2error("Error stopping service: %1", service);
+	//	all_ok = false;
+	//    }
+	//});
+
+	string tmpdir_file = (string) SCR::Read(.target.tmpdir);
+	if (tmpdir_file == nil || tmpdir_file == "") tmpdir_file = "/tmp";
+	tmpdir_file = tmpdir_file + "/SuSEfirewall2_YaST_output";
+	string command = sformat(
+	    "/sbin/SuSEfirewall2 stop 2>'%1'; cat '%1'; rm -rf '%1'",
+	    tmpdir_file
+	);
+	y2milestone ("Stopping firewall...");
+	map cmd = (map) SCR::Execute (.target.bash_output, command);
+	if (cmd["exit"]:nil != 0) {
+	    y2error ("Stopping firewall: >%1< returned %2", command, cmd);
+	    all_ok = false;
+	} else {
+	    y2milestone ("Stopped");
+	}
 
 	return all_ok;
     }
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-2.14.10/library/network/testsuite/tests/SuSEFirewall.out new/yast2-2.14.11/library/network/testsuite/tests/SuSEFirewall.out
--- old/yast2-2.14.10/library/network/testsuite/tests/SuSEFirewall.out	2006-09-20 12:45:01.000000000 +0200
+++ new/yast2-2.14.11/library/network/testsuite/tests/SuSEFirewall.out	2006-11-13 14:42:23.000000000 +0100
@@ -72,3 +72,9 @@
 Return	false
 Return	nil
 Return	true
+Dump	
+Dump	== Service Stop / Start ==
+Return	true
+Return	true
+Return	false
+Return	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-2.14.10/library/network/testsuite/tests/SuSEFirewall.ycp new/yast2-2.14.11/library/network/testsuite/tests/SuSEFirewall.ycp
--- old/yast2-2.14.10/library/network/testsuite/tests/SuSEFirewall.ycp	2006-09-20 12:45:00.000000000 +0200
+++ new/yast2-2.14.11/library/network/testsuite/tests/SuSEFirewall.ycp	2006-11-13 14:42:14.000000000 +0100
@@ -195,4 +195,19 @@
     TEST(``(SuSEFirewall::GetMasquerade()), [READ, WRITE, EXECUTE], nil);
     TEST(``(SuSEFirewall::SetMasquerade(true)), [READ, WRITE, EXECUTE], nil);
     TEST(``(SuSEFirewall::GetMasquerade()), [READ, WRITE, EXECUTE], nil);
+
+    map EXECUTE_OK = EXECUTE;
+    if (EXECUTE_OK["target"]:$[] == $[]) EXECUTE_OK["target"] = $[];
+    EXECUTE_OK["target","bash_output"] = $["exit":0, "stdout":"Some warnings about IPv6", "stderr":""];
+
+    map EXECUTE_ERR = EXECUTE;
+    if (EXECUTE_ERR["target"]:$[] == $[]) EXECUTE_ERR["target"] = $[];
+    EXECUTE_ERR["target","bash_output"] = $["exit":35, "stdout":"Some warnings about IPv6", "stderr":"Some errors!"];
+
+    DUMP("");
+    DUMP("== Service Stop / Start ==");
+    TEST(``(SuSEFirewall::StopServices()), [READ, WRITE, EXECUTE_OK], nil);
+    TEST(``(SuSEFirewall::StopServices()), [READ, WRITE, EXECUTE_OK], nil);
+    TEST(``(SuSEFirewall::StartServices()), [READ, WRITE, EXECUTE_ERR], nil);
+    TEST(``(SuSEFirewall::StartServices()), [READ, WRITE, EXECUTE_ERR], nil);
 }


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



Remember to have fun...

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