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

samba path fix

Browse Source
This commit is contained in:
Martin Stransky 2005-12-29 14:23:41 +00:00
parent 531e71779f
commit 26659f75ff
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
squid-2.5.STABLE12-smb-path.patch Normal file
View File

@ -0,0 +1,39 @@
--- squid-2.5.STABLE12/helpers/basic_auth/SMB/Makefile.am.old 2002-08-12 03:13:42.000000000 +0200
+++ squid-2.5.STABLE12/helpers/basic_auth/SMB/Makefile.am 2005-12-29 14:49:24.000000000 +0100
@@ -7,14 +7,14 @@
#
# SAMBAPREFIX must point to the directory where Samba has been installed.
-# By default, Samba is installed in /usr/local/samba. If you changed this
+# By default, Samba is installed in /usr. If you changed this
# by using the --prefix option when configuring Samba, you need to change
# SAMBAPREFIX accordingly.
## FIXME: autoconf should test for the samba path.
SMB_AUTH_HELPER = smb_auth.sh
-SAMBAPREFIX=/usr/local/samba
+SAMBAPREFIX=/usr
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
libexec_SCRIPTS = $(SMB_AUTH_HELPER)
--- squid-2.5.STABLE12/helpers/basic_auth/SMB/Makefile.in.old 2005-09-28 22:57:19.000000000 +0200
+++ squid-2.5.STABLE12/helpers/basic_auth/SMB/Makefile.in 2005-12-29 14:49:16.000000000 +0100
@@ -22,7 +22,7 @@
#
# SAMBAPREFIX must point to the directory where Samba has been installed.
-# By default, Samba is installed in /usr/local/samba. If you changed this
+# By default, Samba is installed in /usr. If you changed this
# by using the --prefix option when configuring Samba, you need to change
# SAMBAPREFIX accordingly.
@@ -131,7 +131,7 @@
makesnmplib = @makesnmplib@
SMB_AUTH_HELPER = smb_auth.sh
-SAMBAPREFIX = /usr/local/samba
+SAMBAPREFIX = /usr
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
libexec_SCRIPTS = $(SMB_AUTH_HELPER)

3
squid.spec
View File

@ -37,6 +37,7 @@ Patch206: squid-2.5.STABLE12-libbind.patch
Patch207: squid-2.5.STABLE12-64bit.patch
Patch208: squid-2.5.STABLE12-fd-config.patch
Patch209: squid-2.5.STABLE12-fd-config-fix.patch
Patch210: squid-2.5.STABLE12-smb-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prereq: /sbin/chkconfig logrotate shadow-utils
@ -73,6 +74,7 @@ lookup program (dnsserver), a program for retrieving FTP data
%patch207 -p1 -b .stat
%patch208 -p1 -b .fdc
%patch209 -p1 -b .fdc
%patch210 -p1 -b .path
%build
export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
@ -324,6 +326,7 @@ chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
%changelog
* Wed Dec 28 2005 Martin Stransky <stransky@redhat.com> 7:2.5.STABLE12-4
- added follow-xff patch (#176055)
- samba path fix (#176659)
* Mon Dec 19 2005 Martin Stransky <stransky@redhat.com> 7:2.5.STABLE12-3
- fd-config.patch clean-up