rpms/squidGuard/devel squidGuard.logrotate, 1.1, 1.2 squidGuard.spec, 1.20, 1.21
Jon Ciesla
limb at fedoraproject.org
Wed Oct 21 19:35:22 UTC 2009
Author: limb
Update of /cvs/pkgs/rpms/squidGuard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1202
Modified Files:
squidGuard.logrotate squidGuard.spec
Log Message:
BZ 522038
Index: squidGuard.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/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 21 Oct 2009 19:35:22 -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/devel/squidGuard.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- squidGuard.spec 9 Sep 2009 17:51:25 -0000 1.20
+++ squidGuard.spec 21 Oct 2009 19:35:22 -0000 1.21
@@ -7,7 +7,7 @@
Name: squidGuard
Version: 1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Filter, redirector and access controller plugin for squid
Group: System Environment/Daemons
@@ -15,7 +15,7 @@ License: GPLv2
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
@@ -86,7 +86,7 @@ Neither squidGuard nor Squid can be used
%build
%configure \
--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
- --with-sg-logdir=%{_var}/log/squid \
+ --with-sg-logdir=%{_var}/log/squidGuard \
--with-sg-dbhome=%{_dbhomedir} \
--with-db-inc=%{_includedir}/db4.6.21 \
--with-db-lib=%{_libdir}/db4.6.21
@@ -107,7 +107,7 @@ popd
%{__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
@@ -124,14 +124,18 @@ 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
@@ -184,11 +188,19 @@ fi
#%{_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
+* 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.
More information about the fedora-extras-commits
mailing list