Hello community,
here is the log from the commit of package yast2-http-server
checked in at Fri Apr 7 12:14:45 CEST 2006.
--------
--- yast2-http-server/yast2-http-server.changes 2006-03-23 16:18:26.000000000 +0100
+++ yast2-http-server/yast2-http-server.changes 2006-04-07 08:01:31.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Apr 7 07:55:59 CEST 2006 - mzugec@suse.cz
+
+- #164036 - Bad entry in http-server for UserDir
+
+-------------------------------------------------------------------
Old:
----
yast2-http-server-2.13.12.tar.bz2
New:
----
yast2-http-server-2.13.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.GauIKS/_old 2006-04-07 12:13:03.000000000 +0200
+++ /var/tmp/diff_new_pack.GauIKS/_new 2006-04-07 12:13:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-http-server (Version 2.13.12)
+# spec file for package yast2-http-server (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-http-server
-Version: 2.13.12
+Version: 2.13.13
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.13.12.tar.bz2
+Source0: yast2-http-server-2.13.13.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
%prep
-%setup -n yast2-http-server-2.13.12
+%setup -n yast2-http-server-2.13.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,6 +70,8 @@
%doc %{prefix}/share/doc/packages/yast2-http-server
%changelog -n yast2-http-server
+* Fri Apr 07 2006 - mzugec@suse.cz
+- #164036 - Bad entry in http-server for UserDir
* Thu Mar 23 2006 - mzugec@suse.cz
- fixed #160315 - check if user is root
* Thu Mar 16 2006 - mzugec@suse.cz
++++++ yast2-http-server-2.13.12.tar.bz2 -> yast2-http-server-2.13.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.13.12/VERSION new/yast2-http-server-2.13.13/VERSION
--- old/yast2-http-server-2.13.12/VERSION 2006-03-23 16:15:20.000000000 +0100
+++ new/yast2-http-server-2.13.13/VERSION 2006-04-07 07:55:34.000000000 +0200
@@ -1 +1 @@
-2.13.12
+2.13.13
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.13.12/configure new/yast2-http-server-2.13.13/configure
--- old/yast2-http-server-2.13.12/configure 2006-03-23 16:06:27.000000000 +0100
+++ new/yast2-http-server-2.13.13/configure 2006-04-07 07:48:23.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.11.
+# Generated by GNU Autoconf 2.59 for yast2-http-server 2.13.12.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-http-server'
PACKAGE_TARNAME='yast2-http-server'
-PACKAGE_VERSION='2.13.11'
-PACKAGE_STRING='yast2-http-server 2.13.11'
+PACKAGE_VERSION='2.13.12'
+PACKAGE_STRING='yast2-http-server 2.13.12'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
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.11 to adapt to many kinds of systems.
+\`configure' configures yast2-http-server 2.13.12 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.11:";;
+ short | recursive ) echo "Configuration of yast2-http-server 2.13.12:";;
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.11
+yast2-http-server configure 2.13.12
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.11, which was
+It was created by yast2-http-server $as_me 2.13.12, 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.11'
+ VERSION='2.13.12'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.11"
+VERSION="2.13.12"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-http-server $as_me 2.13.11, which was
+This file was extended by yast2-http-server $as_me 2.13.12, 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.11
+yast2-http-server config.status 2.13.12
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.12/configure.in new/yast2-http-server-2.13.13/configure.in
--- old/yast2-http-server-2.13.12/configure.in 2006-03-23 16:06:20.000000000 +0100
+++ new/yast2-http-server-2.13.13/configure.in 2006-04-07 07:48:16.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-http-server, 2.13.11, http://www.suse.de/feedback, yast2-http-server)
+AC_INIT(yast2-http-server, 2.13.12, http://www.suse.de/feedback, 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.11"
+VERSION="2.13.12"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.13.12/src/dialogs.ycp new/yast2-http-server-2.13.13/src/dialogs.ycp
--- old/yast2-http-server-2.13.12/src/dialogs.ycp 2006-03-16 16:53:02.000000000 +0100
+++ new/yast2-http-server-2.13.13/src/dialogs.ycp 2006-04-07 07:56:31.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: dialogs.ycp 29056 2006-03-16 15:52:59Z mzugec $
+ * $Id: dialogs.ycp 29843 2006-04-07 05:56:26Z mzugec $
*/
{
@@ -564,9 +564,10 @@
}
descr = YaST::HTTPDData::GetHost(ip["VALUE"]:""+"/"+servername["VALUE"]:"");
string directory_index=(string)UI::QueryWidget(`dir_index, `Value);
-
- if (size(directory_index)>0 || (boolean)UI::QueryWidget(`pub_html, `Value)){
+
+ if ( size(directory_index)>0 ){
list< map > tmp_descr = [];
+
foreach(mapvalue, descr, {
if (value["KEY"]:"" == "_SECTION" &&
value["SECTIONNAME"]:"" == "Directory" &&
@@ -574,11 +575,11 @@
{
if (size(directory_index)>0)
value["VALUE"]=add(value["VALUE"]:[], $["KEY":"DirectoryIndex", "VALUE":directory_index]);
- if (UI::QueryWidget(`pub_html, `Value)==true)
- value["VALUE"]=add(value["VALUE"]:[], $["KEY":"UserDir", "VALUE":"public_html"]);
}
tmp_descr = add(tmp_descr, value);
});
+if (UI::QueryWidget(`pub_html, `Value)==true) tmp_descr=add(tmp_descr, $["KEY":"UserDir", "VALUE":"public_html"]);
+
YaST::HTTPDData::ModifyHost(ip["VALUE"]:""+"/"+servername["VALUE"]:"", tmp_descr);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...