Hello community, here is the log from the commit of package yast2-squid for openSUSE:Factory checked in at 2013-04-24 12:01:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-squid (Old) and /work/SRC/openSUSE:Factory/.yast2-squid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-squid", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-squid/yast2-squid.changes 2013-02-28 10:24:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-squid.new/yast2-squid.changes 2013-04-24 12:01:10.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 18 16:54:12 CEST 2013 - [email protected] + +- Do not block squid configuration if SuSEfirewall can't be read + (bnc#808722) +- 2.21.3 + +------------------------------------------------------------------- Old: ---- yast2-squid-2.21.2.tar.bz2 New: ---- yast2-squid-2.21.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-squid.spec ++++++ --- /var/tmp/diff_new_pack.jXD9jl/_old 2013-04-24 12:01:15.000000000 +0200 +++ /var/tmp/diff_new_pack.jXD9jl/_new 2013-04-24 12:01:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-squid -Version: 2.21.2 +Version: 2.21.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-squid-2.21.2.tar.bz2 -> yast2-squid-2.21.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-2.21.2/Makefile.am new/yast2-squid-2.21.3/Makefile.am --- old/yast2-squid-2.21.2/Makefile.am 2013-02-22 11:02:11.000000000 +0100 +++ new/yast2-squid-2.21.3/Makefile.am 2013-04-19 11:06:41.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-squid-2.21.2/Makefile.am.common new/yast2-squid-2.21.3/Makefile.am.common --- old/yast2-squid-2.21.2/Makefile.am.common 2013-02-22 11:02:11.000000000 +0100 +++ new/yast2-squid-2.21.3/Makefile.am.common 2013-04-19 11:06:41.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-squid-2.21.2/Makefile.in new/yast2-squid-2.21.3/Makefile.in --- old/yast2-squid-2.21.2/Makefile.in 2013-02-22 11:02:24.000000000 +0100 +++ new/yast2-squid-2.21.3/Makefile.in 2013-04-19 11:06:53.000000000 +0200 @@ -1064,19 +1064,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-squid-2.21.2/VERSION new/yast2-squid-2.21.3/VERSION --- old/yast2-squid-2.21.2/VERSION 2013-01-22 12:10:17.000000000 +0100 +++ new/yast2-squid-2.21.3/VERSION 2013-04-19 11:06:33.000000000 +0200 @@ -1 +1 @@ -2.21.2 +2.21.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-2.21.2/configure new/yast2-squid-2.21.3/configure --- old/yast2-squid-2.21.2/configure 2013-02-22 11:02:22.000000000 +0100 +++ new/yast2-squid-2.21.3/configure 2013-04-19 11:06:51.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-squid 2.21.2. +# Generated by GNU Autoconf 2.69 for yast2-squid 2.21.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-squid' PACKAGE_TARNAME='yast2-squid' -PACKAGE_VERSION='2.21.2' -PACKAGE_STRING='yast2-squid 2.21.2' +PACKAGE_VERSION='2.21.3' +PACKAGE_STRING='yast2-squid 2.21.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1375,7 +1375,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-squid 2.21.2 to adapt to many kinds of systems. +\`configure' configures yast2-squid 2.21.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1446,7 +1446,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-squid 2.21.2:";; + short | recursive ) echo "Configuration of yast2-squid 2.21.3:";; esac cat <<\_ACEOF @@ -1564,7 +1564,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-squid configure 2.21.2 +yast2-squid configure 2.21.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2017,7 +2017,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-squid $as_me 2.21.2, which was +It was created by yast2-squid $as_me 2.21.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2956,7 +2956,7 @@ # Define the identity of the package. PACKAGE='yast2-squid' - VERSION='2.21.2' + VERSION='2.21.3' cat >>confdefs.h <<_ACEOF @@ -3079,7 +3079,7 @@ -VERSION="2.21.2" +VERSION="2.21.3" RPMNAME="yast2-squid" MAINTAINER="YaST2 Maintainers <[email protected]>" @@ -16725,7 +16725,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-squid $as_me 2.21.2, which was +This file was extended by yast2-squid $as_me 2.21.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16791,7 +16791,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-squid config.status 2.21.2 +yast2-squid config.status 2.21.3 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-squid-2.21.2/configure.in new/yast2-squid-2.21.3/configure.in --- old/yast2-squid-2.21.2/configure.in 2013-02-22 11:02:11.000000000 +0100 +++ new/yast2-squid-2.21.3/configure.in 2013-04-19 11:06:41.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-squid dnl -dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-squid, 2.21.2, http://bugs.opensuse.org/, yast2-squid) +AC_INIT(yast2-squid, 2.21.3, http://bugs.opensuse.org/, yast2-squid) 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.21.2" +VERSION="2.21.3" RPMNAME="yast2-squid" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-2.21.2/src/Makefile.in new/yast2-squid-2.21.3/src/Makefile.in --- old/yast2-squid-2.21.2/src/Makefile.in 2013-02-22 11:02:24.000000000 +0100 +++ new/yast2-squid-2.21.3/src/Makefile.in 2013-04-19 11:06:53.000000000 +0200 @@ -621,7 +621,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-squid-2.21.2/src/Squid.ycp new/yast2-squid-2.21.3/src/Squid.ycp --- old/yast2-squid-2.21.2/src/Squid.ycp 2013-01-22 12:10:17.000000000 +0100 +++ new/yast2-squid-2.21.3/src/Squid.ycp 2013-04-19 11:06:33.000000000 +0200 @@ -1061,8 +1061,9 @@ Progress::set(false); if (!SuSEFirewall::Read()){ - ok = false; - Report::Error(_("Cannot read firewall settings.")); + // bnc#808722: yast2 squid fail if SuSEfirewall in not installed + // other or no firewall can be installed + y2warning("Cannot read firewall settings."); } Progress::set(true); Progress::NextStage(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
