Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2013-07-16 16:28:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old) and /work/SRC/openSUSE:Factory/.yast2-http-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-http-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2013-07-07 22:27:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes 2013-07-16 16:28:31.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 9 13:18:46 CEST 2013 - [email protected] + +- sort keys in getHostsList as well +- 2.24.2 + +------------------------------------------------------------------- Old: ---- yast2-http-server-2.24.1.tar.bz2 New: ---- yast2-http-server-2.24.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.yIRno5/_old 2013-07-16 16:28:32.000000000 +0200 +++ /var/tmp/diff_new_pack.yIRno5/_new 2013-07-16 16:28:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 2.24.1 +Version: 2.24.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-http-server-2.24.1.tar.bz2 -> yast2-http-server-2.24.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.24.1/Makefile.am new/yast2-http-server-2.24.2/Makefile.am --- old/yast2-http-server-2.24.1/Makefile.am 2013-07-04 13:45:31.000000000 +0200 +++ new/yast2-http-server-2.24.2/Makefile.am 2013-07-11 18:24:47.000000000 +0200 @@ -158,14 +158,19 @@ TAGVERSION = $(Y2TOOL) tagversion -# check if there is no modified files and all commits were pushed -check-up-to-date: - if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ - (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ +check-up-to-date check-cvs-up-to-date check-svn-up-to-date: + if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ + else \ + cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ fi check-tagversion: - cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ + @if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ + else \ + cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ + fi >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.24.1/Makefile.am.common new/yast2-http-server-2.24.2/Makefile.am.common --- old/yast2-http-server-2.24.1/Makefile.am.common 2013-07-04 13:45:31.000000000 +0200 +++ new/yast2-http-server-2.24.2/Makefile.am.common 2013-07-11 18:24:47.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ + @if test "$(client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.24.1/Makefile.in new/yast2-http-server-2.24.2/Makefile.in --- old/yast2-http-server-2.24.1/Makefile.in 2013-07-04 13:45:37.000000000 +0200 +++ new/yast2-http-server-2.24.2/Makefile.in 2013-07-11 18:24:53.000000000 +0200 @@ -980,14 +980,19 @@ package: check-up-to-date check-tagversion check-textdomain package-local -# check if there is no modified files and all commits were pushed -check-up-to-date: - if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ - (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ +check-up-to-date check-cvs-up-to-date check-svn-up-to-date: + if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ + else \ + cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ fi check-tagversion: - cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ + @if [ -d $(srcdir)/CVS ]; then \ + cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ + else \ + cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ + fi >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.24.1/VERSION new/yast2-http-server-2.24.2/VERSION --- old/yast2-http-server-2.24.1/VERSION 2013-07-02 10:05:52.000000000 +0200 +++ new/yast2-http-server-2.24.2/VERSION 2013-07-09 17:55:52.000000000 +0200 @@ -1 +1 @@ -2.24.1 +2.24.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.24.1/configure new/yast2-http-server-2.24.2/configure --- old/yast2-http-server-2.24.1/configure 2013-07-04 13:45:36.000000000 +0200 +++ new/yast2-http-server-2.24.2/configure 2013-07-11 18:24:52.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-http-server 2.24.1. +# Generated by GNU Autoconf 2.69 for yast2-http-server 2.24.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-http-server' PACKAGE_TARNAME='yast2-http-server' -PACKAGE_VERSION='2.24.1' -PACKAGE_STRING='yast2-http-server 2.24.1' +PACKAGE_VERSION='2.24.2' +PACKAGE_STRING='yast2-http-server 2.24.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,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.24.1 to adapt to many kinds of systems. +\`configure' configures yast2-http-server 2.24.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-http-server 2.24.1:";; + short | recursive ) echo "Configuration of yast2-http-server 2.24.2:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-http-server configure 2.24.1 +yast2-http-server configure 2.24.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1416,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.24.1, which was +It was created by yast2-http-server $as_me 2.24.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2355,7 @@ # Define the identity of the package. PACKAGE='yast2-http-server' - VERSION='2.24.1' + VERSION='2.24.2' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.24.1" +VERSION="2.24.2" RPMNAME="yast2-http-server" MAINTAINER="YaST2 Maintainers <[email protected]>" @@ -3404,7 +3404,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.24.1, which was +This file was extended by yast2-http-server $as_me 2.24.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3457,7 +3457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-http-server config.status 2.24.1 +yast2-http-server config.status 2.24.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.24.1/configure.in new/yast2-http-server-2.24.2/configure.in --- old/yast2-http-server-2.24.1/configure.in 2013-07-04 13:45:31.000000000 +0200 +++ new/yast2-http-server-2.24.2/configure.in 2013-07-11 18:24:47.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-http-server dnl -dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-http-server, 2.24.1, http://bugs.opensuse.org/, yast2-http-server) +AC_INIT(yast2-http-server, 2.24.2, 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.24.1" +VERSION="2.24.2" RPMNAME="yast2-http-server" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.24.1/src/Makefile.in new/yast2-http-server-2.24.2/src/Makefile.in --- old/yast2-http-server-2.24.1/src/Makefile.in 2013-07-04 13:45:37.000000000 +0200 +++ new/yast2-http-server-2.24.2/src/Makefile.in 2013-07-11 18:24:53.000000000 +0200 @@ -666,7 +666,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ + @if test "$(client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.24.1/src/YaPI/HTTPD.pm new/yast2-http-server-2.24.2/src/YaPI/HTTPD.pm --- old/yast2-http-server-2.24.1/src/YaPI/HTTPD.pm 2013-07-02 09:45:51.000000000 +0200 +++ new/yast2-http-server-2.24.2/src/YaPI/HTTPD.pm 2013-07-09 17:55:52.000000000 +0200 @@ -354,7 +354,7 @@ $vhost_files = $data[0]; } - foreach my $key (keys (%{$vhost_files})) { + foreach my $key (sort keys (%{$vhost_files})) { given($key) { when ("ip-based") { foreach my $hostList ($vhost_files->{'ip-based'}) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.24.1/testsuite/tests/readHosts.out new/yast2-http-server-2.24.2/testsuite/tests/readHosts.out --- old/yast2-http-server-2.24.1/testsuite/tests/readHosts.out 2013-01-22 11:21:33.000000000 +0100 +++ new/yast2-http-server-2.24.2/testsuite/tests/readHosts.out 2013-07-09 17:55:52.000000000 +0200 @@ -1,5 +1,5 @@ Read .http_server.vhosts $["default-server.conf":[$["DATA":[$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Order", "OVERHEAD":"", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName", "VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options", "VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"], $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]], "HOSTID":"default", "VirtualByName":"0"]], "yast2_vhosts.conf":[$["DATA":[$["KEY":"DocumentRoot", "VALUE":"/srv/viewcvs/"], $["KEY":"ServerName", "VALUE":"TestNew"], $["KEY":"ServerAdmin", "VALUE":"[email protected]"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"on"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]]], "HOSTID":"10.20.1.28/TestNew", "HostIP":"10.20.1.28", "VirtualByName":"1"], $["OVERHEAD":""]]] Return true -Return ["10.20.1.28/TestNew", "default"] +Return ["default", "10.20.1.28/TestNew"] Return [$["KEY":"DocumentRoot", "VALUE":"/srv/viewcvs/"], $["KEY":"ServerName", "VALUE":"TestNew"], $["KEY":"ServerAdmin", "VALUE":"[email protected]"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"on"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]]] Return [$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Order", "OVERHEAD":"", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName", "VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"], $["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options", "VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Order", "VALUE":"allow,deny"], $["KEY":"Allow", "VALUE":"from all"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"], $["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL", "VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
