From patchwork Thu Nov 1 13:23:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 991937 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.133; helo=hemlock.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="c5BgZNZe"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42m5WP5gytzB4Xh for ; Fri, 2 Nov 2018 00:23:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F1363856B8; Thu, 1 Nov 2018 13:23:43 +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 eGDBPs6QiPmp; Thu, 1 Nov 2018 13:23:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 40DF3856E4; Thu, 1 Nov 2018 13:23:43 +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 356CB1BF2AA for ; Thu, 1 Nov 2018 13:23:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 32C86856E4 for ; Thu, 1 Nov 2018 13:23:42 +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 fJm+hINztE-l for ; Thu, 1 Nov 2018 13:23:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1F7D3856B8 for ; Thu, 1 Nov 2018 13:23:41 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id u1-v6so20100759wrn.0 for ; Thu, 01 Nov 2018 06:23:41 -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; bh=psaErQk4WHoTc/5ly1qVHjGRRkWKA52ufVFKFk2bmA4=; b=c5BgZNZeRuCfUhM4932R/UDvKVLBCuodxQxxKPldfiquCIVIuoRhrX2ZK9PQZwCJZF OdeDoGPBhPcNTIa8luBHr2XLK+kCdO9LfGk0XiYXaKz7eaEXVQDyO17+cJB2iDuOvLCF a/Y0GDVQFaAB0cndyQdXNtp+geHyeVvxHIkGSEwnOpLx8zc12QDbYKZGRwVhUFPsUKFz ofJZ+XjWN8RpHW2biIFNNOCjKz24kcki5BYP54zikd4an+L074BS7kwXxPsL/Xu+Y2nP 8fE3xCxe55f1GTYjsEMKIfCuU9sfdF+buWMeKCR4tgGCv2M3OH0rMQUdUD3ntMk/70Sc g2GQ== 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=psaErQk4WHoTc/5ly1qVHjGRRkWKA52ufVFKFk2bmA4=; b=DyaSIXB6R0Tsl7jr2CFGKPh6ot5VvzZXhSNPFjOgUP5rd8x2p3YP0QihkUrcAS8W0M dJdfe4qiM1THepfPOQadKU1utFCi1NMT7r5TTlhaBOnQSavV19WG+qutdUK1JncBPIE0 7VX1iaDQ+9wvYRQBL6J6ysMvupq5UuMmHYSkRJhjD0oTQKpBEG9U0folkMqHtHR1Qjz/ 5YtobOA9LIq+wUSa7i+aGR/8h3+qRPiYoa+FtHGUi6Cpmlro6RfDZtPXKQFEfvomvWZM WCqXsby0PMycF0jyplI1tivUOEHcq42fQBkZ0pEo/5Jqo1REYD4EnFeG1PQths7eodRR 16sA== X-Gm-Message-State: AGRZ1gIlnt3XibtgrzEd08WdJsrcV0NLvzAUol2XbJFQmp/0BbO2AZhA jXkYGBKiCgtmNYSAbDpgiKcMBX5N X-Google-Smtp-Source: AJdET5dS+Jby8WVDXhDDsSq62Xp9pG3b/4IbDmEh5HLj/W6LS3z5fyeRoYOHB56+AG6pmcNDTQBneg== X-Received: by 2002:adf:f4c5:: with SMTP id h5-v6mr6516870wrp.21.1541078619163; Thu, 01 Nov 2018 06:23:39 -0700 (PDT) Received: from localhost.localdomain (arennes-656-1-360-24.w2-11.abo.wanadoo.fr. [2.11.112.24]) by smtp.gmail.com with ESMTPSA id 12-v6sm27915081wms.11.2018.11.01.06.23.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Nov 2018 06:23:38 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 1 Nov 2018 14:23:25 +0100 Message-Id: <20181101132326.13015-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/2] ngrep: bump to version 1.47 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: Wade Berrier , Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Switch site from sourceforge to github as there is no new releases on sourceforge and http://ngrep.sourceforge.net/ is redirected to https://github.com/jpr5/ngrep/ - Remove first patch, not needed since version 1.46 and https://github.com/jpr5/ngrep/commit/997c9d81d34d3a6646e6c5e363645015e644b3de as this commit added the support for system pcre - Remove second patch, not needed since version 1.46 and https://github.com/jpr5/ngrep/commit/2d8fd9ac7ef1ac6947f738f6005e7b533654f331 - Remove third patch and LIBS=-lpcap -lpcre, not needed since 1.46 and https://github.com/jpr5/ngrep/commit/cca6e3121f2d80dd32a5a33dead9495fe40eed70 - LICENSE.txt has been renamed to LICENSE since version 1.47 and https://github.com/jpr5/ngrep/commit/3cb4c580a9de4afe11c2c17b0f354b59b74ae974 - Add an upstream patch to fix --enable-pcre - Remove --with-pcre which is not recognized anymore - Add hash for license file Signed-off-by: Fabrice Fontaine --- ...nfigure-in-when-testing-for-use_pcre.patch | 25 +++++++++++++++++++ package/ngrep/0001-make-objs.patch | 23 ----------------- package/ngrep/0002-pcre-header.patch | 16 ------------ package/ngrep/0003-fix-static-link.patch | 25 ------------------- package/ngrep/Config.in | 2 +- package/ngrep/ngrep.hash | 3 ++- package/ngrep/ngrep.mk | 11 ++++---- 7 files changed, 33 insertions(+), 72 deletions(-) create mode 100644 package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch delete mode 100644 package/ngrep/0001-make-objs.patch delete mode 100644 package/ngrep/0002-pcre-header.patch delete mode 100644 package/ngrep/0003-fix-static-link.patch diff --git a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch new file mode 100644 index 0000000000..69c5c887e8 --- /dev/null +++ b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch @@ -0,0 +1,25 @@ +From b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe Mon Sep 17 00:00:00 2001 +From: Romain Francoise +Date: Mon, 1 Jan 2018 18:00:34 +0100 +Subject: [PATCH] Fix typo in configure.in when testing for use_pcre + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe] +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index cff37e9..06c050a 100644 +--- a/configure.in ++++ b/configure.in +@@ -146,7 +146,7 @@ AC_ARG_ENABLE(pcre, + [ use_pcre="$enableval" ], + [ use_pcre="no" ]) + +-if test use_pcre = yes; then ++if test $use_pcre = yes; then + USE_PCRE="1" + EXTRA_LIBS="$EXTRA_LIBS -lpcre" + else diff --git a/package/ngrep/0001-make-objs.patch b/package/ngrep/0001-make-objs.patch deleted file mode 100644 index 8b55e3f456..0000000000 --- a/package/ngrep/0001-make-objs.patch +++ /dev/null @@ -1,23 +0,0 @@ -ngrep: don't include regex objects since we're using pcre - -Signed-off-by: Wade Berrier - ---- ngrep-1.45/Makefile.in.orig 2006-11-28 06:35:37.000000000 -0700 -+++ ngrep-1.45/Makefile.in 2011-06-29 14:05:27.000000000 -0600 -@@ -32,13 +32,13 @@ - - INSTALL = ./install-sh - --REGEX_DIR=@REGEX_DIR@ --REGEX_OBJS=@REGEX_OBJS@ -+REGEX_DIR= -+REGEX_OBJS= - - - all: $(TARGET) - --$(TARGET): $(REGEX_OBJS) $(OBJS) -+$(TARGET): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) - - debug: $(REGEX_OBJS) $(OBJS) diff --git a/package/ngrep/0002-pcre-header.patch b/package/ngrep/0002-pcre-header.patch deleted file mode 100644 index 40b9234dbc..0000000000 --- a/package/ngrep/0002-pcre-header.patch +++ /dev/null @@ -1,16 +0,0 @@ -ngrep: don't use versioned header - -Signed-off-by: Wade Berrier - -diff -ur ngrep-1.45/ngrep.c ngrep-1.45.mod/ngrep.c ---- ngrep-1.45/ngrep.c Tue Nov 28 15:38:43 2006 -+++ ngrep-1.45.mod/ngrep.c Sat May 19 10:21:27 2007 -@@ -92,7 +92,7 @@ - #endif - - #if USE_PCRE --#include "pcre-5.0/pcre.h" -+#include "pcre.h" - #else - #include "regex-0.12/regex.h" - #endif diff --git a/package/ngrep/0003-fix-static-link.patch b/package/ngrep/0003-fix-static-link.patch deleted file mode 100644 index 98c262696d..0000000000 --- a/package/ngrep/0003-fix-static-link.patch +++ /dev/null @@ -1,25 +0,0 @@ -ngrep: fix static link with pcre - -Libraries must be placed after object files. - -Signed-off-by: Romain Naour ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 2ae4506..761d7d9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -11,7 +11,7 @@ CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ - INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@ - - LDFLAGS=@LDFLAGS@ @PCAP_LINK@ --LIBS=-lpcap @EXTRA_LIBS@ -+LIBS=@LIBS@ @EXTRA_LIBS@ - - STRIPFLAG=@STRIPFLAG@ - --- -1.8.1.4 - diff --git a/package/ngrep/Config.in b/package/ngrep/Config.in index cd91225791..5f87f2f79b 100644 --- a/package/ngrep/Config.in +++ b/package/ngrep/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_NGREP help Network grep. - http://ngrep.sourceforge.net/ + https://github.com/jpr5/ngrep/ diff --git a/package/ngrep/ngrep.hash b/package/ngrep/ngrep.hash index e0a6a2580b..bf9e621a89 100644 --- a/package/ngrep/ngrep.hash +++ b/package/ngrep/ngrep.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7 ngrep-1.45.tar.bz2 +sha256 dc4dbe20991cc36bac5e97e99475e2a1522fd88c59ee2e08f813432c04c5fff3 ngrep-1_47.tar.gz +sha256 d46e593e048e0b9fc803561ed4c283f37a2d5447e4dcfa10cad29b394c2b8b9e LICENSE diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk index 3f569374b4..f116e34e42 100644 --- a/package/ngrep/ngrep.mk +++ b/package/ngrep/ngrep.mk @@ -4,14 +4,14 @@ # ################################################################################ -NGREP_VERSION = 1.45 -NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2 -NGREP_SITE = http://downloads.sourceforge.net/project/ngrep/ngrep/$(NGREP_VERSION) +NGREP_VERSION = 1_47 +NGREP_SITE = $(call github,jpr5,ngrep,V$(NGREP_VERSION)) NGREP_LICENSE = BSD-4-Clause-like -NGREP_LICENSE_FILES = LICENSE.txt +NGREP_LICENSE_FILES = LICENSE NGREP_INSTALL_STAGING = YES +# We're patching configure.in +NGREP_AUTORECONF = YES -NGREP_LIBS = -lpcap -lpcre ifeq ($(BR2_STATIC_LIBS),y) NGREP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` endif @@ -20,7 +20,6 @@ NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)" NGREP_CONF_OPTS = \ --with-pcap-includes=$(STAGING_DIR)/usr/include/pcap \ --enable-pcre \ - --with-pcre=$(STAGING_DIR)/usr \ --disable-dropprivs \ --disable-pcap-restart