From patchwork Tue Jan 9 20:18:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 857712 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zGNpJ610Zz9sNr for ; Wed, 10 Jan 2018 07:21:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 558BB302A5; Tue, 9 Jan 2018 20:21:38 +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 jjw3KDijiGQH; Tue, 9 Jan 2018 20:21:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 581E32F0B7; Tue, 9 Jan 2018 20:21:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D15B21C1470 for ; Tue, 9 Jan 2018 20:21:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CD5DB89A8D for ; Tue, 9 Jan 2018 20:21:35 +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 rFc2YltMRkGT for ; Tue, 9 Jan 2018 20:21:34 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.141]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6903F89A5D for ; Tue, 9 Jan 2018 20:21:34 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 800CB20F80 for ; Tue, 9 Jan 2018 21:21:31 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3zGNky3fPFz9rxS for ; Tue, 9 Jan 2018 21:18:50 +0100 (CET) Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id fAAmp_BPz7_q; Tue, 9 Jan 2018 21:18:48 +0100 (CET) Received: from nzxt.fritz.box (port-92-195-195-160.dynamic.qsc.de [92.195.195.160]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Tue, 9 Jan 2018 21:18:48 +0100 (CET) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Tue, 9 Jan 2018 21:18:46 +0100 Message-Id: <20180109201846.1156-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] augeas: bump to version 1.9.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add two patches from upstream to fix a build issue when building an example. Ideally, the examples should not be build at all. However, upstream disliked the idea of adding configure options like `--disable-examples` [1]. So we'll make do with the patches and force a autoreconf. Additionaly, the signature was checked and a hash for the license file is added. [1] https://github.com/hercules-team/augeas/issues/535 Signed-off-by: Jörg Krause --- ...missing-trailing-backslash-for-dump-LDADD.patch | 21 ++++++++++++++++ ...efile-do-not-force-static-linking-of-dump.patch | 29 ++++++++++++++++++++++ package/augeas/augeas.hash | 6 +++-- package/augeas/augeas.mk | 5 +++- 4 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 package/augeas/0001-examples-Makefile-fix-missing-trailing-backslash-for-dump-LDADD.patch create mode 100644 package/augeas/0002-examples-Makefile-do-not-force-static-linking-of-dump.patch diff --git a/package/augeas/0001-examples-Makefile-fix-missing-trailing-backslash-for-dump-LDADD.patch b/package/augeas/0001-examples-Makefile-fix-missing-trailing-backslash-for-dump-LDADD.patch new file mode 100644 index 0000000000..8ccd6b54b7 --- /dev/null +++ b/package/augeas/0001-examples-Makefile-fix-missing-trailing-backslash-for-dump-LDADD.patch @@ -0,0 +1,21 @@ +From d506cf6c1567cbb0a762c04d9354ab1694a5ac05 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Mon, 11 Dec 2017 23:33:08 +0100 +Subject: [PATCH] Update Makefile.am + +Add missing trailing backslash for `dump_LDADD`. +--- + examples/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 66ebcdf2..a19597bf 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -13,5 +13,5 @@ fadot_LDADD = $(top_builddir)/src/libfa.la $(GNULIB) + + dump_sources = dump.c + dump_LDFLAGS = -static +-dump_LDADD = $(top_builddir)/src/libaugeas.la $(top_builddir)/src/libfa.la ++dump_LDADD = $(top_builddir)/src/libaugeas.la $(top_builddir)/src/libfa.la \ + $(GNULIB) diff --git a/package/augeas/0002-examples-Makefile-do-not-force-static-linking-of-dump.patch b/package/augeas/0002-examples-Makefile-do-not-force-static-linking-of-dump.patch new file mode 100644 index 0000000000..25d91fa103 --- /dev/null +++ b/package/augeas/0002-examples-Makefile-do-not-force-static-linking-of-dump.patch @@ -0,0 +1,29 @@ +From c50b793f6ab17c192e048b4a06421be7c6381998 Mon Sep 17 00:00:00 2001 +From: David Lutterkort +Date: Fri, 5 Jan 2018 14:48:15 -0800 +Subject: [PATCH] * examples/Makefile.am: do not force static linking of dump +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Forcing static linking of 'dump' was accidentally left in from some +testing; there is no reason to force that specifically for dump. + +Thanks to Jörg Krause for reporting the issue and verifying the fix. + +Fixes https://github.com/hercules-team/augeas/issues/535 +--- + examples/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index a19597bf..928eb517 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -12,6 +12,5 @@ fadot_SOURCES = fadot.c + fadot_LDADD = $(top_builddir)/src/libfa.la $(GNULIB) + + dump_sources = dump.c +-dump_LDFLAGS = -static + dump_LDADD = $(top_builddir)/src/libaugeas.la $(top_builddir)/src/libfa.la \ + $(GNULIB) diff --git a/package/augeas/augeas.hash b/package/augeas/augeas.hash index e044ff42a7..a256686983 100644 --- a/package/augeas/augeas.hash +++ b/package/augeas/augeas.hash @@ -1,2 +1,4 @@ -# Locally calculated -sha256 65cf75b5a573fee2a5c6c6e3c95cad05f0101e70d3f9db10d53f6cc5b11bc9f9 augeas-1.8.1.tar.gz +# Locally calculated after checking pgp signature from +# http://download.augeas.net/augeas-1.9.0.tar.gz.sig +sha256 2b463d398cabc9b42747aa61d3e83ed6a93ce03d9074cf8e7a7bd3107a668343 augeas-1.9.0.tar.gz +sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING diff --git a/package/augeas/augeas.mk b/package/augeas/augeas.mk index 20d09eb390..26fb6f8053 100644 --- a/package/augeas/augeas.mk +++ b/package/augeas/augeas.mk @@ -4,13 +4,16 @@ # ################################################################################ -AUGEAS_VERSION = 1.8.1 +AUGEAS_VERSION = 1.9.0 AUGEAS_SITE = http://download.augeas.net AUGEAS_INSTALL_STAGING = YES AUGEAS_LICENSE = LGPL-2.1+ AUGEAS_LICENSE_FILES = COPYING AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2 +# patching examples/Makefile.am +AUGEAS_AUTORECONF = YES + AUGEAS_CONF_OPTS = --disable-gnulib-tests # Remove the test lenses which occupy about 1.4 MB on the target