Hello community,
here is the log from the commit of package yast2-http-server
checked in at Wed Apr 23 00:32:50 CEST 2008.
--------
--- yast2-http-server/yast2-http-server.changes 2008-04-14 22:10:02.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-http-server/yast2-http-server.changes 2008-04-22 17:35:04.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 22 17:30:57 CEST 2008 - mzugec@suse.cz
+
+- fixed Missing "Open Firewall Ports" checkbox in wizard expert
+ (bnc#378742)
+- 2.16.7
+
+-------------------------------------------------------------------
Old:
----
yast2-http-server-2.16.6.tar.bz2
New:
----
yast2-http-server-2.16.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.f19325/_old 2008-04-23 00:32:30.000000000 +0200
+++ /var/tmp/diff_new_pack.f19325/_new 2008-04-23 00:32:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-http-server (Version 2.16.6)
+# spec file for package yast2-http-server (Version 2.16.7)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-http-server
-Version: 2.16.6
+Version: 2.16.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.16.6.tar.bz2
+Source0: yast2-http-server-2.16.7.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio 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-network yast2-perl-bindings libzio yast2-dns-server
@@ -37,7 +37,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-http-server-2.16.6
+%setup -n yast2-http-server-2.16.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,10 @@
/usr/lib/YaST2/servers_non_y2/*
%doc %{prefix}/share/doc/packages/yast2-http-server
%changelog
+* Tue Apr 22 2008 mzugec@suse.cz
+- fixed Missing "Open Firewall Ports" checkbox in wizard expert
+ (bnc#378742)
+- 2.16.7
* Thu Apr 03 2008 mzugec@suse.de
- check checksums from configuration files (FaTE#303374)
- 2.16.6
++++++ yast2-http-server-2.16.6.tar.bz2 -> yast2-http-server-2.16.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.16.6/configure new/yast2-http-server-2.16.7/configure
--- old/yast2-http-server-2.16.6/configure 2008-04-03 01:19:18.000000000 +0200
+++ new/yast2-http-server-2.16.7/configure 2008-04-22 17:23:22.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-http-server 2.16.5.
+# Generated by GNU Autoconf 2.61 for yast2-http-server 2.16.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-http-server'
PACKAGE_TARNAME='yast2-http-server'
-PACKAGE_VERSION='2.16.5'
-PACKAGE_STRING='yast2-http-server 2.16.5'
+PACKAGE_VERSION='2.16.6'
+PACKAGE_STRING='yast2-http-server 2.16.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.16.5 to adapt to many kinds of systems.
+\`configure' configures yast2-http-server 2.16.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-http-server 2.16.5:";;
+ short | recursive ) echo "Configuration of yast2-http-server 2.16.6:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-http-server configure 2.16.5
+yast2-http-server configure 2.16.6
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.16.5, which was
+It was created by yast2-http-server $as_me 2.16.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-http-server'
- VERSION='2.16.5'
+ VERSION='2.16.6'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.5"
+VERSION="2.16.6"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-http-server $as_me 2.16.5, which was
+This file was extended by yast2-http-server $as_me 2.16.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-http-server config.status 2.16.5
+yast2-http-server config.status 2.16.6
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.16.6/configure.in new/yast2-http-server-2.16.7/configure.in
--- old/yast2-http-server-2.16.6/configure.in 2008-04-03 01:19:11.000000000 +0200
+++ new/yast2-http-server-2.16.7/configure.in 2008-04-22 17:23:00.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-http-server, 2.16.5, http://bugs.opensuse.org/, yast2-http-server)
+AC_INIT(yast2-http-server, 2.16.6, http://bugs.opensuse.org/, yast2-http-server)
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.16.5"
+VERSION="2.16.6"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.16.6/src/dialogs.ycp new/yast2-http-server-2.16.7/src/dialogs.ycp
--- old/yast2-http-server-2.16.6/src/dialogs.ycp 2007-12-10 12:16:37.000000000 +0100
+++ new/yast2-http-server-2.16.7/src/dialogs.ycp 2008-04-22 17:33:33.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: dialogs.ycp 42675 2007-12-04 16:43:00Z mzugec $
+ * $Id: dialogs.ycp 46964 2008-04-22 15:33:32Z mzugec $
*/
{
@@ -112,7 +112,7 @@
*/
symbol OverviewDialog () {
string caption = _("HTTP Server Configuration");
- if (HttpServer::firewall_first) tabs_descr["listen", "widget_names"]= [ "server_enable", "LISTEN", "logs" ];
+// if (HttpServer::firewall_first) tabs_descr["listen", "widget_names"]= [ "server_enable", "LISTEN", "logs" ];
map widget_descr = $[
"tab": CWMTab::CreateWidget($[
"tab_order": [ "listen", "modules", "main_host", "hosts"],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.16.6/src/HttpServerWidgets.ycp new/yast2-http-server-2.16.7/src/HttpServerWidgets.ycp
--- old/yast2-http-server-2.16.6/src/HttpServerWidgets.ycp 2008-03-18 22:36:34.000000000 +0100
+++ new/yast2-http-server-2.16.7/src/HttpServerWidgets.ycp 2008-04-22 17:33:33.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: HttpServerWidgets.ycp 44783 2008-02-21 16:44:29Z mzugec $
+ * $Id: HttpServerWidgets.ycp 46964 2008-04-22 15:33:32Z mzugec $
*/
{
@@ -1407,14 +1407,6 @@
"help" : HELPS["firewall_adapt"]:"",
"display_details" : true,
]),
- "firewall_first" : $[
- "widget" : `checkbox,
- // translators: checkbox label
- "label" : _("Open &Firewall on Selected Ports"),
- "help" : HELPS["firewall_adapt"]:"",
- "init" : initAdaptFirewall,
- "store" : storeAdaptFirewall,
- ],
"host" : hostwidget,
"LISTEN" : $[
"widget" : `custom,
@@ -2706,33 +2698,6 @@
return nil;
}
-// ************************************ Adapt firewall widget ********************
-
- /**
- * Initialization function for firewall adapting
- * @param key any option key to be initialized
- */
- global void initAdaptFirewall (string key) ``{
- if( SuSEFirewall::IsStarted() ) {
- UI::ChangeWidget (`id (key), `Value, HttpServer::getFirewallStatus());
- UI::ChangeWidget (`id (key), `Enabled, true );
- } else {
- // disable the widget
- UI::ChangeWidget (`id (key), `Enabled, false );
- }
- }
-
- /**
- * Store function for firewall adapting
- * @param opt_id any option id
- * @param event map event description
- */
- global void storeAdaptFirewall (string opt_id, map event) ``{
- if( SuSEFirewall::IsStarted() ) {
- HttpServer::firewall = (boolean)UI::QueryWidget (`id (opt_id), `Value);
- HttpServer::modified = true;
- }
- }
/* these are for future use: */
// error message - the entered ip address is not found
@@ -2828,33 +2793,6 @@
}
- /**
- * Initialize firewall settings
- * @param key string
- */
-global define void initFwOpen (string key) ``{
- y2milestone("initializing firewall open ...");
- if( SuSEFirewall::IsStarted() ) {
- UI::ChangeWidget (`id (key), `Value, true);
- UI::ChangeWidget (`id (key), `Enabled, true );
- } else {
- // disable the widget
- UI::ChangeWidget (`id (key), `Enabled, false );
- }
-}
-
- /**
- * Store firewall settings
- * @param opt_id string
- * @param event map
- */
- global define void storeFwOpen (string opt_id, map event) ``{
- if( SuSEFirewall::IsEnabled() || Mode::config ()) {
- HttpServer::firewall = (boolean)UI::QueryWidget (`id (opt_id), `Value);
- HttpServer::modified = true;
- }
- }
-
// *********************** Wizard Dialog 2 Widgets *****************************************
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.16.6/src/HttpServer.ycp new/yast2-http-server-2.16.7/src/HttpServer.ycp
--- old/yast2-http-server-2.16.6/src/HttpServer.ycp 2008-04-03 01:21:33.000000000 +0200
+++ new/yast2-http-server-2.16.7/src/HttpServer.ycp 2008-04-22 17:33:33.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of http-server, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: HttpServer.ycp 46626 2008-04-14 20:08:48Z mzugec $
+ * $Id: HttpServer.ycp 46964 2008-04-22 15:33:32Z mzugec $
*
* Representation of the configuration of http-server.
* Input and output routines.
@@ -71,18 +71,12 @@
include "http-server/routines.ycp";
-global boolean firewall = false;
-global boolean firewall_first = true;
-
/**
* Mapping of IPs to network devices
*/
global map ip2device = $[];
-global boolean getFirewallStatus(){
- return firewall;
-}
list<string> files_to_check = ["/etc/sysconfig/apache2", "/etc/apache2/default-server.conf", "/etc/apache2/httpd.conf", "/etc/apache2/listen.conf", "/etc/apache2/vhosts.d/yast2_vhosts.conf"];
@@ -195,7 +189,6 @@
configured_dns = true;
}
Progress::set(true); //on();
-// firewall_started = SuSEFirewall::IsEnabled(); //Service::Enabled( "SuSEfirewall2_final" );
// read current settings from httpd.conf and sysconfig
Progress::NextStage();
@@ -283,28 +276,6 @@
y2milestone ("Mapping of IP addresses and network devices: %1", ip2device);
- // now, check the firewall status to set up the original status correctly
- firewall = true;
- foreach (map listen, YaST::HTTPDData::GetCurrentListen (),
- {
- // find out the port and host
- string port = listen["PORT"]:"";
- string ip = listen["ADDRESS"]:"";
-
- firewall = SuSEFirewall::HaveService ( port, "TCP", ip2device[ip]:"any");
-
- if (!firewall && port == "80")
- {
- // also try http name
- firewall = SuSEFirewall::HaveService ( "http", "TCP", ip2device[ip]:"any");
- }
-
- y2milestone ("Status of firewall for %2:%1: %3", ip, port, firewall);
-
- // the firewall is not properly opened
- if (! firewall)
- break;
- });
Progress::set(true); //on();
@@ -432,6 +403,9 @@
Report::Error( Message::CannotAdjustService("apache2") );
}
}
+ // configuration test
+// map test = (map)SCR::Execute(.target.bash_output, "apache2ctl conftest");
+//y2internal("test %1", test);
foreach(string file, files_to_check, {
FileChanges::StoreFileCheckSum( file );
@@ -540,12 +514,6 @@
{
YaST::HTTPDData::ModifyService (s["service"]:false);
}
-
- // setup firewall
- if (haskey( s, "firewall" ))
- {
- firewall = s["firewall"]:false;
- }
modified = false;
configured = true;
@@ -614,7 +582,6 @@
"hosts" : hosts,
"Listen": YaST::HTTPDData::GetCurrentListen(),
"service" : YaST::HTTPDData::GetService (),
- "firewall" : firewall,
];
configured = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.16.6/src/wizard-dialog.ycp new/yast2-http-server-2.16.7/src/wizard-dialog.ycp
--- old/yast2-http-server-2.16.6/src/wizard-dialog.ycp 2008-01-22 15:24:53.000000000 +0100
+++ new/yast2-http-server-2.16.7/src/wizard-dialog.ycp 2008-04-22 17:33:33.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs for wizard
* Authors: Michal Zugec
*
- * $Id: wizard-dialog.ycp 43825 2008-01-22 14:24:53Z mzugec $
+ * $Id: wizard-dialog.ycp 46964 2008-04-22 15:33:32Z mzugec $
*/
{
@@ -32,13 +32,14 @@
`VSpacing(0.5),
"listen_interfaces",
`VSpacing(0.5),
- "firewall_first",
+// "firewall_first",
+ "firewall_adapt",
`VSpacing(8)
),
`HStretch()
// )
);
- list<string> widget_names = ["open_port", "listen_interfaces", "firewall_first"];
+ list<string> widget_names = ["open_port", "listen_interfaces", /*"firewall_first"*/"firewall_adapt"];
list