Hello community,
here is the log from the commit of package yast2-http-server for openSUSE:Factory
checked in at Fri Jul 3 16:59:48 CEST 2009.
--------
--- yast2-http-server/yast2-http-server.changes 2009-03-25 09:31:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-http-server/yast2-http-server.changes 2009-06-22 07:45:19.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Jun 16 14:27:16 CEST 2009 - mvidner@suse.cz
+
+- Using autodocs-ycp.ami, which contains a fix for automake 1.11.
+
+-------------------------------------------------------------------
+Thu Apr 23 18:38:08 CEST 2009 - mzugec@suse.cz
+
+- fixed listen.conf parsing problem (bnc#495429)
+- 2.17.8
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-http-server-2.18.7.tar.bz2
New:
----
yast2-http-server-2.18.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.lk9976/_old 2009-07-03 16:59:28.000000000 +0200
+++ /var/tmp/diff_new_pack.lk9976/_new 2009-07-03 16:59:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-http-server (Version 2.18.7)
+# spec file for package yast2-http-server (Version 2.18.8)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-http-server
-Version: 2.18.7
+Version: 2.18.8
Release: 1
-License: GPL v2 or later
+License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.18.7.tar.bz2
+Source0: yast2-http-server-2.18.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-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
Requires: yast2-network yast2-perl-bindings libzio
@@ -37,14 +37,8 @@
This package contains the YaST2 component for HTTP server (Apache2)
configuration.
-
-
-Authors:
---------
- Stanislav Visnovsky
-
%prep
-%setup -n yast2-http-server-2.18.7
+%setup -n yast2-http-server-2.18.8
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-http-server-2.18.7.tar.bz2 -> yast2-http-server-2.18.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.7/autodocs-ycp.ami new/yast2-http-server-2.18.8/autodocs-ycp.ami
--- old/yast2-http-server-2.18.7/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-http-server-2.18.8/autodocs-ycp.ami 2009-06-22 07:45:02.000000000 +0200
@@ -0,0 +1,27 @@
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
+
+htmldir = $(docdir)/autodocs
+
+html_DATA = index.html $(wildcard *.html)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
+
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.7/configure new/yast2-http-server-2.18.8/configure
--- old/yast2-http-server-2.18.7/configure 2009-03-25 09:23:07.000000000 +0100
+++ new/yast2-http-server-2.18.8/configure 2009-06-22 07:45:06.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-http-server 2.18.6.
+# Generated by GNU Autoconf 2.63 for yast2-http-server 2.18.8.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-http-server'
PACKAGE_TARNAME='yast2-http-server'
-PACKAGE_VERSION='2.18.6'
-PACKAGE_STRING='yast2-http-server 2.18.6'
+PACKAGE_VERSION='2.18.8'
+PACKAGE_STRING='yast2-http-server 2.18.8'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,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.18.6 to adapt to many kinds of systems.
+\`configure' configures yast2-http-server 2.18.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-http-server 2.18.6:";;
+ short | recursive ) echo "Configuration of yast2-http-server 2.18.8:";;
esac
cat <<\_ACEOF
@@ -1426,7 +1426,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-http-server configure 2.18.6
+yast2-http-server configure 2.18.8
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1440,7 +1440,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.18.6, which was
+It was created by yast2-http-server $as_me 2.18.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2287,7 +2287,7 @@
# Define the identity of the package.
PACKAGE='yast2-http-server'
- VERSION='2.18.6'
+ VERSION='2.18.8'
cat >>confdefs.h <<_ACEOF
@@ -2511,7 +2511,7 @@
-VERSION="2.18.6"
+VERSION="2.18.8"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
@@ -3452,7 +3452,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.18.6, which was
+This file was extended by yast2-http-server $as_me 2.18.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3502,7 +3502,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-http-server config.status 2.18.6
+yast2-http-server config.status 2.18.8
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.7/configure.in new/yast2-http-server-2.18.8/configure.in
--- old/yast2-http-server-2.18.7/configure.in 2009-03-25 09:23:01.000000000 +0100
+++ new/yast2-http-server-2.18.8/configure.in 2009-06-22 07:45:02.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-http-server
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-http-server, 2.18.6, http://bugs.opensuse.org/, yast2-http-server)
+AC_INIT(yast2-http-server, 2.18.8, 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.18.6"
+VERSION="2.18.8"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.7/doc/autodocs/Makefile.am new/yast2-http-server-2.18.8/doc/autodocs/Makefile.am
--- old/yast2-http-server-2.18.7/doc/autodocs/Makefile.am 2008-06-22 11:03:25.000000000 +0200
+++ new/yast2-http-server-2.18.8/doc/autodocs/Makefile.am 2009-06-16 09:42:07.000000000 +0200
@@ -1,12 +1,3 @@
-#
-# Makefile.am for devtools/devtools/skeletons/config/doc/autodocs
-#
+# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/autodocs
-
-index.html: $(srcdir)/../../src/*.ycp
- $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp
-
-html_DATA = index.html $(wildcard *.html)
-
-CLEANFILES = $(html_DATA)
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.7/doc/autodocs/Makefile.in new/yast2-http-server-2.18.8/doc/autodocs/Makefile.in
--- old/yast2-http-server-2.18.7/doc/autodocs/Makefile.in 2009-03-25 09:23:08.000000000 +0100
+++ new/yast2-http-server-2.18.8/doc/autodocs/Makefile.in 2009-06-22 07:45:07.000000000 +0200
@@ -14,9 +14,18 @@
@SET_MAKE@
-#
-# Makefile.am for devtools/devtools/skeletons/config/doc/autodocs
-#
+# Makefile.am for YCP module .../doc/autodocs
+
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -37,8 +46,9 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/autodocs-ycp.ami
subdir = doc/autodocs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -174,11 +184,11 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/autodocs-ycp.ami $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -357,8 +367,17 @@
uninstall-am uninstall-htmlDATA
-index.html: $(srcdir)/../../src/*.ycp
- $(ybindir)/ycpdoc -d. $(srcdir)/../../src/*.ycp
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.7/Makefile.am new/yast2-http-server-2.18.8/Makefile.am
--- old/yast2-http-server-2.18.7/Makefile.am 2009-03-25 09:23:02.000000000 +0100
+++ new/yast2-http-server-2.18.8/Makefile.am 2009-06-22 07:45:02.000000000 +0200
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#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
+ACLOCAL_AMFLAGS = -I . -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
cmp -s $< $@ || cp -f $< $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.7/Makefile.in new/yast2-http-server-2.18.8/Makefile.in
--- old/yast2-http-server-2.18.7/Makefile.in 2009-03-25 09:23:09.000000000 +0100
+++ new/yast2-http-server-2.18.8/Makefile.in 2009-06-22 07:45:07.000000000 +0200
@@ -226,10 +226,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#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
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
CLEANFILES =
MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
POT_DST = $(shell find -type d -name testsuite -prune , \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.7/src/YaPI/HTTPD.pm new/yast2-http-server-2.18.8/src/YaPI/HTTPD.pm
--- old/yast2-http-server-2.18.7/src/YaPI/HTTPD.pm 2009-03-25 01:10:39.000000000 +0100
+++ new/yast2-http-server-2.18.8/src/YaPI/HTTPD.pm 2009-04-23 18:39:21.000000000 +0200
@@ -1371,6 +1371,13 @@
=cut
+# http://httpd.apache.org/docs/2.2/mod/mpm_common.html#listen
+# We support 3 possible values for Listen :
+# [IPv6]:port
+# IPv4:port
+# port
+#
+
BEGIN { $TYPEINFO{GetCurrentListen} = ["function", ["list", [ "map", "string", "any" ] ] ]; }
sub GetCurrentListen {
my $self = shift;
@@ -1380,17 +1387,16 @@
return $self->SetError( %{SCR->Error(".http_server.listen")} );
}
foreach my $new ( @{$data[0]} ) {
- my ($ip, $fp, $tp, $port) = ('', '', '', '');
+ my ($ip, $port) = ('', '');
if ($new =~ m/\[([\w\W]*)\]([\w\W]*)/){
$ip="[$1]";
- if ($2 =~ m/([\d\:]*)/){
- ($fp, $tp) = split(/:/, $1);
- } else{
- ( $ip, $fp, $tp ) = split(/:/, $new);
- }
- $fp=$tp if ($fp eq '');
- $port = ($fp eq $tp)?($fp):($fp.'-'.$tp);
- } elsif ($new =~/[\D]*([\d]*)[\D]*/){
+ $new=$2;
+ } elsif ($new =~ m/([\d\.]*):([\w\W]*)/){
+ $ip=$1;
+ $new=$2;
+ }
+
+ if ($new =~/[\D]*([\d]*)[\D]*/){
$port=$1;
}
push(@ret, {ADDRESS => $ip, PORT=>$port});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.18.7/VERSION new/yast2-http-server-2.18.8/VERSION
--- old/yast2-http-server-2.18.7/VERSION 2009-03-25 09:24:09.000000000 +0100
+++ new/yast2-http-server-2.18.8/VERSION 2009-04-23 18:39:21.000000000 +0200
@@ -1 +1 @@
-2.18.7
+2.18.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org