rpms/squidGuard/F-9 sources, 1.4, 1.5 squidGuard-perlwarning.patch, 1.1, 1.2 squidGuard.spec, 1.13, 1.14
Jon Ciesla
limb at fedoraproject.org
Tue Feb 24 16:49:44 UTC 2009
Author: limb
Update of /cvs/pkgs/rpms/squidGuard/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14255
Modified Files:
sources squidGuard-perlwarning.patch squidGuard.spec
Log Message:
SElinux fix.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 17 Feb 2009 16:34:48 -0000 1.4
+++ sources 24 Feb 2009 16:49:13 -0000 1.5
@@ -1,2 +1,2 @@
-d7c2c2e03a2835e4d1c3bef751ace76f squidGuard-1.3.tar.gz
+de834150998c1386c30feae196f16b06 squidGuard-1.4.tar.gz
7ebb53ea33459c14cbc850cd73405915 blacklists.tar.gz
squidGuard-perlwarning.patch:
Index: squidGuard-perlwarning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-9/squidGuard-perlwarning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squidGuard-perlwarning.patch 9 Sep 2005 12:16:10 -0000 1.1
+++ squidGuard-perlwarning.patch 24 Feb 2009 16:49:13 -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.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-9/squidGuard.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- squidGuard.spec 17 Feb 2009 16:34:48 -0000 1.13
+++ squidGuard.spec 24 Feb 2009 16:49:13 -0000 1.14
@@ -6,14 +6,14 @@
%define _cgibin /var/www/cgi-bin
Name: squidGuard
-Version: 1.3
-Release: 1%{?dist}
+Version: 1.4
+Release: 2%{?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
Source3: http://cuda.port-aransas.k12.tx.us/squid-getlist.html
@@ -25,8 +25,8 @@
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
@@ -34,14 +34,14 @@
Patch3: squidGuard-perlwarning.patch
#Patch4: squidGuard-sed.patch
Patch5: squidGuard-makeinstall.patch
-Patch6: squidGuard-1.3-SG-2008-06-13.patch
+#Patch6: squidGuard-1.3-SG-2008-06-13.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, db4-devel
Requires: squid
-Requires(post): %{_bindir}/chcon
+#Requires(post): %{_bindir}/chcon
Requires(post): /sbin/chkconfig
%description
@@ -77,7 +77,7 @@
%patch3 -p2
#%patch4 -p1
%patch5 -p1
-%patch6 -p0
+#%patch6 -p0
%{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
%{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
@@ -86,7 +86,9 @@
%configure \
--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
--with-sg-logdir=%{_var}/log/squid \
- --with-sg-dbhome=%{_dbhomedir}
+ --with-sg-dbhome=%{_dbhomedir} \
+ --with-db-inc=%{_includedir}/db4.6.21 \
+ --with-db-lib=%{_libdir}/db4.6.21
#%{__make} %{?_smp_mflags}
%{__make}
@@ -109,8 +111,8 @@
# 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}
@@ -132,8 +134,8 @@
%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
@@ -149,10 +151,10 @@
/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
@@ -176,13 +178,21 @@
%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
+#%{_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
%{_initrddir}/squidGuard
%{_initrddir}/transparent-proxying
%changelog
+* 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.
More information about the scm-commits
mailing list