smb-patch rediffed for 3.1.0.15

This commit is contained in:
Henrik Nordström 2009-11-23 16:57:17 +00:00
parent 9a9c9a8813
commit 02307c73c8
2 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,6 @@
diff -up squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am
--- squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am.smb-path 2009-08-04 15:32:09.000000000 +0200
+++ squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am 2009-09-01 01:26:27.000000000 +0200
diff -up squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am
--- squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am.smb-path 2009-11-23 04:09:56.000000000 +0100
+++ squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.am 2009-11-23 17:53:39.000000000 +0100
@@ -9,14 +9,14 @@
include $(top_srcdir)/src/Common.am
@ -18,11 +18,11 @@ diff -up squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.0.
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
libexec_SCRIPTS = $(SMB_AUTH_HELPER)
diff -up squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in
--- squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in.smb-path 2009-08-04 15:32:31.000000000 +0200
+++ squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in 2009-09-01 01:27:11.000000000 +0200
@@ -266,11 +266,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
-I$(top_builddir)/include @SQUID_CPPUNIT_INC@ -I$(srcdir)
diff -up squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in
--- squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in.smb-path 2009-11-23 04:10:32.000000000 +0100
+++ squid-3.1.0.15/helpers/basic_auth/SMB/Makefile.in 2009-11-23 17:54:47.000000000 +0100
@@ -271,11 +271,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
-I$(top_builddir)/include $(SQUID_CPPUNIT_INC) -I$(srcdir)
# SAMBAPREFIX must point to the directory where Samba has been installed.
-# By default, Samba is installed in /usr/local/samba. If you changed this

View File

@ -4,7 +4,7 @@
Name: squid
Version: 3.1.0.15
Release: 1%{?dist}
Release: 2%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
License: GPLv2+
@ -29,7 +29,7 @@ Source98: perl-requires-squid.sh
Patch201: squid-3.1.0.9-config.patch
Patch202: squid-3.1.0.9-location.patch
Patch204: squid-3.0.STABLE1-perlpath.patch
Patch205: squid-3.1.0.13-smb-path.patch
Patch205: squid-3.1.0.15-smb-path.patch
Patch208: squid-3.0.STABLE7-from_manpg.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -252,7 +252,7 @@ fi
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
%changelog
* Mon Nov 23 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.15-1
* Mon Nov 23 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.15-2
- Update to 3.1.0.15 with a number of bugfixes and a workaround for
ICEcast/SHOUTcast streams.