Hello community,
here is the log from the commit of package yast2-http-server
checked in at Tue Dec 4 19:34:27 CET 2007.
--------
--- yast2-http-server/yast2-http-server.changes 2007-08-22 14:49:08.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-http-server/yast2-http-server.changes 2007-12-04 17:44:03.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Dec 4 17:41:00 CET 2007 - mzugec@suse.cz
+
+- into IP addresses include also IPs from dhcp interfaces
+- improved vhost validation for name-based vhost (#342844)
+- 2.15.8
+
+-------------------------------------------------------------------
Old:
----
yast2-http-server-2.15.7.tar.bz2
New:
----
yast2-http-server-2.15.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.D13748/_old 2007-12-04 19:34:17.000000000 +0100
+++ /var/tmp/diff_new_pack.D13748/_new 2007-12-04 19:34:17.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-http-server (Version 2.15.7)
+# spec file for package yast2-http-server (Version 2.15.8)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,17 @@
# norootforbuild
Name: yast2-http-server
-Version: 2.15.7
+Version: 2.15.8
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.15.7.tar.bz2
-prefix: /usr
+Source0: yast2-http-server-2.15.8.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 yast2-network yast2-perl-bindings libzio yast2-dns-server
Requires: yast2 >= 2.15.30
-BuildArchitectures: noarch
+BuildArch: noarch
Summary: YaST2 - HTTP Server Configuration
%description
@@ -35,7 +35,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-http-server-2.15.7
+%setup -n yast2-http-server-2.15.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,8 +70,11 @@
/usr/share/YaST2/scrconf/*
/usr/lib/YaST2/servers_non_y2/*
%doc %{prefix}/share/doc/packages/yast2-http-server
-
%changelog
+* Tue Dec 04 2007 - mzugec@suse.cz
+- into IP addresses include also IPs from dhcp interfaces
+- improved vhost validation for name-based vhost (#342844)
+- 2.15.8
* Wed Aug 22 2007 - mzugec@suse.cz
- don't forget values for vhost when go next-back (#299223)
- 2.15.7
++++++ yast2-http-server-2.15.7.tar.bz2 -> yast2-http-server-2.15.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.7/configure new/yast2-http-server-2.15.8/configure
--- old/yast2-http-server-2.15.7/configure 2007-08-22 14:45:21.000000000 +0200
+++ new/yast2-http-server-2.15.8/configure 2007-12-04 17:40:02.000000000 +0100
@@ -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.15.6.
+# Generated by GNU Autoconf 2.61 for yast2-http-server 2.15.7.
#
# 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.15.6'
-PACKAGE_STRING='yast2-http-server 2.15.6'
+PACKAGE_VERSION='2.15.7'
+PACKAGE_STRING='yast2-http-server 2.15.7'
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.15.6 to adapt to many kinds of systems.
+\`configure' configures yast2-http-server 2.15.7 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.15.6:";;
+ short | recursive ) echo "Configuration of yast2-http-server 2.15.7:";;
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.15.6
+yast2-http-server configure 2.15.7
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.15.6, which was
+It was created by yast2-http-server $as_me 2.15.7, 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.15.6'
+ VERSION='2.15.7'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.15.6"
+VERSION="2.15.7"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
@@ -3303,7 +3303,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.15.6, which was
+This file was extended by yast2-http-server $as_me 2.15.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3346,7 +3346,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-http-server config.status 2.15.6
+yast2-http-server config.status 2.15.7
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.15.7/configure.in new/yast2-http-server-2.15.8/configure.in
--- old/yast2-http-server-2.15.7/configure.in 2007-08-22 14:45:17.000000000 +0200
+++ new/yast2-http-server-2.15.8/configure.in 2007-12-04 17:39:47.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-http-server
dnl
-dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-http-server, 2.15.6, http://bugs.opensuse.org/, yast2-http-server)
+AC_INIT(yast2-http-server, 2.15.7, 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.15.6"
+VERSION="2.15.7"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.7/Makefile.am new/yast2-http-server-2.15.8/Makefile.am
--- old/yast2-http-server-2.15.7/Makefile.am 2007-08-22 14:45:17.000000000 +0200
+++ new/yast2-http-server-2.15.8/Makefile.am 2007-12-04 17:39:48.000000000 +0100
@@ -30,7 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.7/Makefile.in new/yast2-http-server-2.15.8/Makefile.in
--- old/yast2-http-server-2.15.7/Makefile.in 2007-08-22 14:45:22.000000000 +0200
+++ new/yast2-http-server-2.15.8/Makefile.in 2007-12-04 17:40:05.000000000 +0100
@@ -86,8 +86,8 @@
{ test ! -d $(distdir) \
|| { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
@@ -222,7 +222,7 @@
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
@@ -517,7 +517,6 @@
$(am__remove_distdir)
dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.7/src/dialogs.ycp new/yast2-http-server-2.15.8/src/dialogs.ycp
--- old/yast2-http-server-2.15.7/src/dialogs.ycp 2007-08-22 14:49:05.000000000 +0200
+++ new/yast2-http-server-2.15.8/src/dialogs.ycp 2007-12-04 17:43:01.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: dialogs.ycp 40403 2007-08-22 12:48:29Z mzugec $
+ * $Id: dialogs.ycp 42675 2007-12-04 16:43:00Z mzugec $
*/
{
@@ -129,6 +129,7 @@
contents = CWM::PrepareDialog(contents, w);
Wizard::SetContentsButtons(caption, contents, help, Label::BackButton (), Label::FinishButton ());
+ Wizard::RestoreAbortButton();
Wizard::DisableBackButton();
symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.7/src/HttpServerWidgets.ycp new/yast2-http-server-2.15.8/src/HttpServerWidgets.ycp
--- old/yast2-http-server-2.15.7/src/HttpServerWidgets.ycp 2007-08-22 14:49:05.000000000 +0200
+++ new/yast2-http-server-2.15.8/src/HttpServerWidgets.ycp 2007-12-04 17:43:01.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: HttpServerWidgets.ycp 40403 2007-08-22 12:48:29Z mzugec $
+ * $Id: HttpServerWidgets.ycp 42675 2007-12-04 16:43:00Z mzugec $
*/
{
@@ -1042,19 +1042,19 @@
global define void storeVhostId (string opt_id, map event) ``{
}
-define string changeVHostPopup(){
+define string changeVHostPopup(string value){
string vhost="";
- string servername = ""; foreach(integer num, map row, host_options, {if (row["KEY"]:"" == "ServerName") servername = row["VALUE"]:"";});
list items = maplist( string ip, string dev, HttpServer::ip2device, ``(ip) );
UI::OpenDialog(
`RadioButtonGroup(`id(`rb),
`VBox(
- `Left(`RadioButton(`id(`ms),`opt(`notify), "", true)),
+ `Left( `RadioButton(`id(`all_addr),`opt(`notify), _("All addresses (*)"), true)),
+ `Left(`RadioButton(`id(`multiselect),`opt(`notify), "")),
`MultiSelectionBox( `id(`ipaddress),
_("IP Adresses"), items )
,
- `Left(`RadioButton(`id(`sn),`opt(`notify), "")),
- `TextEntry(`id(`serv_name), _("ServerName"), servername)
+ `Left(`RadioButton(`id(`custom),`opt(`notify), "")),
+ `TextEntry(`id(`serv_name), _("ServerName"))
,
`VSpacing(),
`HBox(
@@ -1064,27 +1064,49 @@
)
)
);
+ if (value=="*" || value=="") UI::ChangeWidget(`serv_name, `Value, value);
+ else {
+ list<term> it=[];
+ foreach(string ip, (list<string>)items, {
+ it=add(it, `item(`id(ip), ip, contains(splitstring(value, " "), ip)) );
+ });
+ boolean unknown = false;
+ foreach(string ip, splitstring(value, " "), {
+ if (!contains(items, ip)) unknown = true;
+ });
+ if (unknown){
+ UI::ChangeWidget(`serv_name, `Value, value);
+ UI::ChangeWidget(`rb, `CurrentButton, `custom);
+ } else {
+ UI::ChangeWidget(`ipaddress, `Items, it);
+ UI::ChangeWidget(`rb, `CurrentButton, `multiselect);
+ }
+ }
symbol ret = nil;
do{
- if(UI::QueryWidget(`id(`rb), `CurrentButton)==`ms){
- UI::ChangeWidget(`id(`ipaddress), `Enabled, true);
- UI::ChangeWidget(`id(`serv_name), `Enabled, false);
- }else{
- UI::ChangeWidget(`id(`ipaddress), `Enabled, false);
- UI::ChangeWidget(`id(`serv_name), `Enabled, true);
- }
+ symbol rb = (symbol)UI::QueryWidget(`id(`rb), `CurrentButton);
+ UI::ChangeWidget(`id(`ipaddress), `Enabled, rb==`multiselect);
+ UI::ChangeWidget(`id(`serv_name), `Enabled, rb==`custom);
ret = (symbol) UI::UserInput();
} while( ret != `ok && ret != `cancel );
if( ret == `ok ) {
- if(UI::QueryWidget(`id(`rb), `CurrentButton)==`ms){
+ switch((symbol)UI::QueryWidget(`id(`rb), `CurrentButton)){
+ case `all_addr:
+ vhost="*";
+ break;
+ case `multiselect:
list<string> selected=(list<string>)UI::QueryWidget(`id(`ipaddress), `SelectedItems);
- if (size(selected)==size(items)) vhost="*";
- else vhost = mergestring(selected, " ");
- } else {
- vhost=(string)UI::QueryWidget(`id(`serv_name), `Value);
- }
- } else vhost="";
+ vhost = mergestring(selected, " ");
+ break;
+ case `custom:
+ vhost=(string)UI::QueryWidget(`id(`serv_name), `Value);
+ break;
+ default:
+ vhost="";
+ y2warning("unrecognized selection");
+ }
+ }
UI::CloseDialog();
return vhost;
}
@@ -1092,7 +1114,7 @@
global define symbol handleVhostRest (string key, map event){
if (event["EventReason"]:""=="Activated" && event["ID"]:nil ==`change_vhost){
- string vhost = changeVHostPopup();
+ string vhost = changeVHostPopup((string)UI::QueryWidget(`virtual_host, `Value));
if (size(vhost)>0) UI::ChangeWidget(`id(`virtual_host), `Value, vhost);
}
return nil;
@@ -1105,6 +1127,22 @@
Popup::Error(_("Name for VirtualHost ID can't be empty."));
return false;
}
+
+ // for name-based vhost only IP address is allowed
+ // or regexp (* or *:port) or list of IP addresses
+ if (UI::QueryWidget(`resolution, `Value)==`name_based) {
+ // regexp matches '*' and '*:80'
+ if (regexpmatch(vhost, "^\\*$\|^\\*:[[:digit:]]\+$")) return true;
+ boolean ok=true;
+ foreach(string ip, splitstring(vhost, " "), {
+ if (!IP::Check4(ip)) ok=false;
+ });
+ if (!ok) Popup::Warning(_("To use name-based virtual hosting,
+you must designate the IP address on the server
+that will be accepting requests for the hosts.
+Also * for all addresses and *:port are acceptable."));
+ return ok;
+ }
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.7/src/HttpServer.ycp new/yast2-http-server-2.15.8/src/HttpServer.ycp
--- old/yast2-http-server-2.15.7/src/HttpServer.ycp 2007-08-16 16:12:02.000000000 +0200
+++ new/yast2-http-server-2.15.8/src/HttpServer.ycp 2007-12-04 17:43:01.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of http-server, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: HttpServer.ycp 37597 2007-04-19 14:43:29Z mzugec $
+ * $Id: HttpServer.ycp 42675 2007-12-04 16:43:00Z mzugec $
*
* Representation of the configuration of http-server.
* Input and output routines.
@@ -245,6 +245,8 @@
// add DHCP ones, if we can find out the current IP
devs = NetworkDevices::Locate("BOOTPROTO", "dhcp");
foreach(string dev, devs, {
+/*
+y2internal("dhcp devs %1", devs);
// first, convert to the current name
map output = (map)SCR::Execute (.target.bash_output, "/sbin/getcfg-interface " + dev);
@@ -254,8 +256,8 @@
}
string device = output["stdout"]:"";
-
- output = (map)SCR::Execute (.target.bash_output, "/sbin/ifconfig "+device, $["LC_MESSAGES":"C"] );
+*/
+ map output = (map)SCR::Execute (.target.bash_output, "/sbin/ifconfig "+dev, $["LC_MESSAGES":"C"] );
if (output["exit"]:-1 == 0)
{
// lookup the correct line first
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.7/src/wizards.ycp new/yast2-http-server-2.15.8/src/wizards.ycp
--- old/yast2-http-server-2.15.7/src/wizards.ycp 2007-08-16 16:12:02.000000000 +0200
+++ new/yast2-http-server-2.15.8/src/wizards.ycp 2007-12-04 17:43:01.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Wizards definitions
* Authors: Stanislav Visnovsky
*
- * $Id: wizards.ycp 38165 2007-05-29 07:08:50Z mzugec $
+ * $Id: wizards.ycp 42675 2007-12-04 16:43:00Z mzugec $
*/
{
@@ -91,9 +91,11 @@
`add : "add-vh",
],
"add-vh" : $[
+ `abort : `abort,
`next : "overview" //`next
],
"edit-vh" : $[
+ `abort : `abort,
`next : "overview" //`next
],
"setvhost": $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.7/VERSION new/yast2-http-server-2.15.8/VERSION
--- old/yast2-http-server-2.15.7/VERSION 2007-08-22 14:46:01.000000000 +0200
+++ new/yast2-http-server-2.15.8/VERSION 2007-12-04 17:40:58.000000000 +0100
@@ -1 +1 @@
-2.15.7
+2.15.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org