Hello community,
here is the log from the commit of package yast2-http-server
checked in at Fri Aug 24 00:05:23 CEST 2007.
--------
--- yast2-http-server/yast2-http-server.changes 2007-07-26 18:52:00.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-http-server/yast2-http-server.changes 2007-08-22 14:49:08.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 22 14:46:04 CEST 2007 - mzugec@suse.cz
+
+- don't forget values for vhost when go next-back (#299223)
+- 2.15.7
+
+-------------------------------------------------------------------
Old:
----
yast2-http-server-2.15.6.tar.bz2
New:
----
yast2-http-server-2.15.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.B31145/_old 2007-08-24 00:05:03.000000000 +0200
+++ /var/tmp/diff_new_pack.B31145/_new 2007-08-24 00:05:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-http-server (Version 2.15.6)
+# spec file for package yast2-http-server (Version 2.15.7)
#
# Copyright (c) 2007 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.15.6
+Version: 2.15.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.15.6.tar.bz2
+Source0: yast2-http-server-2.15.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 yast2-network yast2-perl-bindings libzio yast2-dns-server
@@ -35,7 +35,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-http-server-2.15.6
+%setup -n yast2-http-server-2.15.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -72,6 +72,9 @@
%doc %{prefix}/share/doc/packages/yast2-http-server
%changelog
+* Wed Aug 22 2007 - mzugec@suse.cz
+- don't forget values for vhost when go next-back (#299223)
+- 2.15.7
* Thu Jul 26 2007 - mzugec@suse.cz
- save SSL section correctly (#294679)
- 2.15.6
++++++ yast2-http-server-2.15.6.tar.bz2 -> yast2-http-server-2.15.7.tar.bz2 ++++++
++++ 4603 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-http-server-2.15.6/configure.in new/yast2-http-server-2.15.7/configure.in
--- old/yast2-http-server-2.15.6/configure.in 2007-07-26 18:43:40.000000000 +0200
+++ new/yast2-http-server-2.15.7/configure.in 2007-08-22 14:45:17.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-http-server
dnl
-dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-http-server, 2.15.5, http://bugs.opensuse.org/, yast2-http-server)
+AC_INIT(yast2-http-server, 2.15.6, 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.5"
+VERSION="2.15.6"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
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-http-server-2.15.6/Makefile.am new/yast2-http-server-2.15.7/Makefile.am
--- old/yast2-http-server-2.15.6/Makefile.am 2007-07-26 18:43:41.000000000 +0200
+++ new/yast2-http-server-2.15.7/Makefile.am 2007-08-22 14:45:17.000000000 +0200
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = agents doc src testsuite
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-http-server-2.15.6/missing new/yast2-http-server-2.15.7/missing
--- old/yast2-http-server-2.15.6/missing 2007-07-26 18:43:45.000000000 +0200
+++ new/yast2-http-server-2.15.7/missing 2007-08-22 14:45:21.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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-http-server-2.15.6/src/dialogs.ycp new/yast2-http-server-2.15.7/src/dialogs.ycp
--- old/yast2-http-server-2.15.6/src/dialogs.ycp 2007-07-23 22:24:45.000000000 +0200
+++ new/yast2-http-server-2.15.7/src/dialogs.ycp 2007-08-22 14:49:05.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: dialogs.ycp 39622 2007-07-23 20:24:56Z mzugec $
+ * $Id: dialogs.ycp 40403 2007-08-22 12:48:29Z mzugec $
*/
{
@@ -128,8 +128,8 @@
string help = CWM::MergeHelps(w);
contents = CWM::PrepareDialog(contents, w);
- Wizard::SetContentsButtons(caption, contents, help, Label::NextButton (), Label::FinishButton ());
- Wizard::HideBackButton();
+ Wizard::SetContentsButtons(caption, contents, help, Label::BackButton (), Label::FinishButton ());
+ Wizard::DisableBackButton();
symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]);
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-http-server-2.15.6/src/HttpServerWidgets.ycp new/yast2-http-server-2.15.7/src/HttpServerWidgets.ycp
--- old/yast2-http-server-2.15.6/src/HttpServerWidgets.ycp 2007-07-26 18:50:49.000000000 +0200
+++ new/yast2-http-server-2.15.7/src/HttpServerWidgets.ycp 2007-08-22 14:49:05.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: HttpServerWidgets.ycp 39728 2007-07-26 16:50:58Z mzugec $
+ * $Id: HttpServerWidgets.ycp 40403 2007-08-22 12:48:29Z mzugec $
*/
{
@@ -602,7 +602,7 @@
{
init_tab = "hosts";
TablePopup::TableInit(hosts_widget, widget);
-
+ vhost_descr = [];
// menu button label
UI::ReplaceWidget( `id(`_tp_table_repl), `PushButton( `id( `set_default ), _("Set as De&fault") ) );
@@ -964,6 +964,14 @@
global void initVhostRes(string key){
map vhost = YaST::HTTPDData::GetVhostType(currenthost);
+ if (vhost_descr!=[]){
+ vhost=$[];
+ foreach(map row, vhost_descr, {
+ if (row["KEY"]:""=="HostIP") vhost["id"] = row["VALUE"]:"";
+ if (row["KEY"]:""=="VirtualByName") vhost["type"] = (row["VALUE"]:"0"=="0")?"ip-based":"name-based";
+ });
+ }
+
if (vhost["type"]:""=="ip-based") UI::ChangeWidget(`resolution, `CurrentButton, `ip_based);
else UI::ChangeWidget(`resolution, `CurrentButton, `name_based);
UI::ChangeWidget(`virtual_host, `Value, vhost["id"]:"");
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-http-server-2.15.6/VERSION new/yast2-http-server-2.15.7/VERSION
--- old/yast2-http-server-2.15.6/VERSION 2007-07-26 18:49:49.000000000 +0200
+++ new/yast2-http-server-2.15.7/VERSION 2007-08-22 14:46:01.000000000 +0200
@@ -1 +1 @@
-2.15.6
+2.15.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org