From patchwork Fri Aug 14 14:38:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jugurtha BELKALEM X-Patchwork-Id: 1345050 X-Patchwork-Delegate: romain.naour@openwide.fr Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=AADOVakA; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BSmJT49Mtz9sPf for ; Sat, 15 Aug 2020 00:38:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 74DBA87559; Fri, 14 Aug 2020 14:38:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cAdbQxZeToqy; Fri, 14 Aug 2020 14:38:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 92E748755F; Fri, 14 Aug 2020 14:38:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CCD2C1BF83A for ; Fri, 14 Aug 2020 14:38:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C8BC28755F for ; Fri, 14 Aug 2020 14:38:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uxcG3pkKg070 for ; Fri, 14 Aug 2020 14:38:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C195D87559 for ; Fri, 14 Aug 2020 14:38:09 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id a15so8538669wrh.10 for ; Fri, 14 Aug 2020 07:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=htu1AZiV5lOwTHprcAE3jV4q970npw7QHzO/fS8X0pI=; b=AADOVakAf3TT9W6NQ+G5ftiTFT1bF0tPg8PDhpEe741MR7ERhO0gT8EO2FsP2Th/fM 7BI6ZkthncWeN0ffu9PTGBymLJfvPDH43oKQPdFPTSWmLuSdrCQ/o3g1QsHhJg8klR1d R34j/3Xe0/sgqLJaZezubsLEMaBRM3xtI7sFkSckrozDNrHgmY5hhwduJ5IY7ptKTb8x xtDJ/K1ie9PLuGJh3Q3TnQQiFDEDUFlHfiSGuNAl2VMVY5TC6uxkJU2r2rlJhCoBeM2J kyHOntBuUccPUUbRGhs5Vj0Nh6ZYOVF2y69e+Kcx5MKPWYVf5Bi/NgThEtvj4JbU28hW AKSg== 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; bh=htu1AZiV5lOwTHprcAE3jV4q970npw7QHzO/fS8X0pI=; b=sjVZOfi4Qr8Oa+VoFZUVziycfi3MY1ZSUxedaEFuRy3zl4D/FYKnm82xLI2mDx6BK8 x2wj58f6cSyJMx9P001SVYwp8UbGbL41t8PVfuLEaxN32O2zPgRiIZvdPTlUSQlx21X0 qKjgkEdWJY6Wncb1Gxbrnu8EVDLpL4oS5VMvLXN2TBza/OvG/IcmJ2U5qjLNxpzbXttA aWir6x5A1USEvi/MSuMxqc0Gc6X6bVi/vF2j8HlT2t+bgyNWScyHUApSgtog6awxm/26 GzyuroHSeQk91MyHJrhds+Gje58oaUEMt/1DgNhjQ52Ikj6mws0ckH4Ca4JnlnfXLLpZ hHzQ== X-Gm-Message-State: AOAM5333FlHzpptVQu9wC4BEqcFh87QOQ32whGoas1ZXTqFzsNZnCtUo U9/5AuThhhoqwCnxSLPWKNYlDNvETLSJFA== X-Google-Smtp-Source: ABdhPJxD0/rKpOszbAdOIGdOG+rQWGicEd832UEe8F8/XcTknd4IT+EOPJy6Vjfrj9JZSTWcYK8G+w== X-Received: by 2002:adf:a15c:: with SMTP id r28mr2986204wrr.151.1597415887574; Fri, 14 Aug 2020 07:38:07 -0700 (PDT) Received: from P-NAN-SUCRE.nantes.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id 69sm16238807wmb.8.2020.08.14.07.38.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Aug 2020 07:38:07 -0700 (PDT) From: Jugurtha BELKALEM To: buildroot@buildroot.org Date: Fri, 14 Aug 2020 16:38:05 +0200 Message-Id: <1597415885-30801-1-git-send-email-jugurtha.belkalem@smile.fr> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH 1/1] package/iptraf-ng: bump to version 1.2.1 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: Jugurtha BELKALEM , romain.naour@smile.fr MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" IPTraf-ng is a console-based network monitoring program for Linux that displays information about IP traffic. It returns such information as: - Current TCP connections - UDP, ICMP, OSPF, and other types of IP packets - Packet and byte counts on TCP connections - IP, TCP, UDP, ICMP, non-IP, and other packet and byte counts - TCP/UDP counts by ports - Packet counts by packet sizes - Packet and byte counts by IP address - Interface activity - Flag statuses on TCP packets - LAN station statistics Version 1.1.4 is deprecated (2013) which must be updated by current version. Note : old download link (https://fedorahosted.org/) has been stopped from being maintained as the project moved to https://fedorahosted.org/releases/i/p/iptraf-ng. Signed-off-by: Jugurtha BELKALEM --- ...-not-found-issue-during-cross-compilation.patch | 102 +++++++++++++++++++++ package/iptraf-ng/Config.in | 7 +- package/iptraf-ng/iptraf-ng.hash | 3 +- package/iptraf-ng/iptraf-ng.mk | 19 +++- 4 files changed, 120 insertions(+), 11 deletions(-) create mode 100644 package/iptraf-ng/0001-Fix-file-not-found-issue-during-cross-compilation.patch diff --git a/package/iptraf-ng/0001-Fix-file-not-found-issue-during-cross-compilation.patch b/package/iptraf-ng/0001-Fix-file-not-found-issue-during-cross-compilation.patch new file mode 100644 index 0000000..609403e --- /dev/null +++ b/package/iptraf-ng/0001-Fix-file-not-found-issue-during-cross-compilation.patch @@ -0,0 +1,102 @@ +From e4fde25079ac22bd26e4583bf696bc11cca038f8 Mon Sep 17 00:00:00 2001 +From: Jugurtha BELKALEM +Date: Fri, 14 Aug 2020 15:54:18 +0200 +Subject: [PATCH 1/1] Fix file not found issue during cross compilation + +Files in src/tui include iptraf-ng-compat.h as if it was in +the same folder. Header's relative location must be explicitly +defined otherwise compilation throws error : NO SUCH FILE. + +PR : https://github.com/iptraf-ng/iptraf-ng/pull/30. + +Signed-off-by: Jugurtha BELKALEM +--- + src/tui/input.c | 2 +- + src/tui/labels.c | 2 +- + src/tui/listbox.c | 2 +- + src/tui/menurt.c | 2 +- + src/tui/msgboxes.c | 2 +- + src/tui/winops.c | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/tui/input.c b/src/tui/input.c +index 8ed6081..a5f63ea 100644 +--- a/src/tui/input.c ++++ b/src/tui/input.c +@@ -7,7 +7,7 @@ input.c - a custom keyboard input module + + ***/ + +-#include "iptraf-ng-compat.h" ++#include "../iptraf-ng-compat.h" + + #include "input.h" + +diff --git a/src/tui/labels.c b/src/tui/labels.c +index e4e11fb..4dd8991 100644 +--- a/src/tui/labels.c ++++ b/src/tui/labels.c +@@ -6,7 +6,7 @@ + * user interface library + */ + +-#include "iptraf-ng-compat.h" ++#include "../iptraf-ng-compat.h" + + #include "winops.h" + +diff --git a/src/tui/listbox.c b/src/tui/listbox.c +index daecf66..31c394c 100644 +--- a/src/tui/listbox.c ++++ b/src/tui/listbox.c +@@ -5,7 +5,7 @@ + * listbox.c - scrollable listbox management module + */ + +-#include "iptraf-ng-compat.h" ++#include "../iptraf-ng-compat.h" + + #include "winops.h" + #include "labels.h" +diff --git a/src/tui/menurt.c b/src/tui/menurt.c +index fb3f002..49e6754 100644 +--- a/src/tui/menurt.c ++++ b/src/tui/menurt.c +@@ -7,7 +7,7 @@ menurt.c - ncurses-based menu definition module + + ***/ + +-#include "iptraf-ng-compat.h" ++#include "../iptraf-ng-compat.h" + + #include "menurt.h" + #include "winops.h" +diff --git a/src/tui/msgboxes.c b/src/tui/msgboxes.c +index 76ae4fa..3e29282 100644 +--- a/src/tui/msgboxes.c ++++ b/src/tui/msgboxes.c +@@ -5,7 +5,7 @@ + * msgboxes.c - message and error box display functions + */ + +-#include "iptraf-ng-compat.h" ++#include "../iptraf-ng-compat.h" + + #include "winops.h" + +diff --git a/src/tui/winops.c b/src/tui/winops.c +index d866281..36ac663 100644 +--- a/src/tui/winops.c ++++ b/src/tui/winops.c +@@ -7,7 +7,7 @@ winops.c - screen configuration and setup functions + + ***/ + +-#include "iptraf-ng-compat.h" ++#include "../iptraf-ng-compat.h" + + void tx_stdwinset(WINDOW * win) + { +-- +2.7.4 + diff --git a/package/iptraf-ng/Config.in b/package/iptraf-ng/Config.in index 5c3b484..f240daf 100644 --- a/package/iptraf-ng/Config.in +++ b/package/iptraf-ng/Config.in @@ -3,11 +3,10 @@ config BR2_PACKAGE_IPTRAF_NG depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES help - IPTraf-ng is a ncurses-based network monitoring utility. It - gathers data like TCP connection packet and byte counts, - interface statistics and activity indicators. + IPTraf-ng is a console-based network monitoring program for + Linux that gathers displays information about IP traffic. - https://fedorahosted.org/iptraf-ng/ + https://github.com/iptraf-ng/iptraf-ng IPTraf-ng is a fork of original IPTraf v3.0.0 (http://iptraf.seul.org). diff --git a/package/iptraf-ng/iptraf-ng.hash b/package/iptraf-ng/iptraf-ng.hash index 0a257ec..67f0ee2 100644 --- a/package/iptraf-ng/iptraf-ng.hash +++ b/package/iptraf-ng/iptraf-ng.hash @@ -1,4 +1,3 @@ -# From https://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.1.4.tar.gz.sum -sha1 a2e51b0dd6b8c80583fc25d055850c96b3d2f544 iptraf-ng-1.1.4.tar.gz # Locally computed +sha256 a53fa7bd5472e7103c5922e067912432c2a2f2a549a49334d2d1727f2e98e1ec iptraf-ng-v1.2.1.tar.gz sha256 4e49bef38f621aac4a870da4b30011c7b7abc7256b218daec1c425b08448ae1e LICENSE diff --git a/package/iptraf-ng/iptraf-ng.mk b/package/iptraf-ng/iptraf-ng.mk index ac572b9..1138b7a 100644 --- a/package/iptraf-ng/iptraf-ng.mk +++ b/package/iptraf-ng/iptraf-ng.mk @@ -4,16 +4,25 @@ # ################################################################################ -IPTRAF_NG_VERSION = 1.1.4 -IPTRAF_NG_SITE = https://fedorahosted.org/releases/i/p/iptraf-ng +IPTRAF_NG_VERSION = v1.2.1 +IPTRAF_NG_SITE = https://github.com/iptraf-ng/iptraf-ng.git +IPTRAF_NG_SITE_METHOD = git IPTRAF_NG_LICENSE = GPL-2.0+ IPTRAF_NG_LICENSE_FILES = LICENSE +IPTRAF_NG_INSTALL_TARGET = YES IPTRAF_NG_DEPENDENCIES = ncurses + IPTRAF_NG_MAKE_ENV = \ NCURSES_LDFLAGS="-lpanel -lncurses" -IPTRAF_NG_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -$(eval $(autotools-package)) +define IPTRAF_NG_BUILD_CMDS + $(MAKE) HOME=$(HOST_DIR)/usr/ $(TARGET_CONFIGURE_OPTS) \ + $(IPTRAF_NG_MAKE_ENV) -C $(@D) all +endef +define IPTRAF_NG_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/iptraf-ng $(TARGET_DIR)/usr/bin/iptraf-ng +endef + +$(eval $(generic-package))