Mailinglist Archive: opensuse-commit (1094 mails)
| < Previous | Next > |
commit yast2-http-server for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 07 Jan 2010 13:05:54 +0100
- Message-id: <20100107120554.443DF202A8@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-http-server for
openSUSE:Factory
checked in at Thu Jan 7 13:05:54 CET 2010.
--------
--- yast2-http-server/yast2-http-server.changes 2009-06-22 07:45:19.000000000
+0200
+++ /mounts/work_src_done/STABLE/yast2-http-server/yast2-http-server.changes
2010-01-04 17:48:59.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Jan 4 17:43:07 CET 2010 - mzugec@xxxxxxx
+
+- determine vhost by HostIP instead of ServerName (bnc#567027)
+- 2.19.0
+
+-------------------------------------------------------------------
+Tue Jul 7 12:26:55 CEST 2009 - mzugec@xxxxxxx
+
+- defined proxy_ajp in HTTPModules.pm (bnc#518816)
+- 2.18.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-http-server-2.18.8.tar.bz2
New:
----
yast2-http-server-2.19.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.ynNPhl/_old 2010-01-07 13:05:48.000000000 +0100
+++ /var/tmp/diff_new_pack.ynNPhl/_new 2010-01-07 13:05:48.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-http-server (Version 2.18.8)
+# spec file for package yast2-http-server (Version 2.19.0)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,13 @@
Name: yast2-http-server
-Version: 2.18.8
+Version: 2.19.0
Release: 1
-License: GPL
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.18.8.tar.bz2
+Source0: yast2-http-server-2.19.0.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPLv2+
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
# DnsServerApi moved to yast2.rpm (bnc#392606)
@@ -38,7 +38,7 @@
configuration.
%prep
-%setup -n yast2-http-server-2.18.8
+%setup -n yast2-http-server-2.19.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -48,7 +48,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
++++++ yast2-http-server-2.18.8.tar.bz2 -> yast2-http-server-2.19.0.tar.bz2
++++++
++++ 3415 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.18.8/VERSION new/yast2-http-server-2.19.0/VERSION
--- old/yast2-http-server-2.18.8/VERSION 2009-04-23 18:39:21.000000000
+0200
+++ new/yast2-http-server-2.19.0/VERSION 2010-01-04 17:43:04.000000000
+0100
@@ -1 +1 @@
-2.18.8
+2.19.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.18.8/autodocs-ycp.ami
new/yast2-http-server-2.19.0/autodocs-ycp.ami
--- old/yast2-http-server-2.18.8/autodocs-ycp.ami 2009-06-22
07:45:02.000000000 +0200
+++ new/yast2-http-server-2.19.0/autodocs-ycp.ami 2010-01-04
17:47:35.000000000 +0100
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -8,20 +8,25 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__};
b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
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.18.8/configure.in
new/yast2-http-server-2.19.0/configure.in
--- old/yast2-http-server-2.18.8/configure.in 2009-06-22 07:45:02.000000000
+0200
+++ new/yast2-http-server-2.19.0/configure.in 2010-01-04 17:47:35.000000000
+0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-http-server
dnl
-dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-http-server, 2.18.8, http://bugs.opensuse.org/,
yast2-http-server)
+AC_INIT(yast2-http-server, 2.19.0, 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.8"
+VERSION="2.19.0"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"
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.18.8/missing new/yast2-http-server-2.19.0/missing
--- old/yast2-http-server-2.18.8/missing 2009-06-22 07:45:06.000000000
+0200
+++ new/yast2-http-server-2.19.0/missing 2010-01-04 17:47:41.000000000
+0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@xxxxxxxxxxxxxxxx>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to <bug-automake@xxxxxxx>."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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.18.8/src/YaPI/HTTPD.pm
new/yast2-http-server-2.19.0/src/YaPI/HTTPD.pm
--- old/yast2-http-server-2.18.8/src/YaPI/HTTPD.pm 2009-04-23
18:39:21.000000000 +0200
+++ new/yast2-http-server-2.19.0/src/YaPI/HTTPD.pm 2010-01-04
17:38:38.000000000 +0100
@@ -528,6 +528,8 @@
} else {
$vhost_files->{$servername} = [{HOSTID => "$ip/$servername",
HostIP => $ip, DATA => \@newdata}];
}
+
+ $self->validateNVH();
}
@@ -572,25 +574,27 @@
$self->deleteVH($hostid);
$self->createVH($hostid, $data, $params);
- $self->validateNVH();
+# $self->validateNVH();
}
sub validateNVH (){
- my @nb = ();
+ my %nb = ();
foreach my $key ( keys( %{$vhost_files} ) ){
if(($key ne 'ip-based') && ($key ne 'main')){
- push(@nb, $key);
+ my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'};
+ $nb{$host_ip}=1;
}
}
- my @tmp_data=();
- foreach my $row (@{$vhost_files->{main}{DATA}}){
- push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost');
- }
- $vhost_files->{main}{DATA} = \@tmp_data;
+
+ my @tmp_data=();
+ foreach my $row (@{$vhost_files->{main}{DATA}}){
+ push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost');
+ }
+ $vhost_files->{main}{DATA} = \@tmp_data;
- foreach my $ip (@nb){
+ foreach my $ip (keys %nb){
push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} );
}
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.18.8/src/YaPI/HTTPDModules.pm
new/yast2-http-server-2.19.0/src/YaPI/HTTPDModules.pm
--- old/yast2-http-server-2.18.8/src/YaPI/HTTPDModules.pm 2009-03-06
16:50:29.000000000 +0100
+++ new/yast2-http-server-2.19.0/src/YaPI/HTTPDModules.pm 2009-07-21
07:30:44.000000000 +0200
@@ -559,6 +559,13 @@
"values" => [ "On", "Off", "Full", "Block" ] }
]
},
+ 'proxy_ajp' => {
+ summary => __("AJP support module for mod_proxy"),
+ packages => [],
+ default => 0,
+ requires => "proxy",
+ position => 395,
+ },
'proxy_connect' => {
summary => __("mod_proxy extension for CONNECT request
handling"),
packages => [],
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |