Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org --- lfs/squid | 1 + src/patches/squid/squid-3.5-14084.patch | 49 +++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 src/patches/squid/squid-3.5-14084.patch
diff --git a/lfs/squid b/lfs/squid index 9677c2b..7ea4ce7 100644 --- a/lfs/squid +++ b/lfs/squid @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14082.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14083.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14084.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.21-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi diff --git a/src/patches/squid/squid-3.5-14084.patch b/src/patches/squid/squid-3.5-14084.patch new file mode 100644 index 0000000..e51a2d1 --- /dev/null +++ b/src/patches/squid/squid-3.5-14084.patch @@ -0,0 +1,49 @@ +------------------------------------------------------------ +revno: 14084 +revision-id: squid3@treenet.co.nz-20160921020936-2tn38o3ed7ssydfw +parent: squid3@treenet.co.nz-20160916185004-ql4nhzwswotza6zw +fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4228 +author: Alex Rousskov rousskov@measurement-factory.com +committer: Amos Jeffries squid3@treenet.co.nz +branch nick: 3.5 +timestamp: Wed 2016-09-21 14:09:36 +1200 +message: + Bug 4228: ./configure bug/typo in r14394. + + The bug resulted in "test: too many arguments" error messages when + running ./configure and effectively replaced AC_MSG_ERROR() with + AC_MSG_WARN() for missing but required Heimdal and GNU GSS Kerberos + libraries. +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3@treenet.co.nz-20160921020936-2tn38o3ed7ssydfw +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# testament_sha1: 83ad02c71a6f6161e87dbdc13ed6a11f5bd2a079 +# timestamp: 2016-09-21 02:51:01 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# base_revision_id: squid3@treenet.co.nz-20160916185004-\ +# ql4nhzwswotza6zw +# +# Begin patch +=== modified file 'configure.ac' +--- configure.ac 2016-09-08 18:55:14 +0000 ++++ configure.ac 2016-09-21 02:09:36 +0000 +@@ -1778,7 +1778,7 @@ + SQUID_CHECK_KRB5_FUNCS + fi + if test "x$KRB5LIBS" = "x"; then +- if test test "x$with_heimdal_krb5" = "xyes"; then ++ if test "x$with_heimdal_krb5" = "xyes"; then + AC_MSG_ERROR([Required Heimdal Kerberos library not found]) + else + AC_MSG_WARN([Heimdal Kerberos library not found]) +@@ -1848,7 +1848,7 @@ + SQUID_DEFINE_BOOL(HAVE_KRB5,$squid_cv_working_krb5,[KRB5 support]) + fi + if test "x$KRB5LIBS" = "x"; then +- if test test "x$with_gnugss" = "xyes"; then ++ if test "x$with_gnugss" = "xyes"; then + AC_MSG_ERROR([Required GNU GSS Kerberos library not found]) + else + AC_MSG_WARN([GNU GSS Kerberos library not found]) +
-
Matthias Fischer