squid: add version 3.1.4

Signed-off-by: Roman I Khimov <khimov@altell.ru>

7 files changed, 175 insertions, 4 deletions

diff --git a/recipes/squid/squid-3.1.4/fix-ltdl-usage.patch b/recipes/squid/squid-3.1.4/fix-ltdl-usage.patch
new file mode 100644
index 0000000000..ea8536dc76
--- /dev/null
+++ b/recipes/squid/squid-3.1.4/fix-ltdl-usage.patch
@@ -0,0 +1,22 @@
+Index: squid-3.1.4/configure.in
+===================================================================
+--- squid-3.1.4.orig/configure.in	2010-07-07 12:20:47.000000000 +0400
++++ squid-3.1.4/configure.in	2010-07-07 12:23:17.000000000 +0400
+@@ -79,7 +79,8 @@
+     top_build_prefix=${ac_top_build_prefix}
+     AC_SUBST(top_build_prefix)
+ 
+-    AC_LIBLTDL_CONVENIENCE
++    LT_CONFIG_LTDL_DIR(libltdl)
++    LTDL_INIT(convenience)
+ fi
+ AC_PROG_LIBTOOL
+ AC_LTDL_DLLIB
+@@ -3965,6 +3966,6 @@
+ AC_CONFIG_SUBDIRS(lib/libTrie)
+ 
+ # must configure libltdl subdir unconditionally for "make distcheck" to work
+-AC_CONFIG_SUBDIRS(libltdl)
++# AC_CONFIG_SUBDIRS(libltdl)
+ 
+ AC_OUTPUT
diff --git a/recipes/squid/squid-3.1.4/fix-runs-in-configure.patch b/recipes/squid/squid-3.1.4/fix-runs-in-configure.patch
new file mode 100644
index 0000000000..db4f7c0e03
--- /dev/null
+++ b/recipes/squid/squid-3.1.4/fix-runs-in-configure.patch
@@ -0,0 +1,80 @@
+Index: squid-3.1.4/configure.in
+===================================================================
+--- squid-3.1.4.orig/configure.in	2010-07-06 16:09:45.000000000 +0400
++++ squid-3.1.4/configure.in	2010-07-06 16:09:45.000000000 +0400
+@@ -365,10 +365,6 @@
+   fi
+ ])
+ 
+-dnl Nasty hack to get autoconf 2.64 on Linux to run.
+-dnl all other uses of RUN_IFELSE are wrapped inside CACHE_CHECK which breaks on 2.64
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int argc, char **argv) { return 0; } ]])],[],[],[])
+-
+ dnl This is a developer only option.. developers know how to set defines
+ dnl
+ dnl AC_ARG_ENABLE(xmalloc-debug,
+@@ -2680,7 +2676,7 @@
+       ;;
+   esac
+   AC_CACHE_CHECK([if PF_INET6 is available], squid_cv_pf_inet6,
+-    AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* PF_INET6 available check */
++    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ /* PF_INET6 available check */
+ #       include <sys/types.h>
+ #       include <sys/socket.h>
+         int main(int argc, char **argv) {
+@@ -2720,7 +2716,7 @@
+ dnl But only usable if it actually works...
+   if test "$use_v4mapped" = "yes" ; then
+     AC_MSG_CHECKING([for IPv6 v4-mapping ability])
+-    AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* IPPROTO_V4MAPPED is usable check */
++    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ /* IPPROTO_V4MAPPED is usable check */
+ #       include <sys/types.h>
+ #       include <sys/socket.h>
+ #	include <netinet/in.h>
+@@ -3165,7 +3161,7 @@
+ dnl copy that crashes with a buffer over-run!
+ dnl
+ AC_CACHE_CHECK(if strnstr is well implemented, ac_cv_func_strnstr,
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
++  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -3191,7 +3187,7 @@
+ dnl Test for va_copy
+ dnl
+ AC_CACHE_CHECK(if va_copy is implemented, ac_cv_func_va_copy,
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
++  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+       #include <stdarg.h>
+       #include <stdlib.h>
+       int f (int i, ...) {
+@@ -3214,7 +3210,7 @@
+ dnl Some systems support __va_copy
+ dnl
+ AC_CACHE_CHECK(if __va_copy is implemented, ac_cv_func___va_copy,
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
++  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+       #include <stdarg.h>
+       #include <stdlib.h>
+       int f (int i, ...) {
+Index: squid-3.1.4/helpers/negotiate_auth/squid_kerb_auth/configure.in
+===================================================================
+--- squid-3.1.4.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-07-06 16:11:59.000000000 +0400
++++ squid-3.1.4/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-07-06 16:12:55.000000000 +0400
+@@ -367,13 +367,13 @@
+ 
+ CPPFLAGS="$CPPFLAGS -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir"
+ AC_CACHE_CHECK([for SQUID at '$squid_dir' ],ac_cv_have_squid,[
+-AC_TRY_RUN([
++AC_TRY_COMPILE([
+ #include <config.h>
+ int main(int argc, char *argv[]) {
+ #ifdef SQUID_CONFIG_H
+ return 0;
+ #else
+-return 1;
++boom!
+ #endif
+ }],
+   ac_cv_have_squid=yes,
diff --git a/recipes/squid/squid-3.1.4/squidv3-build-cf_gen.patch b/recipes/squid/squid-3.1.4/squidv3-build-cf_gen.patch
new file mode 100644
index 0000000000..955acf8007
--- /dev/null
+++ b/recipes/squid/squid-3.1.4/squidv3-build-cf_gen.patch
@@ -0,0 +1,33 @@
+Index: squid-3.1.4/configure.in
+===================================================================
+--- squid-3.1.4.orig/configure.in	2010-05-30 17:21:49.000000000 +0400
++++ squid-3.1.4/configure.in	2010-07-06 15:41:52.000000000 +0400
+@@ -2116,6 +2116,10 @@
+ 	;;
+ esac
+ 
++dnl Define BUILD_CXX
++BUILD_CXX="$BUILD_CXX"
++AC_SUBST(BUILD_CXX)
++
+ dnl Check for programs
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+Index: squid-3.1.4/src/Makefile.am
+===================================================================
+--- squid-3.1.4.orig/src/Makefile.am	2010-05-30 17:21:11.000000000 +0400
++++ squid-3.1.4/src/Makefile.am	2010-07-06 15:42:29.000000000 +0400
+@@ -751,6 +751,13 @@
+ squid.conf.default squid.conf.documented: cf_parser.cci
+ 	true
+ 
++BUILD_CXX ?= @BUILD_CXX@
++
++cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
++	$(BUILD_CXX) -o $@ $(srcdir)/cf_gen.cc \
++		$(top_srcdir)/lib/util.c $(top_srcdir)/compat/assert.cc \
++		-DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES}
++
+ cf_parser.cci: cf.data cf_gen$(EXEEXT)
+ 	./cf_gen cf.data $(srcdir)/cf.data.depend
+ 
diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc
index 22fbbe69a4..eb567c888c 100644
--- a/recipes/squid/squid.inc
+++ b/recipes/squid/squid.inc
@@ -7,15 +7,13 @@ SQ_MAJ = "${@bb.data.getVar('PV',d,1).split('.')[0]}"
 SQ_MIN = "${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
 SRC_URI = "http://www.squid-cache.org/Versions/v${SQ_MAJ}/${SQ_MAJ}.${SQ_MIN}/squid-${PV}.tar.bz2;name=squid-${PV} \
-           file://fix_epoll_check.patch \
-	   file://squidv2-build-cf_gen.patch \
            file://squid.init \
 	   file://squid-volatiles \
 	   "
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF = "--disable-epoll --disable-nls --enable-ssl --enable-storeio=null,ufs --enable-digest-auth-helpers=ldap --enable-basic-auth-helpers=LDAP"
+EXTRA_OECONF = "--disable-epoll --disable-nls --enable-ssl --enable-digest-auth-helpers=ldap --enable-basic-auth-helpers=LDAP"
 
 logdir = ${localstatedir}/log/squid
 EXTRA_OEMAKE = "\
diff --git a/recipes/squid/squid_2.6.STABLE14.bb b/recipes/squid/squid_2.6.STABLE14.bb
index 8534a1f527..9707ccc6bb 100644
--- a/recipes/squid/squid_2.6.STABLE14.bb
+++ b/recipes/squid/squid_2.6.STABLE14.bb
@@ -1,5 +1,11 @@
 PR = "${INC_PR}.0"
 
 include squid.inc
+
+EXTRA_OECONF += "--enable-storeio=null,ufs"
+
+SRC_URI += "file://fix_epoll_check.patch \
+	   file://squidv2-build-cf_gen.patch"
+
 SRC_URI[squid-2.6.STABLE14.md5sum] = "eadb138d48320df8b99349121159c6bf"
 SRC_URI[squid-2.6.STABLE14.sha256sum] = "dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a"
diff --git a/recipes/squid/squid_2.7.STABLE8.bb b/recipes/squid/squid_2.7.STABLE8.bb
index 8e5adf40e1..039f986b5d 100644
--- a/recipes/squid/squid_2.7.STABLE8.bb
+++ b/recipes/squid/squid_2.7.STABLE8.bb
@@ -5,7 +5,10 @@ include squid.inc
 # GPLv2+ since 2.6.STABLE18
 LICENSE = "GPL"
 
-EXTRA_OECONF += "--enable-epoll"
+EXTRA_OECONF += "--enable-epoll --enable-storeio=null,ufs"
+
+SRC_URI += "file://fix_epoll_check.patch \
+	   file://squidv2-build-cf_gen.patch"
 
 SRC_URI[squid-2.7.STABLE8.md5sum] = "c061ba1c9ae39d0aaa8eca137f7dd18b"
 SRC_URI[squid-2.7.STABLE8.sha256sum] = "9409b02fc53518e334395df803a1ae30f4ed385b0f041fb310b4c75e2a49138c"
diff --git a/recipes/squid/squid_3.1.4.bb b/recipes/squid/squid_3.1.4.bb
new file mode 100644
index 0000000000..1d746a1cb1
--- /dev/null
+++ b/recipes/squid/squid_3.1.4.bb
@@ -0,0 +1,29 @@
+PR = "${INC_PR}.0"
+
+include squid.inc
+
+# GPLv2+ since 2.6.STABLE18
+LICENSE = "GPL"
+
+EXTRA_OECONF += "--enable-epoll --enable-icap-client --with-dl --enable-linux-netfilter"
+
+EXTRA_OEMAKE += "DEFAULT_STYLESHEET=${sysconfdir}/squid/errorpage.css DEFAULT_CONFIG_DIR=${sysconfdir}/squid"
+
+SRC_URI += " \
+	file://squidv3-build-cf_gen.patch \
+	file://fix-runs-in-configure.patch \
+	file://fix-ltdl-usage.patch \
+	"
+
+SRC_URI[squid-3.1.4.md5sum] = "3fb544ae02fadc2b4085f62bb927e861"
+SRC_URI[squid-3.1.4.sha256sum] = "13ea33907c64f417afaf596b04550cd950f57dc43357d309ffa92cfac2de58f6"
+
+do_configure_prepend() {
+	export ac_cv_epoll_ctl=yes
+	export ac_cv_epoll_works=yes
+	export ac_cv_func_setresuid=yes
+}
+
+do_install_append() {
+	mv ${D}${sysconfdir}/squid.conf.documented ${D}${sysconfdir}/squid/
+}