From patchwork Wed Oct 22 11:28:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 402047 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 8210614007B for ; Wed, 22 Oct 2014 22:29:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 09F939539E; Wed, 22 Oct 2014 11:29:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0yDgWI2SuAsU; Wed, 22 Oct 2014 11:29:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A88C095087; Wed, 22 Oct 2014 11:29:00 +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 683761C2071 for ; Wed, 22 Oct 2014 11:29:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 63D0992137 for ; Wed, 22 Oct 2014 11:29:00 +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 kWnl5BRomUVj for ; Wed, 22 Oct 2014 11:28:59 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [62.210.192.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id B5C9A9212A for ; Wed, 22 Oct 2014 11:28:58 +0000 (UTC) Received: from asgard (cpe-186-23-17-245.telecentro-reversos.com.ar [186.23.17.245] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.14.9/8.14.9) with ESMTP id s9MBSpSg019006 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 22 Oct 2014 11:28:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1413977336; bh=9SK0fN0COFHZ67XzixJXCoJo68/fXxn3YKKgZaxXTUo=; h=From:To:Cc:Subject:Date; b=YXHN5zBNmSH7QLD7ToFWwo5lwyp6OLOAyDy7vpJ+FBWWuaMaEbRqcELLP9jTaELmQ +csw0oMk7W4ZIkvtN13z0PUsXpo0QmU1g1B7P+StmeLBGO27hjhZoaITeJgv4CI/3A dXTLw/iJf1CTHUHBFsrP8LAwpAYN72oZ/UlhKw5E= Received: by asgard (sSMTP sendmail emulation); Wed, 22 Oct 2014 08:28:17 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Wed, 22 Oct 2014 08:28:17 -0300 Message-Id: <1413977297-17768-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.0.4 X-Virus-Scanned: clamav-milter 0.98.4 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH] openswan: bump to version 2.6.42 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Add hash file. Patch upstream in common Makefile. Signed-off-by: Gustavo Zacarias --- package/openswan/openswan-01-gcc-detection.patch | 43 ------------------------ package/openswan/openswan.hash | 2 ++ package/openswan/openswan.mk | 2 +- 3 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 package/openswan/openswan-01-gcc-detection.patch create mode 100644 package/openswan/openswan.hash diff --git a/package/openswan/openswan-01-gcc-detection.patch b/package/openswan/openswan-01-gcc-detection.patch deleted file mode 100644 index 2feb5c5..0000000 --- a/package/openswan/openswan-01-gcc-detection.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b37d4bd266ec65acdf5288e21722991d1c5ec44a Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sun, 30 Mar 2014 08:52:05 -0300 -Subject: [PATCH] Makefile: use CC for version test instead of gcc - -Use $(CC) for the version test since that's different from gcc when -cross-compiling. - -Signed-off-by: Gustavo Zacarias ---- - lib/libopenswan/Makefile | 2 +- - programs/pluto/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/libopenswan/Makefile b/lib/libopenswan/Makefile -index 3649fe7..06f5317 100644 ---- a/lib/libopenswan/Makefile -+++ b/lib/libopenswan/Makefile -@@ -90,7 +90,7 @@ CFLAGS+= -Wpointer-arith - CFLAGS+= -Wno-error=cast-qual - - # Check if GCC's version is recent enough --GCC_VERSION_GE_46:=$(shell test `gcc -dumpversion | sed 's/^\([0-9]\)\.\([0-9]\).*/\1\2/'` -ge 46 && echo true || echo false) -+GCC_VERSION_GE_46:=$(shell test `$(CC) -dumpversion | sed 's/^\([0-9]\)\.\([0-9]\).*/\1\2/'` -ge 46 && echo true || echo false) - ifeq ($(GCC_VERSION_GE_46),true) - # some junk left in alg_info.c - CFLAGS+= -Wno-error=cpp -diff --git a/programs/pluto/Makefile b/programs/pluto/Makefile -index 8e4bc89..ed5e9dc 100644 ---- a/programs/pluto/Makefile -+++ b/programs/pluto/Makefile -@@ -48,7 +48,7 @@ CPPFLAGS = $(HDRDIRS) $(DEFINES) \ - # must turn this off due to myid.c - CFLAGS+= -Wno-error=cast-qual - # Check if GCC's version is recent enough --GCC_VERSION_GE_46:=$(shell test `gcc -dumpversion | sed 's/^\([0-9]\)\.\([0-9]\).*/\1\2/'` -ge 46 && echo true || echo false) -+GCC_VERSION_GE_46:=$(shell test `$(CC) -dumpversion | sed 's/^\([0-9]\)\.\([0-9]\).*/\1\2/'` -ge 46 && echo true || echo false) - ifeq ($(GCC_VERSION_GE_46),true) - CFLAGS+= -Wno-error=cpp - endif --- -1.8.3.2 - diff --git a/package/openswan/openswan.hash b/package/openswan/openswan.hash new file mode 100644 index 0000000..724a935 --- /dev/null +++ b/package/openswan/openswan.hash @@ -0,0 +1,2 @@ +# Locally calculated after checking pgp signature +sha256 1be58b684dedd4bf00946ac5c7c6e9fbf8ac5db849feea2360c42c5e87cb565a openswan-2.6.42.tar.gz diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index ca29daa..ba36f7c 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSWAN_VERSION = 2.6.41 +OPENSWAN_VERSION = 2.6.42 OPENSWAN_SITE = http://download.openswan.org/openswan OPENSWAN_LICENSE = GPLv2+, BSD-3c OPENSWAN_LICENSE_FILES = COPYING LICENSE