From patchwork Sat Apr 13 15:05:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1085139 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gNkEe7kY"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44hJ4L4X6Jz9s8m for ; Sun, 14 Apr 2019 01:06:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 139DD8723B; Sat, 13 Apr 2019 15:06:09 +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 IX9cv-cEyiSR; Sat, 13 Apr 2019 15:06:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A317B8731C; Sat, 13 Apr 2019 15:06:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 04D021BF402 for ; Sat, 13 Apr 2019 15:06:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 018C38723B for ; Sat, 13 Apr 2019 15:06:05 +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 D+PagtV8A8wL for ; Sat, 13 Apr 2019 15:06:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 846BF8720B for ; Sat, 13 Apr 2019 15:06:03 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id t17so15667493wrw.13 for ; Sat, 13 Apr 2019 08:06:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xyWWdj9oz15wIMpQvJ/QgtnsLBmFRjAHttrN/FbkGAk=; b=gNkEe7kYOwWnJqYNtzQu9PMs9SbU9LX9UD8Tx+9ARvT2Yr8E/3Rdq7bSqwx/Kpky9b dabg/rUeiXaRmp1hHULIgWPSvP+9xnNJP8G3chqP6TFcJlsPOLtbDaasl2MR+/ypPxol BpJf3lWA8QVfj5oFNoceQ8Ds4MbVdmA/Y2+PkKXFbzZzMZuQxPWxtD+zvWKv0anf1LvH DuFYjbuxBXAR8WGq+eEoXWApimG2D8GT0Qyt2R3zQxsGVrvaD7eeA7ingPQP/MemFkqZ Tqml4r5vqbvVY6RikhCz5i3C5Q8tC7/Vym42BQ/zMnzKS+aP4zusX6bOwE/6uN/Fzu4y uIKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xyWWdj9oz15wIMpQvJ/QgtnsLBmFRjAHttrN/FbkGAk=; b=IAcDA8dO3LkrwqUSQiJd1sW+MU/G/I+PtDo3eGQ8ZCM9gN9bLZ37rJJbRZtox/E3R9 X368Qi9GVGIpFE540KHL5U722/uAgpmFAU4/yAGV66aHScb4KO2wrb1AFkIfFnulz93z L+p6md8QAPbSZK9Nx9tnpn03IsonInE6phegX3spww8rnNfjjYtJJZBdLA50euIi0ZIT qIPi8gCnKQGagrvOBO4GJx4p6TdIdVVuiqu6LQc3r1f5HUj8hL0O32Gq5NuAHAdBjXMq f6qRL4u047BXfPDY9ZCa0Mf+HhfcoRXYYSAdx8WiHLOakRBy8GIzJGGAlQuTpu2nExBC B7kg== X-Gm-Message-State: APjAAAWngfXi6IH2CmIMp8PkiL6ptZxMvU9bGHKmActExhRZIlDyzArF nipNJMR3CpMVuy2H+V5vwhjCh3C3 X-Google-Smtp-Source: APXvYqzFBI3nQAx4BJ8azDoMs1KQW7DoDas7OqMRK++r7UHlM46QYFyORZ+hrmn9ieMEEoFqoGpuPw== X-Received: by 2002:a05:6000:1111:: with SMTP id z17mr39493844wrw.103.1555167961696; Sat, 13 Apr 2019 08:06:01 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id u17sm11892977wmj.1.2019.04.13.08.06.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Apr 2019 08:06:00 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 13 Apr 2019 17:05:41 +0200 Message-Id: <20190413150541.30291-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/squid: bump to version 4.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Remove patch (already in version): https://github.com/squid-cache/squid/commit/c34582b9e8c40529db7eb9c490b081a37972f6d4 - Drop autoreconf Signed-off-by: Fabrice Fontaine --- ...re.ac-use-pkg-config-to-find-libxml2.patch | 79 ------------------- package/squid/squid.hash | 8 +- package/squid/squid.mk | 4 +- 3 files changed, 5 insertions(+), 86 deletions(-) delete mode 100644 package/squid/0001-configure.ac-use-pkg-config-to-find-libxml2.patch diff --git a/package/squid/0001-configure.ac-use-pkg-config-to-find-libxml2.patch b/package/squid/0001-configure.ac-use-pkg-config-to-find-libxml2.patch deleted file mode 100644 index cc1a9f0585..0000000000 --- a/package/squid/0001-configure.ac-use-pkg-config-to-find-libxml2.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 39edb8ef08f51ea6a454d286091d78a4514c89e0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 1 Dec 2018 18:21:55 +0100 -Subject: [PATCH] configure.ac: use pkg-config to find libxml2 - -Fix static build of squid with libxml2 by using pkg-config to find -libxml2 dependencies like -lz or -liconv - -Fixes: - - http://autobuild.buildroot.org/results/7f23eb98c311b294c7f0e165279fa26909a5ff93 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/squid-cache/squid/pull/338] ---- - configure.ac | 43 +++++++++++++++++++++++++------------------ - 1 file changed, 25 insertions(+), 18 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f30d824aa..47553db46 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -900,29 +900,36 @@ fi - - AC_ARG_WITH(libxml2, AS_HELP_STRING([--without-libxml2],[Do not use libxml2 for ESI. Default: auto-detect])) - if test "x$squid_opt_use_esi" != "xno" -a "x$with_libxml2" != "xno" ; then -- AC_CHECK_LIB([xml2], [main], [XMLLIB="-lxml2"; HAVE_LIBXML2=1]) -- dnl Find the main header and include path... -- AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [ -- AC_CHECK_HEADERS([libxml/parser.h], [], [ -- AC_MSG_NOTICE([Testing in /usr/include/libxml2]) -- SAVED_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS" -- unset ac_cv_header_libxml_parser_h -- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/include/libxml2"], [ -- AC_MSG_NOTICE([Testing in /usr/local/include/libxml2]) -- CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS" -+ PKG_CHECK_MODULES([LIBXML2],[libxml-2.0],[ -+ CPPFLAGS="$CPPFLAGS $LIBXML2_CFLAGS"; -+ SQUID_CXXFLAGS="$SQUID_CXXFLAGS $LIBXML2_CFLAGS"; -+ XMLLIB="$LIBXML2_LIBS"; -+ HAVE_LIBXML2=1 -+ ],[ -+ AC_CHECK_LIB([xml2], [main], [XMLLIB="-lxml2"; HAVE_LIBXML2=1]) -+ dnl Find the main header and include path... -+ AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [ -+ AC_CHECK_HEADERS([libxml/parser.h], [], [ -+ AC_MSG_NOTICE([Testing in /usr/include/libxml2]) -+ SAVED_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS" - unset ac_cv_header_libxml_parser_h -- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/local/include/libxml2"], [ -- AC_MSG_NOTICE([Failed to find libxml2 header file libxml/parser.h]) -+ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/include/libxml2"], [ -+ AC_MSG_NOTICE([Testing in /usr/local/include/libxml2]) -+ CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS" -+ unset ac_cv_header_libxml_parser_h -+ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/local/include/libxml2"], [ -+ AC_MSG_NOTICE([Failed to find libxml2 header file libxml/parser.h]) -+ ]) - ]) -+ CPPFLAGS="$SAVED_CPPFLAGS" - ]) -- CPPFLAGS="$SAVED_CPPFLAGS" - ]) -+ if test "x$ac_cv_libxml2_include" != "x"; then -+ SQUID_CXXFLAGS="$ac_cv_libxml2_include $SQUID_CXXFLAGS" -+ CPPFLAGS="$ac_cv_libxml2_include $CPPFLAGS" -+ fi - ]) -- if test "x$ac_cv_libxml2_include" != "x"; then -- SQUID_CXXFLAGS="$ac_cv_libxml2_include $SQUID_CXXFLAGS" -- CPPFLAGS="$ac_cv_libxml2_include $CPPFLAGS" -- fi - dnl Now that we know where to look find the headers... - AC_CHECK_HEADERS(libxml/parser.h libxml/HTMLparser.h libxml/HTMLtree.h) - AC_DEFINE_UNQUOTED(HAVE_LIBXML2, $HAVE_LIBXML2, [Define to 1 if you have the libxml2 library]) --- -2.17.1 - diff --git a/package/squid/squid.hash b/package/squid/squid.hash index 5e872707ce..d69e9b2ab0 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v4/squid-4.4.tar.xz.asc -md5 892504ca9700e1f139a53f84098613bd squid-4.4.tar.xz -sha1 0ab6b133f65866d825bf72cbbe8cef209768b2fa squid-4.4.tar.xz +# From http://www.squid-cache.org/Versions/v4/squid-4.6.tar.xz.asc +md5 e25e7cc37754ad14d8aa368c0c210e54 squid-4.6.tar.xz +sha1 0396fe8077049000407d13aca8efdd9228e69d98 squid-4.6.tar.xz # Locally calculated -sha256 4905e6da7f5574d2583ba36f398bb062a12d51e70d67035078b6e85b09e9ee82 squid-4.4.tar.xz +sha256 015bade5d3a4905142c4c605df5c4216471e3d8338079955e0e44b0ae0303d41 squid-4.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 5d5ec0c38d..0331b83888 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,13 +4,11 @@ # ################################################################################ -SQUID_VERSION = 4.4 +SQUID_VERSION = 4.6 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v4 SQUID_LICENSE = GPL-2.0+ SQUID_LICENSE_FILES = COPYING -# We're patching configure.ac -SQUID_AUTORECONF = YES SQUID_DEPENDENCIES = libcap host-libcap libxml2 host-pkgconf \ $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) SQUID_CONF_ENV = \