Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2013-07-07 22:27:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-28 10:24:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes 2013-07-07 22:27:20.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jul 2 09:54:05 CEST 2013 - [email protected] + +- removed unused widget definitions +- 2.24.1 + +------------------------------------------------------------------- +Mon Jul 1 13:46:18 CEST 2013 - [email protected] + +- sort array to get deterministic test output +- 2.24.0 + +------------------------------------------------------------------- Old: ---- yast2-http-server-2.22.0.tar.bz2 New: ---- yast2-http-server-2.24.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.dDIHmL/_old 2013-07-07 22:27:21.000000000 +0200 +++ /var/tmp/diff_new_pack.dDIHmL/_new 2013-07-07 22:27:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 2.22.0 +Version: 2.24.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-http-server-2.22.0.tar.bz2 -> yast2-http-server-2.24.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.22.0/Makefile.am new/yast2-http-server-2.24.1/Makefile.am --- old/yast2-http-server-2.22.0/Makefile.am 2013-02-26 18:02:31.000000000 +0100 +++ new/yast2-http-server-2.24.1/Makefile.am 2013-07-04 13:45:31.000000000 +0200 @@ -158,19 +158,14 @@ TAGVERSION = $(Y2TOOL) tagversion -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' ;\ +# 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) \ fi check-tagversion: - @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; \ + cd $(srcdir) && $(TAGVERSION) --check >/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.22.0/Makefile.am.common new/yast2-http-server-2.24.1/Makefile.am.common --- old/yast2-http-server-2.22.0/Makefile.am.common 2013-02-26 18:02:31.000000000 +0100 +++ new/yast2-http-server-2.24.1/Makefile.am.common 2013-07-04 13:45:31.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,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.22.0/Makefile.in new/yast2-http-server-2.24.1/Makefile.in --- old/yast2-http-server-2.22.0/Makefile.in 2013-02-26 18:02:36.000000000 +0100 +++ new/yast2-http-server-2.24.1/Makefile.in 2013-07-04 13:45:37.000000000 +0200 @@ -980,19 +980,14 @@ package: check-up-to-date check-tagversion check-textdomain package-local -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' ;\ +# 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) \ fi check-tagversion: - @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; \ + cd $(srcdir) && $(TAGVERSION) --check >/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.22.0/VERSION new/yast2-http-server-2.24.1/VERSION --- old/yast2-http-server-2.22.0/VERSION 2013-01-22 11:21:33.000000000 +0100 +++ new/yast2-http-server-2.24.1/VERSION 2013-07-02 10:05:52.000000000 +0200 @@ -1 +1 @@ -2.22.0 +2.24.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.22.0/configure new/yast2-http-server-2.24.1/configure --- old/yast2-http-server-2.22.0/configure 2013-02-26 18:02:35.000000000 +0100 +++ new/yast2-http-server-2.24.1/configure 2013-07-04 13:45:36.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.22.0. +# Generated by GNU Autoconf 2.69 for yast2-http-server 2.24.1. # # 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.22.0' -PACKAGE_STRING='yast2-http-server 2.22.0' +PACKAGE_VERSION='2.24.1' +PACKAGE_STRING='yast2-http-server 2.24.1' 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.22.0 to adapt to many kinds of systems. +\`configure' configures yast2-http-server 2.24.1 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.22.0:";; + short | recursive ) echo "Configuration of yast2-http-server 2.24.1:";; 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.22.0 +yast2-http-server configure 2.24.1 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.22.0, which was +It was created by yast2-http-server $as_me 2.24.1, 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.22.0' + VERSION='2.24.1' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.22.0" +VERSION="2.24.1" 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.22.0, which was +This file was extended by yast2-http-server $as_me 2.24.1, 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.22.0 +yast2-http-server config.status 2.24.1 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.22.0/configure.in new/yast2-http-server-2.24.1/configure.in --- old/yast2-http-server-2.22.0/configure.in 2013-02-26 18:02:31.000000000 +0100 +++ new/yast2-http-server-2.24.1/configure.in 2013-07-04 13:45:31.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-http-server dnl -dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-http-server, 2.22.0, http://bugs.opensuse.org/, yast2-http-server) +AC_INIT(yast2-http-server, 2.24.1, 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.22.0" +VERSION="2.24.1" RPMNAME="yast2-http-server" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.22.0/src/HttpServerWidgets.ycp new/yast2-http-server-2.24.1/src/HttpServerWidgets.ycp --- old/yast2-http-server-2.22.0/src/HttpServerWidgets.ycp 2013-01-22 11:21:33.000000000 +0100 +++ new/yast2-http-server-2.24.1/src/HttpServerWidgets.ycp 2013-07-02 10:05:52.000000000 +0200 @@ -643,8 +643,6 @@ global boolean validateOpenPort(string key, map event); global void initListenInterfaces (string key); global boolean validateListenInterfaces(string key, map event); -global void initFwOpen (string key); -global void storeFwOpen (string opt_id, map event); global symbol handleExpertConf (string key, map event); void initScriptModules(string key); void initSummaryText(string key); @@ -1545,14 +1543,6 @@ "validate_function" : validateListenInterfaces, "help" : HELPS["listen_interfaces"]:"" ], - "fw_open" : $[ - "widget" : `checkbox, - //translators: checkbox - "label" : _("Open &Firewall for Selected Ports"), - "init" : initFwOpen, - "store" : storeFwOpen, - "help" : HELPS["fw_open"]:"" - ], "booting" : CWMServiceStart::CreateAutoStartWidget ($[ "get_service_auto_start" : getServiceAutoStart, "set_service_auto_start" : setServiceAutoStart, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.22.0/src/Makefile.in new/yast2-http-server-2.24.1/src/Makefile.in --- old/yast2-http-server-2.22.0/src/Makefile.in 2013-02-26 18:02:36.000000000 +0100 +++ new/yast2-http-server-2.24.1/src/Makefile.in 2013-07-04 13:45:37.000000000 +0200 @@ -666,7 +666,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,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.22.0/src/YaPI/HTTPD.pm new/yast2-http-server-2.24.1/src/YaPI/HTTPD.pm --- old/yast2-http-server-2.22.0/src/YaPI/HTTPD.pm 2013-01-22 11:21:33.000000000 +0100 +++ new/yast2-http-server-2.24.1/src/YaPI/HTTPD.pm 2013-07-02 09:45:51.000000000 +0200 @@ -421,7 +421,7 @@ my $ret=undef; - 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.22.0/src/helps.ycp new/yast2-http-server-2.24.1/src/helps.ycp --- old/yast2-http-server-2.22.0/src/helps.ycp 2013-01-22 11:21:33.000000000 +0100 +++ new/yast2-http-server-2.24.1/src/helps.ycp 2013-07-02 10:05:52.000000000 +0200 @@ -42,8 +42,6 @@ "open_port" : _("<p>The <b>Port</b> value defines the port on which Apache2 listens. The default is 80.</p>"), //translators: Wizard dialog 1/5 "listen_interfaces" : _("<p><b>Listen on Interfaces</b> contains the list of all IP addresses configured for this host. Checked IP addresses are those on which Apache2 listens. If you are unsure, check all.</p>"), - //translators: Wizard dialog 1/5 - "fw_open" : _("<p>When the firewall is enabled, you can check whether to enable Apache2 ports on the firewall.</p>"), //translators: Wizard dialog 2/5 "script_modules" : _("<p>Here, enable the script languages the Apache2 server should support.</p>"), //translators: Wizard dialog 5/5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-2.22.0/src/wizard-dialog.ycp new/yast2-http-server-2.24.1/src/wizard-dialog.ycp --- old/yast2-http-server-2.22.0/src/wizard-dialog.ycp 2013-01-22 11:21:33.000000000 +0100 +++ new/yast2-http-server-2.24.1/src/wizard-dialog.ycp 2013-07-02 10:05:52.000000000 +0200 @@ -23,7 +23,6 @@ symbol WizardSequence1(){ string caption=_("HTTP Server Wizard (1/5)--Network Device Selection"); term contents = -// `Top ( `HBox ( `HStretch(), `VBox( @@ -32,14 +31,12 @@ `VSpacing(0.5), "listen_interfaces", `VSpacing(0.5), -// "firewall_first", "firewall_adapt", `VSpacing(8) ), `HStretch() - // ) ); - list<string> widget_names = ["open_port", "listen_interfaces", /*"firewall_first"*/"firewall_adapt"]; + list<string> widget_names = ["open_port", "listen_interfaces", "firewall_adapt"]; list<map<string,any> > w = CWM::CreateWidgets (widget_names, HttpServerWidgets::widgets); string help = "<h3>" + _("Network Device Selection") + "</h3>" + CWM::MergeHelps (w); contents = CWM::PrepareDialog (contents, w); @@ -219,13 +216,11 @@ string caption=_("HTTP Server Wizard (5/5)--Summary"); term contents = -// `Top ( `VBox ( "booting", "summary_text", "expert_conf" -// ) ); list<string> widget_names = ["booting", "summary_text", "expert_conf"]; list<map<string,any> > w = CWM::CreateWidgets (widget_names, HttpServerWidgets::widgets); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
