From fc37d859ec34a0a2bc080dbc40a1f40cc5f9628a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <hno@fedoraproject.org>
Date: Fri, 4 Sep 2009 02:07:10 +0000
Subject: [PATCH] 3.1: fix alias-link.sh DESTDIR issue

---
 squid-3.1.0.13-alias-link.patch | 12 ++++++++++++
 squid.spec-3.1                  | 20 ++++++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 squid-3.1.0.13-alias-link.patch

diff --git a/squid-3.1.0.13-alias-link.patch b/squid-3.1.0.13-alias-link.patch
new file mode 100644
index 0000000..1247f9d
--- /dev/null
+++ b/squid-3.1.0.13-alias-link.patch
@@ -0,0 +1,12 @@
+=== modified file 'errors/alias-link.sh'
+--- errors/alias-link.sh	2009-07-06 03:12:39 +0000
++++ errors/alias-link.sh	2009-09-04 01:07:00 +0000
+@@ -38,6 +38,6 @@
+ 	# Remove and replace any pre-existing content/link
+ 	for alia in ${aliases}; do
+ 		${RM} -f -r ${DIR}/${alia} || exit 1
+-		${LN} -s ${DIR}/${base} ${DIR}/${alia} || exit 1
++		${LN} -s ${base} ${DIR}/${alia} || exit 1
+ 	done
+ done
+
diff --git a/squid.spec-3.1 b/squid.spec-3.1
index 9e73c2c..d99ede7 100644
--- a/squid.spec-3.1
+++ b/squid.spec-3.1
@@ -30,6 +30,8 @@ Source98: perl-requires-squid.sh
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/bXXXX.patch
 Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9694.patch
+# Upstream fix, but have not reached 3.1 yet
+Patch002: squid-3.1.0.13-alias-link.patch
 
 # External patches
 
@@ -68,6 +70,7 @@ lookup program (dnsserver), a program for retrieving FTP data
 %setup -q
 
 %patch001 -p0 -b .b9694
+%patch002 -p0 -b .alias-link
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -79,7 +82,6 @@ lookup program (dnsserver), a program for retrieving FTP data
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
 %configure \
    --exec_prefix=/usr \
-   --bindir=%{_sbindir} \
    --libexecdir=%{_libdir}/squid \
    --localstatedir=/var \
    --datadir=%{_datadir} \
@@ -88,9 +90,9 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned
    --with-pidfile='$(localstatedir)/run/squid.pid' \
    --disable-dependency-tracking \
    --enable-arp-acl \
+   --enable-follow-x-forwarded-for \
    --enable-auth="basic,digest,ntlm,negotiate" \
    --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
-   --enable-negotiate-auth-helpers="squid_kerb_auth" \
    --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
    --enable-digest-auth-helpers="password,ldap,eDirectory" \
    --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
@@ -118,8 +120,8 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned
    --with-openssl=/usr/kerberos \
    --with-pthreads
 
-# following options are no longer supported but may be supported in future
-#   --enable-follow-x-forwarded-for
+# following options should be enabled but fails building
+#   --enable-negotiate-auth-helpers="squid_kerb_auth"
 
 export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
 make %{?_smp_mflags}
@@ -166,7 +168,7 @@ iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
 mv -f ChangeLog.tmp ChangeLog
 
 # squid.conf.documented is documentation. We ship that in doc/
-rm -f $RPM_BUILD_ROOT%{sysconfdir}/squid/squid.conf.documented
+rm -f $RPM_BUILD_ROOT/etc/squid/squid.conf.documented
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
@@ -184,19 +186,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %dir %{_libdir}/squid
 %attr(750,squid,squid) %dir /var/log/squid
 %attr(750,squid,squid) %dir /var/spool/squid
-%attr(4750,root,squid) %{_libdir}/squid/ncsa_auth
-%attr(4750,root,squid) %{_libdir}/squid/pam_auth
 
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
 %config(noreplace) %attr(644,root,squid) /etc/squid/cachemgr.conf
 %config(noreplace) /etc/squid/mime.conf
+%config(noreplace) /etc/squid/errorpage.css
 %config(noreplace) /etc/sysconfig/squid
 %config(noreplace) /etc/squid/msntauth.conf
 # These are not noreplace because they are just sample config files
 %config /etc/squid/msntauth.conf.default
 %config /etc/squid/squid.conf.default
 %config /etc/squid/mime.conf.default
+%config /etc/squid/errorpage.css.default
 %config /etc/squid/cachemgr.conf.default
 %config(noreplace) /etc/pam.d/squid
 %config(noreplace) /etc/logrotate.d/squid
@@ -206,9 +208,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /etc/rc.d/init.d/squid
 %attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid
 %{_datadir}/squid/icons
+%{_datadir}/squid/mib.txt
 %{_sbindir}/squid
-%{_sbindir}/squidclient
+%{_bindir}/squidclient
 %{_mandir}/man8/*
+%{_mandir}/man1/*
 %{_libdir}/squid/*
 
 %pre