From patchwork Fri Mar 24 02:23:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Rebello X-Patchwork-Id: 743030 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vq6g73LLdz9rxm for ; Fri, 24 Mar 2017 13:24:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PKT2mCDJ"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B5A8489CEC; Fri, 24 Mar 2017 02:24:00 +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 md6vW6Y3HBLS; Fri, 24 Mar 2017 02:23:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AB36A89B82; Fri, 24 Mar 2017 02:23:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 75D3C1C0614 for ; Fri, 24 Mar 2017 02:23:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6FC7F2A0DA for ; Fri, 24 Mar 2017 02:23:56 +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 qxZ60t3vpjVq for ; Fri, 24 Mar 2017 02:23:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-vk0-f66.google.com (mail-vk0-f66.google.com [209.85.213.66]) by silver.osuosl.org (Postfix) with ESMTPS id 03BD02694A for ; Fri, 24 Mar 2017 02:23:54 +0000 (UTC) Received: by mail-vk0-f66.google.com with SMTP id j137so272421vke.0 for ; Thu, 23 Mar 2017 19:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Sj5udsXk36+MdQUrj8VNJHU5WJ7MHvzr/PiFJBMVZC0=; b=PKT2mCDJ7INziHmCd9P6gFDgvdWYzEzLmJdF0e0bO9J+p5jedPooLQbWftt+DLfDgd 3KNkLkpZUa/NghY/ZgnrhHOv3mqc+1+sl+MFHE+eP4kRQGNc2Q3ymSLKqpf5modW8QD4 i0/0WCgaw4xIV2e8dzbXKI6mDG9RS8UrzGkU7ldPHL0TcDVtsupgkDTwaanhP2Tg0ju1 nu3NC0IpwFt1xlhiUHBgB4lxcWM5qzpyuFM/a2PvjfZvkjE2MESQB+MU+ZyLIheOSoCD FnbtDj28r19iUjzi5s9OSXto7yC8HJsvTkaVI4fqO6s4KvVEUGAuNTYll/l6SslZC0wF OyvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Sj5udsXk36+MdQUrj8VNJHU5WJ7MHvzr/PiFJBMVZC0=; b=rvcowXlq/PQXSUcSZPivnUQ2olcv6bRoUnPnzm3wIlQGsvxrrMglDUZtguWN2aWLEF Q2mrMa4Ta8WBIE9h+EfzbJbVCcVhWYOKLX6ptPlUnNZ/AhaQ3fUGHC/q2S4fgIXVo1Nr zeQKbGF4Z98aVBFqzLrTbhyV1IuvSuFFBPGsCGwh6+iyyNqDotz7fjEDsIhYez7hS4B0 9huSwy3gX5AHnJFDgyrKWmRYjb5JKphMCHwZ6QCxNPBsdgJBhu6phW6SP8QrtmRB6L+j H/xkuahvzhP+iJeXBsNek1opLkUHkzsMR1k+TtQEl+Ep/rJEEczOPBElgqUhqFUK6j/q NRNg== X-Gm-Message-State: AFeK/H05AXEv8PS+Y+fUW4wGTxy3j1WwiQbc3bm5mpRru2/yh8/cfITL1rqCAmtNy2H2uw== X-Received: by 10.176.77.66 with SMTP id k2mr3057550uag.119.1490322232813; Thu, 23 Mar 2017 19:23:52 -0700 (PDT) Received: from localhost.localdomain ([179.219.240.50]) by smtp.gmail.com with ESMTPSA id h8sm262197uaf.35.2017.03.23.19.23.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Mar 2017 19:23:52 -0700 (PDT) From: Rodrigo Rebello To: buildroot@buildroot.org Date: Thu, 23 Mar 2017 23:23:42 -0300 Message-Id: <20170324022342.31541-1-rprebello@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH] vnstat: bump to version 1.17 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" Also remove patch that has been merged upstream, disable AUTORECONF since we're no longer patching configure.ac and get rid of hack involving the install target as the 'install-data-hook' in Makefile.am now avoids running 'vnstat --showconfig' on the host in case of cross-compilation. Signed-off-by: Rodrigo Rebello --- ...ure.ac-add-option-to-disable-image-output.patch | 51 ---------------------- package/vnstat/vnstat.hash | 2 +- package/vnstat/vnstat.mk | 10 +---- 3 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 package/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch diff --git a/package/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch b/package/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch deleted file mode 100644 index e46ef0788..000000000 --- a/package/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8a4a9b82d4f8fd39db8417fd06d969505fde9d0a Mon Sep 17 00:00:00 2001 -From: Rodrigo Rebello -Date: Tue, 22 Dec 2015 18:02:22 -0200 -Subject: [PATCH 1/1] configure.ac: add option to disable image output - -Even when the gd library is present, it may be desirable to not build -'vnstati' as image output is an optional feature. - -Also, when testing for the gd library, use gdImagePng() instead of -gdImageLine() since it's possible that the installed gd library doesn't -have PNG support. In such cases, the test in the configure script passed -(because gdImageLine() is always present), but the build failed with: - - src/vnstati.o: In function `writeoutput': - vnstati.c:(.text+0x3fc): undefined reference to `gdImagePng' - collect2: error: ld returned 1 exit status - -Upstream status: accepted, not yet released. -https://github.com/vergoh/vnstat/pull/35 - -Signed-off-by: Rodrigo Rebello ---- - configure.ac | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index be3d449..89f71ef 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,10 +13,16 @@ AM_PROG_CC_C_O - AC_PROG_MAKE_SET - AC_PROG_MKDIR_P - -+AC_ARG_ENABLE([image-output], [ -+AS_HELP_STRING([--disable-image-output], [disable PNG image output])]) -+ - # Checks for libraries. - AC_CHECK_LIB([m], [pow]) --AC_CHECK_LIB([gd], [gdImageLine], [IMAGELIBS=-lgd]) --AC_SUBST([IMAGELIBS]) -+ -+AS_IF([test "x$enable_image_output" != "xno"], [ -+AC_CHECK_LIB([gd], [gdImagePng], [IMAGELIBS=-lgd]) -+AC_SUBST([IMAGELIBS])]) -+ - AM_CONDITIONAL([HAVE_LIBGD], [test "$IMAGELIBS" = "-lgd"]) - PKG_CHECK_MODULES([CHECK], [check >= 0.9.6], [], [AC_MSG_NOTICE([testcases can not be execute without check installed])]) - AM_CONDITIONAL([HAVE_CHECK], [test "$CHECK_LIBS"]) --- -2.1.4 - diff --git a/package/vnstat/vnstat.hash b/package/vnstat/vnstat.hash index 82ee8c02b..1f515290c 100644 --- a/package/vnstat/vnstat.hash +++ b/package/vnstat/vnstat.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c3814b5baa8b627198a8debfe1dce4b4346a342523818cc8668a5497971dbc39 vnstat-1.15.tar.gz +sha256 18e4c53576ca9e1ef2f0e063a6d83b0c44e3b1cf008560d658745df5c9aa7971 vnstat-1.17.tar.gz diff --git a/package/vnstat/vnstat.mk b/package/vnstat/vnstat.mk index 576f240a2..f3e74a747 100644 --- a/package/vnstat/vnstat.mk +++ b/package/vnstat/vnstat.mk @@ -4,13 +4,11 @@ # ################################################################################ -VNSTAT_VERSION = 1.15 +VNSTAT_VERSION = 1.17 VNSTAT_SITE = http://humdi.net/vnstat VNSTAT_LICENSE = GPLv2 VNSTAT_LICENSE_FILES = COPYING VNSTAT_DEPENDENCIES = host-pkgconf -# We're patching configure.ac, so we need to autoreconf -VNSTAT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) VNSTAT_DEPENDENCIES += gd @@ -19,10 +17,4 @@ else VNSTAT_CONF_OPTS = --disable-image-output endif -# vnStat declares an 'install-data-hook' rule that tries to run -# 'vnstat --showconfig' on the host to generate a default config file. -# That obviously doesn't work when cross-compiling, so avoid it -# entirely. -VNSTAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec - $(eval $(autotools-package))