Hello community, here is the log from the commit of package squidview for openSUSE:Factory checked in at 2017-09-13 22:32:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squidview (Old) and /work/SRC/openSUSE:Factory/.squidview.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squidview" Wed Sep 13 22:32:59 2017 rev:13 rq:523003 version:0.86 Changes: -------- --- /work/SRC/openSUSE:Factory/squidview/squidview.changes 2015-01-05 04:43:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.squidview.new/squidview.changes 2017-09-13 22:33:00.325053825 +0200 @@ -1,0 +2,22 @@ +Mon Sep 11 08:49:39 UTC 2017 - [email protected] + +- New upstream bugfix release 0.86 + + 0.86 February 2017 + + fix clang compiler warning, thanks + http://people.freebsd.org/~danilo/ + + 0.85 Janurary 2017 + + another result code, thanks Yuri Voinov + + 0.84 December 2016 + + INM result code as 'U' - unmodified thanks Yuri Voinov + + 0.82-0.83: May 2016 + + add more squid result codes + thanks to Yuri Voinov for the suggestions, corrections + +- Packaging + + Fix boo#1057981 : don't remove file under /usr/share/squidview + + spec_cleaner + + Use URL as source now + + Refresh patch ac_new-autoconf.patch for version 0.86 + + Remove _service file, no need + +------------------------------------------------------------------- Old: ---- _service squidview-0.81.tar.gz New: ---- squidview-0.86.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squidview.spec ++++++ --- /var/tmp/diff_new_pack.Fjaw7Q/_old 2017-09-13 22:33:00.980961489 +0200 +++ /var/tmp/diff_new_pack.Fjaw7Q/_new 2017-09-13 22:33:00.980961489 +0200 @@ -1,7 +1,7 @@ # # spec file for package squidview # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,24 +17,21 @@ Name: squidview -Version: 0.81 +Version: 0.86 Release: 0 -Source: %{name}/%{name}-%{version}.tar.gz -# to be used one day with _service ... -#Source: http://www.rillion.net/%%{name}/%%{name}-%%{version}.tar.gz -Url: http://www.rillion.net/%{name}/index.html -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: ncurses-devel Summary: Interactive console program which monitors squid logs access License: GPL-2.0 Group: Productivity/Networking/Web/Proxy +Url: http://www.rillion.net/%{name}/index.html +Source: http://www.rillion.net/%{name}/%{name}-%{version}.tar.gz Patch0: COPYING.patch Patch1: ltinfo-obs.patch Patch2: ac_new-autoconf.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: ncurses-devel %description Squidview is an interactive console program which monitors @@ -49,7 +46,7 @@ It does not generate its own database for tasks %prep -%setup -q -n %{name}-%{version} +%setup -q %patch0 %patch1 %patch2 @@ -58,23 +55,20 @@ %build %configure -%__make %{?_smp_mflags}; +make VERBOSE=1 %{?_smp_mflags} %install -%makeinstall -# Remove stupid content in /usr/share/squidview -%__rm -rf %{buildroot}%{_datadir}/squidview - -# Not used anymore, but doesn't eat bread - -%clean -%__rm -rf %{buildroot} +make DESTDIR=%{buildroot} install %{?_smp_mflags} +# Remove stuff that are docs +rm -fv %{buildroot}%{_datadir}/%{name}/BUGS %{buildroot}%{_datadir}/%{name}/example.log %files %defattr(-, root, root, 0755) # Upstream Author doesn't want to be spammed! # AUTHORS NEWS are empty -%doc BUGS ChangeLog COPYING example.log HOWTO README +%doc BUGS ChangeLog COPYING example.log README +%dir %{_datadir}/squidview +%{_datadir}/squidview/* %{_mandir}/man1/squidview* %{_bindir}/squidview ++++++ ac_new-autoconf.patch ++++++ --- /var/tmp/diff_new_pack.Fjaw7Q/_old 2017-09-13 22:33:01.008957548 +0200 +++ /var/tmp/diff_new_pack.Fjaw7Q/_new 2017-09-13 22:33:01.012956985 +0200 @@ -6,9 +6,9 @@ ]) -AC_INIT(squidview.cpp) -+AC_INIT([squidview], [0.81]) ++AC_INIT([squidview], [0.86]) AM_CONFIG_HEADER(config.h) --AM_INIT_AUTOMAKE(squidview,0.81) +-AM_INIT_AUTOMAKE(squidview,0.86) +AM_INIT_AUTOMAKE AC_PROG_CXX AC_PROG_INSTALL ++++++ squidview-0.81.tar.gz -> squidview-0.86.tar.gz ++++++ ++++ 2701 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/squidview-0.81/ChangeLog new/squidview-0.86/ChangeLog --- old/squidview-0.81/ChangeLog 2015-01-01 06:15:54.000000000 +0100 +++ new/squidview-0.86/ChangeLog 2017-02-01 08:59:58.000000000 +0100 @@ -1,5 +1,19 @@ >> Squidview history: +0.86 February 2017 +- fix clang compiler warning, thanks http://people.freebsd.org/~danilo/ + +0.85 Janurary 2017 +- another result code, thanks Yuri Voinov + +0.84 December 2016 +- INM result code as 'U' - unmodified + thanks Yuri Voinov + +0.82-0.83: May 2016 +- add more squid result codes + thanks to Yuri Voinov for the suggestions, corrections + 0.81: January 2015 - squid result code update thanks to Yuri Voinov for the suggestion 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/squidview-0.81/compile new/squidview-0.86/compile --- old/squidview-0.81/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/squidview-0.86/compile 2016-08-11 11:20:29.000000000 +0200 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <[email protected]>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, 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 +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <[email protected]>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# 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/squidview-0.81/configure.in new/squidview-0.86/configure.in --- old/squidview-0.81/configure.in 2015-01-01 06:15:54.000000000 +0100 +++ new/squidview-0.86/configure.in 2017-02-01 08:59:58.000000000 +0100 @@ -15,7 +15,7 @@ AC_INIT(squidview.cpp) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(squidview,0.81) +AM_INIT_AUTOMAKE(squidview,0.86) AC_PROG_CXX AC_PROG_INSTALL 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/squidview-0.81/squidview.cpp new/squidview-0.86/squidview.cpp --- old/squidview-0.81/squidview.cpp 2015-01-01 01:27:45.000000000 +0100 +++ new/squidview-0.86/squidview.cpp 2017-02-01 06:56:45.000000000 +0100 @@ -17,7 +17,7 @@ A program to nicely browse your squid log - (c) 2001 - 2015 Graeme Sheppard + (c) 2001 - 2017 Graeme Sheppard This program is not how it would be if I had to rewrite it from scratch. It started off very simple (quick and nasty) and needed to be fast because @@ -1002,7 +1002,7 @@ FILE* fOutput; fOutput = fopen (sWordFile.c_str(), "w"); - if (fOutput <= 0) + if (fOutput == NULL) return 0; iIndex = 0; @@ -1354,6 +1354,7 @@ if (sLeft == "TCP_MEM_HIT") cHit = 'M'; else if (sLeft == "TCP_HIT_ABORTED") cHit = 'A'; else if (sLeft == "TCP_REFRESH_FAIL_OLD") cHit = 'F'; else + if (sLeft == "TCP_INM_HIT") cHit = 'U'; else if (sLeft == "TCP_MISS") cHit = ' '; else if (sLeft == "TCP_REFRESH_MISS") cHit = 'm'; else @@ -1361,9 +1362,13 @@ if (sLeft == "TCP_CLIENT_REFRESH") cHit = 'r'; else if (sLeft == "TCP_CLIENT_REFRESH_MISS") cHit = 'c'; else if (sLeft == "TCP_MISS_ABORTED") cHit = 'a'; else - + if (sLeft == "TCP_SWAPFAIL_MISS") cHit = 'f'; else + if (sLeft == "TCP_TUNNEL") cHit = 't'; else + if (sLeft == "TCP_REDIRECT") cHit = 'o'; else + if (sLeft == "TCP_DENIED") cHit = 'd'; else if (sLeft == "TAG_NONE") cHit = '0'; else + if (sLeft == "NONE") cHit = '0'; else cHit = '?'; iHitNumber = atoi (sRight.c_str()); @@ -2163,7 +2168,7 @@ { fOutput = fopen (string (sPathToFiles + "/" + sRepFileName) .c_str(), "w"); - if (fOutput == 0) + if (fOutput == NULL) { sStatusMessage = "Could not write to " + sRepFileName; return; @@ -3825,7 +3830,7 @@ bSave = true; bError = false; fIO = fopen (sSetFileName.c_str(), "w"); - if (fIO == 0) + if (fIO == NULL) { sStatusMessage = string ("Could not write to ") + sSetFileName; return; @@ -5317,7 +5322,7 @@ void Help() { MyCls(); - con << PACKAGE << " " << VERSION << ": (c) " << "2001-2015" + con << PACKAGE << " " << VERSION << ": (c) " << "2001-2017" << " Graeme Sheppard - GPL software\n" << "www.rillion.net/squidview\n\n" << "Keystrokes:-\n\n"
