From patchwork Mon Oct 29 20:57:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 195139 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 86BE82C0084 for ; Tue, 30 Oct 2012 07:57:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 109A220181; Mon, 29 Oct 2012 20:57:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 72uoZfh4Fx5z; Mon, 29 Oct 2012 20:57:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AA08D2219E; Mon, 29 Oct 2012 20:57:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 68D228F74A for ; Mon, 29 Oct 2012 20:57:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BCB1581659 for ; Mon, 29 Oct 2012 20:57:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kJ+ZZ31Y9gFD for ; Mon, 29 Oct 2012 20:57:25 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [85.10.205.246]) by whitealder.osuosl.org (Postfix) with ESMTPS id A58D2814F2 for ; Mon, 29 Oct 2012 20:57:24 +0000 (UTC) Received: from asgard (host100.190-226-82.telecom.net.ar [190.226.82.100]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id q9TKvHc1018212 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 29 Oct 2012 20:57:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1351544242; bh=qPSijALjJmA+Qg1Z3XiNHpKpWBYSC2rJPuHuRLljaPc=; h=From:To:Cc:Subject:Date; b=CtTlvEiTtG0vTslRNmdFZqvilu9IbPBH9zzGGgcstrNAxxeFnOltc9084Q3zfomFJ PWQHp/HCx3EkDQzGYh4nLNmM0EX0giO1GF4lTlZ9MXgHisfWNqKZyY2cj3dzJmdrpf E+1NaCTgsD3WGUvXZzCpvGdsHHNNkvZo0mEkFzc4= Received: by asgard (sSMTP sendmail emulation); Mon, 29 Oct 2012 17:57:17 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 29 Oct 2012 17:57:16 -0300 Message-Id: <1351544236-23479-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] squid: bump to version 3.2.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gustavo Zacarias --- package/squid/Config.in | 2 ++ package/squid/squid.mk | 24 +++++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/package/squid/Config.in b/package/squid/Config.in index 4ec7fa4..8a77da8 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_SQUID bool "squid" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INET_IPV6 + # needs fork() + depends on BR2_USE_MMU select BR2_PACKAGE_LIBCAP help Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 52bfde0..fc58fce 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,20 +4,30 @@ # ############################################################# -SQUID_VERSION = 3.1.20 -SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1 -SQUID_DEPENDENCIES = libcap host-libcap +SQUID_VERSION = 3.2.3 +SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.2 +SQUID_LICENSE = GPLv2+ +SQUID_LICENSE_FILES = COPYING +SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \ + $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) SQUID_CONF_ENV = ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \ ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \ ac_cv_func_strnstr=no ac_cv_have_squid=yes -SQUID_CONF_OPT = --enable-wccp --enable-wccpv2 --enable-async-io=8 \ - --enable-htcp --enable-snmp --enable-linux-netfilter \ +SQUID_CONF_OPT = --enable-async-io=8 --enable-linux-netfilter \ --enable-removal-policies="lru,heap" \ --with-filedescriptors=1024 --disable-ident-lookups \ - --enable-auth="digest" --disable-strict-error-checking \ - --enable-digest-auth-helpers="password" \ + --enable-auth-basic="fake getpwnam" \ + --enable-auth-digest="file" \ + --enable-auth-negotiate="wrapper" \ + --enable-auth-ntlm="fake" \ + --disable-strict-error-checking \ --enable-external-acl-helpers="ip_user" +# On uClibc librt needs libpthread +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),yy) + SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread" +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) SQUID_CONF_OPT += --enable-ssl SQUID_DEPENDENCIES += openssl