diff --git a/squid-3.1.5-libtoolinclude.patch b/squid-3.1.5-libtoolinclude.patch new file mode 100644 index 0000000..5f57dd2 --- /dev/null +++ b/squid-3.1.5-libtoolinclude.patch @@ -0,0 +1,16 @@ +diff -ru squid-3.1.5/libltdl/ltdl.h squid-3.1.5-libtool-fixed/libltdl/ltdl.h +--- squid-3.1.5/libltdl/ltdl.h 2010-07-02 04:47:56.000000000 +0200 ++++ squid-3.1.5-libtool-fixed/libltdl/ltdl.h 2010-07-15 13:10:27.000000000 +0200 +@@ -33,9 +33,9 @@ + #if !defined(LTDL_H) + #define LTDL_H 1 + +-#include +-#include +-#include ++#include "libltdl/lt_system.h" ++#include "libltdl/lt_error.h" ++#include "libltdl/lt_dlloader.h" + + LT_BEGIN_C_DECLS + diff --git a/squid.spec b/squid.spec index 748b150..c431df3 100644 --- a/squid.spec +++ b/squid.spec @@ -4,7 +4,7 @@ Name: squid Version: 3.1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Squid proxy caching server Epoch: 7 License: GPLv2 @@ -35,6 +35,10 @@ Patch204: squid-3.0.STABLE1-perlpath.patch Patch205: squid-3.1.0.15-smb-path.patch Patch208: squid-3.0.STABLE7-from_manpg.patch +# Temporary patches +# 3.1.5 bundles a slightly broken libtool. Fixed upstream. +Patch301: squid-3.1.5-libtoolinclude.patch + Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: bash >= 2.0 Requires(pre): shadow-utils @@ -83,7 +87,10 @@ lookup program (dnsserver), a program for retrieving FTP data %patch205 -p1 -b .smb-path %patch208 -p1 -b .from_manpg +%patch301 -p1 -b .libtoolinclude + %build + %configure \ --exec_prefix=/usr \ --libexecdir=%{_libdir}/squid \ @@ -266,7 +273,7 @@ fi %changelog -* Thu Jul 15 2010 Henrik Nordstrom - 7:3.1.5-1 +* Thu Jul 15 2010 Henrik Nordstrom - 7:3.1.5-2 - Upstream 3.1.5 bugfix release - Upstream patch for Bug #614665: Squid crashes with ident auth - Upstream patches for various memory leaks