rpms/squidGuard/EL-5 sources, 1.2, 1.3 squidGuard-paths.patch, 1.1, 1.2 squidGuard-perlwarning.patch, 1.1, 1.2 squidGuard.logrotate, 1.1, 1.2 squidGuard.spec, 1.6, 1.7 squidguard, 1.1, 1.2
Jon Ciesla
limb at fedoraproject.org
Tue Oct 27 12:29:14 UTC 2009
Author: limb
Update of /cvs/pkgs/rpms/squidGuard/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31207
Modified Files:
sources squidGuard-paths.patch squidGuard-perlwarning.patch
squidGuard.logrotate squidGuard.spec squidguard
Log Message:
Update to latest.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 6 Sep 2005 10:50:41 -0000 1.2
+++ sources 27 Oct 2009 12:29:14 -0000 1.3
@@ -1,2 +1,2 @@
-63190e4c21688a4185cc3c0b62aae970 blacklists.tar.gz
-c6e2e9112fdbda0602656f94c1ce31fd squidGuard-1.2.0.tar.gz
+de834150998c1386c30feae196f16b06 squidGuard-1.4.tar.gz
+c239622cf8e956a91b198617723c71a4 blacklists.tgz
squidGuard-paths.patch:
sample.conf.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: squidGuard-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidGuard-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidGuard-paths.patch 6 Sep 2005 10:50:41 -0000 1.1
+++ squidGuard-paths.patch 27 Oct 2009 12:29:14 -0000 1.2
@@ -5,7 +5,7 @@
#
-dbhome @prefix@/squidGuard/db
--logdir @prefix@/squidGuard/logs
+-logdir @prefix@/squidGuard/log
+dbhome @sg_dbhome@
+logdir @sg_logdir@
squidGuard-perlwarning.patch:
squidGuard.cgi.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: squidGuard-perlwarning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidGuard-perlwarning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidGuard-perlwarning.patch 9 Sep 2005 12:16:10 -0000 1.1
+++ squidGuard-perlwarning.patch 27 Oct 2009 12:29:14 -0000 1.2
@@ -1,7 +1,7 @@
--- ./squidGuard-1.2.0/samples/squidGuard.cgi.in.orig 2003-04-12 14:58:38.000000000 -0700
+++ ./squidGuard-1.2.0/samples/squidGuard.cgi.in 2003-04-12 14:58:59.000000000 -0700
@@ -1,4 +1,4 @@
--#! @PERL@ -w
+-#! @PERL@ -w
+#! @PERL@
#
# Explain to the user that the URL is blocked and by which rule set
Index: squidGuard.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidGuard.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidGuard.logrotate 6 Sep 2005 10:50:41 -0000 1.1
+++ squidGuard.logrotate 27 Oct 2009 12:29:14 -0000 1.2
@@ -1,5 +1,6 @@
-/var/log/squid/squidGuard.log {
+/var/log/squidGuard/* {
weekly
+ olddir /var/log/squidGuard/old
compress
notifempty
missingok
Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidGuard.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- squidGuard.spec 29 Aug 2007 14:45:13 -0000 1.6
+++ squidGuard.spec 27 Oct 2009 12:29:14 -0000 1.7
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
# $Id$
%define _dbtopdir %{_var}/%{name}
@@ -5,16 +6,16 @@
%define _cgibin /var/www/cgi-bin
Name: squidGuard
-Version: 1.2.0
-Release: 15%{?dist}
+Version: 1.4
+Release: 8%{?dist}
Summary: Filter, redirector and access controller plugin for squid
Group: System Environment/Daemons
License: GPLv2
-Source0: http://ftp.teledanmark.no/pub/www/proxy/%{name}/%{name}-%{version}.tar.gz
+Source0: http://www.squidguard.org/Downloads/squidGuard-%{version}.tar.gz
Source1: squidGuard.logrotate
-Source2: http://ftp.teledanmark.no/pub/www/proxy/%{name}/contrib/blacklists.tar.gz
+Source2: http://squidguard.mesd.k12.or.us/blacklists.tgz
Source3: http://cuda.port-aransas.k12.tx.us/squid-getlist.html
# K12LTSP stuff
@@ -24,22 +25,26 @@ Source102: squidguard
Source103: transparent-proxying
# SELinux (taken from K12LTSP package)
-Source200: squidGuard.te
-Source201: squidGuard.fc
+#Source200: squidGuard.te
+#Source201: squidGuard.fc
-Patch0: squidGuard-upstream.patch
-Patch1: squidGuard-paths.patch
+#Patch0: squidGuard-upstream.patch
+#Patch1: squidGuard-paths.patch
Patch2: squid-getlist.html.patch
Patch3: squidGuard-perlwarning.patch
-Patch4: squidGuard-sed.patch
+#Patch4: squidGuard-sed.patch
Patch5: squidGuard-makeinstall.patch
+#Patch6: squidGuard-1.3-SG-2008-06-13.patch
+Patch7: squidGuard-1.4-20091015.patch
+Patch8: squidGuard-1.4-20091019.patch
URL: http://www.squidguard.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: db4-devel, bison, byacc, openldap-devel, flex
+BuildRequires: bison, byacc, openldap-devel, flex, compat-db46
+#put db4-devel back and remove compat-db46 once release > 1.4
Requires: squid
-Requires(post): %{_bindir}/chcon
+#Requires(post): %{_bindir}/chcon
Requires(post): /sbin/chkconfig
%description
@@ -69,12 +74,15 @@ Neither squidGuard nor Squid can be used
%prep
%setup -q
%{__cp} %{SOURCE3} .
-%patch0 -p1
-%patch1 -p1 -b .paths
+#%patch0 -p1
+#%patch1 -p1 -b .paths
%patch2 -p0
%patch3 -p2
-%patch4 -p1
+#%patch4 -p1
%patch5 -p1
+#%patch6 -p0
+%patch7 -p0
+%patch8 -p0
%{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
%{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
@@ -82,8 +90,10 @@ Neither squidGuard nor Squid can be used
%build
%configure \
--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
- --with-sg-logdir=%{_var}/log/squid \
- --with-sg-dbhome=%{_dbhomedir}
+ --with-sg-logdir=%{_var}/log/squidGuard \
+ --with-sg-dbhome=%{_dbhomedir} \
+ --with-db-inc=%{_includedir}/db4.6.21 \
+ --with-db-lib=%{_libdir}/db4.6.21
#%{__make} %{?_smp_mflags}
%{__make}
@@ -95,17 +105,19 @@ popd
%install
%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+#%{__make} DESTDIR=$RPM_BUILD_ROOT install
+# This broke as of 1.2.1.
+%{__install} -p -D -m 0755 src/squidGuard $RPM_BUILD_ROOT%{_bindir}/squidGuard
%{__install} -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squidGuard
%{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
-%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
+%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
# Don't use SOURCE3, but use the allready patched one #165689
%{__install} -p -D -m 0755 squid-getlist.html $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/squidGuard
-%{__install} -p -D %{SOURCE200} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
-%{__install} -p -D %{SOURCE201} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
+#%{__install} -p -D %{SOURCE200} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
+#%{__install} -p -D %{SOURCE201} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
%{__install} -p -d $RPM_BUILD_ROOT%{_cgibin}
%{__install} samples/squid*cgi $RPM_BUILD_ROOT%{_cgibin}
@@ -116,19 +128,25 @@ popd
%{__install} -p -D -m 0755 %{SOURCE102} $RPM_BUILD_ROOT%{_initrddir}/squidGuard
%{__install} -p -D -m 0755 %{SOURCE103} $RPM_BUILD_ROOT%{_initrddir}/transparent-proxying
-pushd $RPM_BUILD_ROOT%{_dbhomedir}
-tar xfz $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
-popd
+#pushd $RPM_BUILD_ROOT%{_dbhomedir}
+tar xfz $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
+#popd
sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
+%{__install} -p -D -m 0644 samples/babel.* $RPM_BUILD_ROOT%{_cgibin}
+
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squidGuard
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squid
+ln -s ../squidGuard/squidGuard.log $RPM_BUILD_ROOT%{_localstatedir}/log/squid/squidGuard.log
+
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%post
# fix SELinux bits
-%{_bindir}/chcon -R system_u:object_r:squid_cache_t /var/squidGuard >/dev/null 2>&1
-%{_bindir}/chcon -R system_u:object_r:squid_log_t /var/log/squidGuard >/dev/null 2>&1
+#%{_bindir}/chcon -R system_u:object_r:squid_cache_t /var/squidGuard >/dev/null 2>&1
+#%{_bindir}/chcon -R system_u:object_r:squid_log_t /var/log/squidGuard >/dev/null 2>&1
# do we need a new config file?
if [ -s %{_sysconfdir}/squid/squidGuard.conf ]; then
@@ -144,10 +162,10 @@ cat %{_docdir}/%{name}-%{version}/squidG
/sbin/chkconfig --add transparent-proxying
# reload SELinux policies
-echo "Loading new SELinux policy"
-pushd %{_sysconfdir}/selinux/targeted/src/policy/
-%{__make} load &> /dev/null
-popd
+#echo "Loading new SELinux policy"
+#pushd %{_sysconfdir}/selinux/targeted/src/policy/
+#%{__make} load &> /dev/null
+#popd
#### End of %post
@@ -171,13 +189,67 @@ fi
%config(noreplace) %{_sysconfdir}/logrotate.d/squidGuard
%config(noreplace) %{_sysconfdir}/cron.daily/squidGuard
%{_dbtopdir}/
-%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
-%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
-%attr(07550,root,root) %{_cgibin}/*.cgi
+#%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
+#%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
+%attr(0755,root,root) %{_cgibin}/*.cgi
+%config(noreplace) %{_cgibin}/squidGuard.cgi
+%{_cgibin}/babel.*
%{_initrddir}/squidGuard
%{_initrddir}/transparent-proxying
+%{_localstatedir}/log/squidGuard
+%{_localstatedir}/log/squid/squidGuard.log
%changelog
+* Mon Oct 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-8
+- Applying upstream patches for CVE-2009-3700, BZ 530862.
+
+* Thu Sep 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-7
+- Make squidGuard.cgi config(noreplace)
+- Relocated logs, updated logrotate file.
+- Updated blacklist URL.
+
+* Wed Sep 09 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-6
+- Include babel files, BZ 522038.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Mar 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-4
+- Initscript cleanup, BZ 247065.
+
+* Tue Feb 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-3
+- Drop chcon Req.
+
+* Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-2
+- Dropping selinux policy and chcon, BZ 486634.
+- Fixed URL of Source0.
+
+* Wed Feb 18 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-1
+- Update to 1.4, BZ 485530.
+- Building against compat-db46 until next version.
+
+* Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.3-1
+- Update to 1.3.
+- Dropped paths, sed patches, applied upstream.
+- New SG-2008-06-13 patch.
+
+* Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.1-2
+- Fix sg-2008-06-13, BZ 452467.
+
+* Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.1-1
+- Update to 1.2.1, BZ 245377.
+- Dropped upstream patch.
+- Updated blacklists.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.0-18
+- Autorebuild for GCC 4.3
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.2.0-17
+ - Rebuild for deps
+
+* Fri Nov 16 2007 John Berninger <john at ncphotography dot com> 1.2.0-16
+- Fix perms on cgi-bin files
+
* Mon Mar 26 2007 John Berninger <jwb at redhat dot com> 1.2.0-15
- Assert ownership of /var/squidGuard - bz 233915
Index: squidguard
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidguard,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidguard 9 Sep 2005 12:16:10 -0000 1.1
+++ squidguard 27 Oct 2009 12:29:14 -0000 1.2
@@ -13,6 +13,16 @@
# pidfile: /var/run/squid.pid
# config: /etc/squid/squid-squidGuard.conf
+### BEGIN INIT INFO
+# Provides: lsb-squidguard
+# Required-Start: $local_fs $network $remote_fs $squid
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: start and stop squidGuard
+# Description: SquidGuard - web filtering system for the Squid proxy server.
+### END INIT INFO
+
PATH=/usr/bin:/sbin:/bin:/usr/sbin
export PATH
More information about the fedora-extras-commits
mailing list