Hello community, here is the log from the commit of package squidGuard for openSUSE:Factory checked in at 2018-03-02 21:10:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squidGuard (Old) and /work/SRC/openSUSE:Factory/.squidGuard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squidGuard" Fri Mar 2 21:10:13 2018 rev:29 rq:580950 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/squidGuard/squidGuard.changes 2018-02-16 21:43:46.969012460 +0100 +++ /work/SRC/openSUSE:Factory/.squidGuard.new/squidGuard.changes 2018-03-02 21:10:13.856128098 +0100 @@ -1,0 +2,19 @@ +Wed Feb 28 12:29:06 UTC 2018 - [email protected] + +- Cleanup with spec-cleaner + +------------------------------------------------------------------- +Wed Feb 28 10:12:20 UTC 2018 - [email protected] + +- remove patches that modify generated code instead of template. + They are already in the template and are unnedded. + + squidGuard-trailing_dot.patch + + squidGuard-unusual_url_end.patch +- update patches removing parts that update generated code + + squidGuard-1.4_upgrade.patch + + type_fixes.patch +- remove generated code before applying patches +- use SPDX 3.0 license and install it correctly + squidGuard is GPL-2.0-only + +------------------------------------------------------------------- Old: ---- squidGuard-trailing_dot.patch squidGuard-unusual_url_end.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squidGuard.spec ++++++ --- /var/tmp/diff_new_pack.cPFnN5/_old 2018-03-02 21:10:15.236078474 +0100 +++ /var/tmp/diff_new_pack.cPFnN5/_new 2018-03-02 21:10:15.252077899 +0100 @@ -16,18 +16,18 @@ # -%define sg_dbhome /var/lib/squidGuard/db -%define sg_logdir /var/log/squidGuard -%define sg_config /etc/squidguard.conf +%define sg_dbhome %{_localstatedir}/lib/squidGuard/db +%define sg_logdir %{_localstatedir}/log/squidGuard +%define sg_config %{_sysconfdir}/squidguard.conf %define cgidir /srv/www/cgi-bin %define imgdir /srv/www/htdocs/images Name: squidGuard -Summary: Filter plugin for squid -License: GPL-2.0+ -Group: Productivity/Networking/Web/Proxy Version: 1.4 Release: 0 +Summary: Filter plugin for squid +License: GPL-2.0-only +Group: Productivity/Networking/Web/Proxy Url: http://www.squidguard.org/ Source0: %{name}-%{version}.tar.bz2 Source1: README.SUSE @@ -36,16 +36,12 @@ Patch0: squidGuard-Makefile.patch Patch1: squidGuard-1.4-mysql.patch Patch2: squidGuard-config.patch -Patch3: squidGuard-trailing_dot.patch -Patch4: squidGuard-unusual_url_end.patch Patch5: squidGuard-CVE-2009-3700.patch Patch6: squidGuard-CVE-2009-3826.patch Patch7: xss_fix_02_2015.patch Patch8: squidGuard-1.4_upgrade.patch Patch9: default_config_pathfixes.patch Patch10: type_fixes.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: http_proxy BuildRequires: bison BuildRequires: db-devel BuildRequires: flex @@ -55,18 +51,15 @@ BuildRequires: libtool BuildRequires: openldap2-devel Requires: http_proxy -%if 0%{?suse_version} >= 1010 -Recommends: logrotate lynx -%else -Requires: logrotate -Requires: lynx -%endif +Requires(pre): http_proxy +Recommends: logrotate +Recommends: lynx %description SquidGuard is a filter, redirector, and access controller plugin for squid. It lets you define multiple access rules with different restrictions for -different user groups on a squid cache. SquidGuard uses squid's -standard redirector interface. +different user groups on a squid cache. SquidGuard uses squid's standard +redirector interface. %package doc Summary: Documentation and examples for squidGuard @@ -78,11 +71,11 @@ %prep %setup -q -%patch0 -p0 +# remove autogenerated stuff +rm src/sgDiv.c contrib/sgclean/sgclean +%patch0 %patch1 -p1 -%patch2 -p0 -%patch3 -p0 -%patch4 -p0 +%patch2 %patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -101,10 +94,7 @@ %build gettextize -export CFLAGS="%optflags" -./configure \ - --bindir=%{_sbindir} \ - --sbindir=%{_sbindir} \ +%configure \ --with-squiduser=squid \ --with-mysql \ --with-nolog=yes \ @@ -117,62 +107,58 @@ pushd contrib make %{?_smp_mflags} popd -# --------------------------------------------------------------------------- %install -mkdir $RPM_BUILD_ROOT/etc -%makeinstall +mkdir %{buildroot}%{_sysconfdir} +%make_install # fix install dir -if [ -f $RPM_BUILD_ROOT/%{_bindir}/squidGuard ]; then - mkdir -p $RPM_BUILD_ROOT/%{_sbindir} - install -m755 $RPM_BUILD_ROOT/%{_bindir}/squidGuard $RPM_BUILD_ROOT/%{_sbindir}/ - rm -rf $RPM_BUILD_ROOT/%{_bindir} +if [ -f %{buildroot}/%{_bindir}/squidGuard ]; then + mkdir -p %{buildroot}/%{_sbindir} + install -m755 %{buildroot}/%{_bindir}/squidGuard %{buildroot}/%{_sbindir}/ + rm -rf %{buildroot}/%{_bindir} fi # install blacklist -mkdir -p $RPM_BUILD_ROOT/var/lib/squidGuard/db/blacklist -install -m 644 test/blacklist/* $RPM_BUILD_ROOT/var/lib/squidGuard/db/blacklist +mkdir -p %{buildroot}%{_localstatedir}/lib/squidGuard/db/blacklist +install -m 644 test/blacklist/* %{buildroot}%{_localstatedir}/lib/squidGuard/db/blacklist # install cgi -mkdir -p $RPM_BUILD_ROOT/%{cgidir} -mkdir -p $RPM_BUILD_ROOT/%{imgdir} -install -m755 samples/*.cgi $RPM_BUILD_ROOT/%{cgidir}/ -install -m644 samples/babel* $RPM_BUILD_ROOT/%{cgidir}/ -install -m644 %{S:3} $RPM_BUILD_ROOT/%{imgdir}/blocked.gif +mkdir -p %{buildroot}/%{cgidir} +mkdir -p %{buildroot}/%{imgdir} +install -m755 samples/*.cgi %{buildroot}/%{cgidir}/ +install -m644 samples/babel* %{buildroot}/%{cgidir}/ +install -m644 %{SOURCE3} %{buildroot}/%{imgdir}/blocked.gif # prepare logdir -mkdir -p $RPM_BUILD_ROOT%{sg_logdir} +mkdir -p %{buildroot}%{sg_logdir} # prepare logrotate -mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d -sed "s|@SG_LOGDIR@|%{sg_logdir}|g" %{SOURCE2} > $RPM_BUILD_ROOT/etc/logrotate.d/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +sed "s|@SG_LOGDIR@|%{sg_logdir}|g" %{SOURCE2} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} # clean up rm -f {contrib,doc,samples,test}/{Makefile,*.in,*/*.in,.*.swp} # install docu -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} -cp -r {contrib,doc,samples,test} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -cp ANNOUNCE CHANGELOG COPYING FAQ GPL ISSUES.txt README* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -# --------------------------------------------------------------------------- +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name} +cp -r {contrib,doc,samples,test} %{buildroot}/%{_defaultdocdir}/%{name}/ +cp ANNOUNCE CHANGELOG FAQ ISSUES.txt README* %{buildroot}/%{_defaultdocdir}/%{name}/ %files -%defattr(-,root,root) +%license GPL COPYING %dir %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}/ANNOUNCE %doc %{_defaultdocdir}/%{name}/CHANGELOG -%doc %{_defaultdocdir}/%{name}/COPYING %doc %{_defaultdocdir}/%{name}/FAQ -%doc %{_defaultdocdir}/%{name}/GPL %doc %{_defaultdocdir}/%{name}/ISSUES.txt %doc %{_defaultdocdir}/%{name}/README* -%attr(770, squid, squid) %dir /var/lib/squidGuard +%attr(770, squid, squid) %dir %{_localstatedir}/lib/squidGuard %attr(770, squid, squid) %dir %{sg_dbhome} %attr(770, squid, squid) %dir %{sg_logdir} %config(noreplace) %attr(660, squid, squid) %{sg_config} -%config(noreplace) %attr(660, squid, squid) /var/lib/squidGuard/db/blacklist -%config(noreplace) /etc/logrotate.d/%{name} +%config(noreplace) %attr(660, squid, squid) %{_localstatedir}/lib/squidGuard/db/blacklist +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_sbindir}/* %dir %{imgdir} %{cgidir}/* %{imgdir}/* %files doc -%defattr(-,root,root) +%license GPL COPYING %doc %{_defaultdocdir}/%{name}/contrib %doc %{_defaultdocdir}/%{name}/doc %doc %{_defaultdocdir}/%{name}/samples ++++++ squidGuard-1.4_upgrade.patch ++++++ --- /var/tmp/diff_new_pack.cPFnN5/_old 2018-03-02 21:10:15.492069268 +0100 +++ /var/tmp/diff_new_pack.cPFnN5/_new 2018-03-02 21:10:15.496069124 +0100 @@ -50,18 +50,6 @@ /* sgLogError("%s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method); */ break; } -diff -urN squidGuard-1.4.orig/src/sgDiv.c squidGuard-1.4.upgraded/src/sgDiv.c ---- squidGuard-1.4.orig/src/sgDiv.c 2013-12-11 17:42:15.000000000 +1300 -+++ squidGuard-1.4.upgraded/src/sgDiv.c 2013-12-11 18:58:33.000000000 +1300 -@@ -771,7 +771,7 @@ - } - sgLogError("Going into emergency mode"); - while(fgets(buf, MAX_BUF, stdin) != NULL){ -- puts(""); -+ puts("ERR"); - fflush(stdout); - } - sgLogError("ending emergency mode, stdin empty"); diff -urN squidGuard-1.4.orig/src/sgDiv.c.in squidGuard-1.4.upgraded/src/sgDiv.c.in --- squidGuard-1.4.orig/src/sgDiv.c.in 2013-12-11 17:42:15.000000000 +1300 +++ squidGuard-1.4.upgraded/src/sgDiv.c.in 2013-12-11 18:58:40.000000000 +1300 ++++++ type_fixes.patch ++++++ --- /var/tmp/diff_new_pack.cPFnN5/_old 2018-03-02 21:10:15.564066679 +0100 +++ /var/tmp/diff_new_pack.cPFnN5/_new 2018-03-02 21:10:15.564066679 +0100 @@ -48,18 +48,6 @@ } } } -Index: squidGuard-1.4/src/sgDiv.c -=================================================================== ---- squidGuard-1.4.orig/src/sgDiv.c -+++ squidGuard-1.4/src/sgDiv.c -@@ -18,6 +18,7 @@ - - #include "sg.h" - #include "sgEx.h" -+#include "HTEscape.h" - - /* #define METEST 8; */ - Index: squidGuard-1.4/src/sg.h.in =================================================================== --- squidGuard-1.4.orig/src/sg.h.in
