rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import squid-2.5.STABLE5-1 from squid-2.5.STABLE5-1.src.rpm

Browse Source
This commit is contained in:
cvsdist 2004-09-09 12:45:32 +00:00
parent 3a42f57015
commit 9f3948d4bc
6 changed files with 130 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
squid-2.5.STABLE3.tar.bz2
squid-2.5.STABLE5.tar.bz2

3
perl-requires-squid.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
/usr/lib/rpm/perl.req $* | grep -v "Authen::Smb"

2
sources
View File

@ -1 +1 @@
ed5eb7835d00fdecc7dd7c1837542df2 squid-2.5.STABLE3.tar.bz2
45ed1b1cd492e3f529085d09c3ffc1b8 squid-2.5.STABLE5.tar.bz2

35
squid-2.5.STABLE4-location.patch Normal file
View File

@ -0,0 +1,35 @@
--- squid-2.5.STABLE4/QUICKSTART.location 2003-07-18 04:53:27.000000000 -0400
+++ squid-2.5.STABLE4/QUICKSTART 2003-09-23 15:52:16.000000000 -0400
@@ -12,10 +12,9 @@
INSTALL in the same directory), you have to configure the squid.conf
file. This is the list of the values you *need* to change, because no
sensible defaults could be defined. Do not touch the other variables
-for now. We assume you have installed Squid in the default location:
-/usr/local/squid
+for now.
-Uncomment and edit the following lines in /usr/local/squid/etc/squid.conf:
+Uncomment and edit the following lines in /etc/squid/squid.conf:
==============================================================================
@@ -26,7 +25,7 @@
always ask permission before adding a parent cache. See also the
never_direct/always_direct directives.
-cache_dir /usr/local/squid/var/cache 100 16 256
+cache_dir /var/spool/squid 100 16 256
Add here (first number, here 100) the amount of hard disk space
(in megabytes) to devote to caching.
@@ -69,8 +68,8 @@
After editing squid.conf to your liking, run Squid from the command
line TWICE:
- % /usr/local/squid/sbin/squid -z
- % /usr/local/squid/sbin/squid
+ % /usr/sbin/squid -z
+ % /usr/sbin/squid
Check in the cache.log (/usr/local/squid/var/logs/cache.log) that
everything is all right.

8
squid-2.5.STABLE4-perlpath.patch Normal file
View File

@ -0,0 +1,8 @@
--- squid-2.5.STABLE4/contrib/#url-normalizer.pl~ 2004-02-06 14:08:29.000000000 -0500
+++ squid-2.5.STABLE4/contrib/url-normalizer.pl 2004-02-06 14:08:29.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -Tw
+#!/usr/bin/perl -Tw
# From: Markus Gyger <mgyger@itr.ch>
#

137
squid.spec
View File

@ -1,33 +1,31 @@
## % define _use_internal_dependency_generator 0
%define __perl_requires %{SOURCE98}
## % define __find_requires %{SOURCE99}
Summary: The Squid proxy caching server.
Name: squid
Version: 2.5.STABLE3
Release: 0
Serial: 7
Version: 2.5.STABLE5
Release: 1
Epoch: 7
License: GPL
Group: System Environment/Daemons
Source: http://www.squid-cache.org/Squid/v2/squid-%{version}.tar.bz2
Source: http://www.squid-cache.org/Squid/Versions/v2/2.5/squid-%{version}.tar.bz2
Source1: http://www.squid-cache.org/Squid/FAQ/FAQ.sgml
Source2: squid.init
Source3: squid.logrotate
Source4: squid.sysconfig
Source98: perl-requires-squid.sh
## Source99: filter-requires-squid.sh
Patch1: squid-2.5.STABLE3-config.patch
Patch2: squid-perlpath.patch
Patch3: squid-location.patch
#Patch2: squid-perlpath.patch
Patch3: squid-2.5.STABLE4-location.patch
Patch4: squid-2.5.STABLE3-build.patch
#Patch5: squid-2.4.STABLE7-fdoverride.patch
# Official upstream patches
Patch100: squid-2.5.STABLE3-Lithuanian.patch
Patch101: squid-2.5.STABLE3-deny_info.patch
Patch102: squid-2.5.STABLE3-HttpHeaderTools.patch
Patch103: squid-2.5.STABLE3-external_acl_ident.patch
Patch104: squid-2.5.STABLE3-aufs-openingfds.patch
Patch105: squid-2.5.STABLE3-gcc-3_3.patch
Patch5: squid-2.5.STABLE4-perlpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prereq: /sbin/chkconfig logrotate shadow-utils
Requires: bash >= 2.0
BuildPrereq: openjade linuxdoc-tools openldap-devel pam-devel
BuildPrereq: openjade linuxdoc-tools openldap-devel pam-devel openssl-devel
Obsoletes: squid-novm
%description
@ -48,22 +46,14 @@ lookup program (dnsserver), a program for retrieving FTP data
#%patch2 -p1 -b .perlpath
%patch3 -p1 -b .location
%patch4 -p1 -b .build
#%patch5 -p1 -b .prefdoverride
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
%patch105 -p1
%patch5 -p1 -b .perlpath
%build
# export CFLAGS=-fpie ; export LDFLAGS=-pie ;
export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
%configure \
--exec_prefix=/usr \
--bindir=/usr/sbin \
--libexecdir=/usr/lib/squid \
--bindir=%{_sbindir} \
--libexecdir=%{_libdir}/squid \
--localstatedir=/var \
--sysconfdir=/etc/squid \
--enable-poll \
@ -75,20 +65,25 @@ lookup program (dnsserver), a program for retrieving FTP data
--enable-delay-pools \
--enable-linux-netfilter \
--with-pthreads \
--enable-basic-auth-helpers="LDAP,NCSA,PAM,SMB,SASL,MSNT" \
--enable-ntlm-auth-helpers="SMB,winbind" \
--enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group,winbind_group" \
--enable-auth="basic,ntlm" \
--with-winbind-auth-challenge \
--enable-useragent-log \
--enable-referer-log \
# --enable-icmp \
--disable-dependency-tracking \
--enable-cachemgr-hostname=localhost \
--disable-ident-lookups \
--enable-truncate \
--enable-underscores \
--datadir=%{_datadir} \
--enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,winbind" \
#export CFLAGS=-fpie ; export LDFLAGS=-pie ;
make
export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
make %{?_smp_mflags}
mkdir faq
cp $RPM_SOURCE_DIR/FAQ.sgml faq
cp %{SOURCE1} faq
cd faq
sgml2html FAQ.sgml
@ -99,17 +94,18 @@ rm -rf $RPM_BUILD_ROOT
%makeinstall \
sysconfdir=$RPM_BUILD_ROOT/etc/squid \
localstatedir=$RPM_BUILD_ROOT/var \
bindir=$RPM_BUILD_ROOT/usr/sbin \
libexecdir=$RPM_BUILD_ROOT/usr/lib/squid
bindir=$RPM_BUILD_ROOT/%{_sbindir} \
libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
ln -s %{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
ln -s %{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
install -m 755 $RPM_SOURCE_DIR/squid.init $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
install -m 644 $RPM_SOURCE_DIR/squid.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/squid
install -m 644 $RPM_SOURCE_DIR/squid.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/squid
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/squid
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/squid
mkdir -p $RPM_BUILD_ROOT/var/log/squid
mkdir -p $RPM_BUILD_ROOT/var/spool/squid
@ -122,28 +118,33 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%dir /etc/squid
%doc faq/* README ChangeLog QUICKSTART doc/*
%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
%attr(755,root,root) %dir /etc/squid
%attr(755,root,root) %dir %{_libdir}/squid
%attr(750,squid,squid) %dir /var/log/squid
%attr(750,squid,squid) %dir /var/spool/squid
%config(noreplace) /etc/squid/squid.conf
%config(noreplace) /etc/squid/mime.conf
%config(noreplace) /etc/sysconfig/squid
%config(noreplace) /etc/squid/msntauth.conf
%config /etc/squid/mib.txt
%config(noreplace) /etc/squid/mib.txt
/etc/squid/msntauth.conf.default
/etc/squid/squid.conf.default
/etc/squid/mime.conf.default
%config(noreplace) /etc/squid/errors
/usr/lib/squid
%{_datadir}/squid
/usr/sbin/squid
/usr/sbin/squidclient
%config /etc/rc.d/init.d/squid
%config /etc/logrotate.d/squid
%{_sbindir}/squid
%{_sbindir}/squidclient
%config(noreplace) /etc/squid/icons
%config(noreplace) /etc/rc.d/init.d/squid
%config(noreplace) /etc/logrotate.d/squid
%doc faq/* README ChangeLog QUICKSTART doc/*
#%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
%attr(750,squid,squid) %dir /var/log/squid
%attr(750,squid,squid) %dir /var/spool/squid
%{_mandir}/man8/*
%{_libdir}/squid/*
%pre
/usr/sbin/useradd -u 23 -d /var/spool/squid -r -s /sbin/nologin squid >/dev/null 2>&1
@ -151,7 +152,7 @@ rm -rf $RPM_BUILD_ROOT
for i in /var/log/squid /var/spool/squid ; do
if [ -d $i ] ; then
for adir in `find $i -maxdepth 0 \! -user squid`; do
chown -R squid.squid $adir
chown -R squid:squid $adir
done
fi
done
@ -247,12 +248,6 @@ if [ $1 = 0 ]; then
ln -snf %{_datadir}/squid/errors/$DIR /etc/squid/errors
fi
%triggerpostun -- squid < 2.5.STABLE1-1
errordir=`ls -ld /etc/squid/errors | awk '{ print $NF }'`
errordir=${errordir##*/}
ln -snf %{_datadir}/squid/errors/$DIR /etc/squid/errors
%preun
if [ $1 = 0 ] ; then
service squid stop >/dev/null 2>&1
@ -266,6 +261,38 @@ if [ "$1" -ge "1" ] ; then
fi
%changelog
* Tue Mar 2 2004 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE5-1
- New upstream version, obsoletes many patches.
- Fix --datadir passed to configure. Configure automatically adds /squid
so we shouldn't.
- Remove the problematic triggerpostun trigger, since is's broken, and FC2
never shipped with that old version.
- add %{?_smp_mflags} to make line.
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Mon Feb 23 2004 Tim Waugh <twaugh@redhat.com>
- Use ':' instead of '.' as separator for chown.
* Fri Feb 20 2004 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE4-3
- Clean up the spec file to work on 64-bit platforms (use %{_libdir}
instead of /usr/lib, etc)
- Make the release number in the changelog section agree with reality.
- use -fPIE rather than -fpie. s390 fails with just -fpie
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Thu Feb 5 2004 Jay Fenlason <fenlason@redhat.com>
- Incorporate many upstream patches
- Include many spec file changes from D.Johnson <dj@www.uk.linux.org>
* Tue Sep 23 2003 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE4-1
- New upstream version.
- Fix the Source: line in this spec file to point to the correct URL.
- redo the -location patch to work with the new upstream version.
* Mon Jun 30 2003 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE3-0
- Spec file change to enable the nul storage module. bugzilla #74654
- Upgrade to 2.5STABLE3 with current official patches.