Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2219683/?format=api
{ "id": 2219683, "url": "http://patchwork.ozlabs.org/api/patches/2219683/?format=api", "web_url": "http://patchwork.ozlabs.org/project/buildroot/patch/20260403181413.3893668-1-bernd@kuhls.net/", "project": { "id": 27, "url": "http://patchwork.ozlabs.org/api/projects/27/?format=api", "name": "Buildroot development", "link_name": "buildroot", "list_id": "buildroot.buildroot.org", "list_email": "buildroot@buildroot.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260403181413.3893668-1-bernd@kuhls.net>", "list_archive_url": null, "date": "2026-04-03T18:14:13", "name": "[1/1] package/ngrep: bump version to 1.49.0", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "6244156ff56755214a63c8e32d3b84b5303e9ff6", "submitter": { "id": 86624, "url": "http://patchwork.ozlabs.org/api/people/86624/?format=api", "name": "Bernd Kuhls", "email": "bernd@kuhls.net" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/buildroot/patch/20260403181413.3893668-1-bernd@kuhls.net/mbox/", "series": [ { "id": 498661, "url": "http://patchwork.ozlabs.org/api/series/498661/?format=api", "web_url": "http://patchwork.ozlabs.org/project/buildroot/list/?series=498661", "date": "2026-04-03T18:14:13", "name": "[1/1] package/ngrep: bump version to 1.49.0", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498661/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2219683/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2219683/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<buildroot-bounces@buildroot.org>", "X-Original-To": [ "incoming-buildroot@patchwork.ozlabs.org", "buildroot@buildroot.org" ], "Delivered-To": [ "patchwork-incoming-buildroot@legolas.ozlabs.org", "buildroot@buildroot.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=buildroot.org header.i=@buildroot.org\n header.a=rsa-sha256 header.s=default header.b=jYbR2fnY;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org\n (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org;\n envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org)" ], "Received": [ "from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fnRh173rCz1xtJ\n\tfor <incoming-buildroot@patchwork.ozlabs.org>;\n Sat, 04 Apr 2026 05:14:25 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id A8E186116F;\n\tFri, 3 Apr 2026 18:14:23 +0000 (UTC)", "from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id 9yf0sJ4py7kf; Fri, 3 Apr 2026 18:14:22 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id 0BA386117C;\n\tFri, 3 Apr 2026 18:14:22 +0000 (UTC)", "from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133])\n by lists1.osuosl.org (Postfix) with ESMTP id DF8541F3\n for <buildroot@buildroot.org>; Fri, 3 Apr 2026 18:14:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp2.osuosl.org (Postfix) with ESMTP id D0D8A40854\n for <buildroot@buildroot.org>; Fri, 3 Apr 2026 18:14:19 +0000 (UTC)", "from smtp2.osuosl.org ([127.0.0.1])\n by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id ADyA0Ll33fFQ for <buildroot@buildroot.org>;\n Fri, 3 Apr 2026 18:14:18 +0000 (UTC)", "from dd20012.kasserver.com (dd20012.kasserver.com [85.13.140.57])\n by smtp2.osuosl.org (Postfix) with ESMTPS id 902E240202\n for <buildroot@buildroot.org>; Fri, 3 Apr 2026 18:14:16 +0000 (UTC)", "from fli4l.lan.fli4l (p4fd6cb24.dip0.t-ipconnect.de [79.214.203.36])\n by dd20012.kasserver.com (Postfix) with ESMTPSA id 0D86AA4C33E6;\n Fri, 3 Apr 2026 20:14:14 +0200 (CEST)", "from bruckner.lan.fli4l ([192.168.1.1]:37614)\n by fli4l.lan.fli4l with esmtp (Exim 4.99.1)\n (envelope-from <bernd@kuhls.net>) id 1w8j25-000000007Lu-23rv;\n Fri, 03 Apr 2026 18:14:13 +0000" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org;\n receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0BA386117C", "OpenDKIM Filter v2.11.0 smtp2.osuosl.org 902E240202" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=buildroot.org;\n\ts=default; t=1775240062;\n\tbh=7eHdI1QWpLFRq0wAfoNcHTr2F8hXZm6jDez/qnEq6DQ=;\n\th=From:To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive:\n\t List-Post:List-Help:List-Subscribe:From;\n\tb=jYbR2fnYit4WfuNUbMwFuezdaNajD4rx4SGfeYP4khlvukCLWZXomRfoHXKBUpiUA\n\t iX3O1WqIjvk1+mbOppCuT4xGIc5LEgpaYidFepe4p0ExZMwIuab4w5Dbtp53sDdPFa\n\t C7lJRU0OJhNT541+LgzTFgP1iJ2hR6tN4W7WWbO0zpLzL7U4k1uvwtvPc3qfDhawJ7\n\t FyMHcjeMkex3sMsxePyhjTT4xH22JFro0ULtP6v7EN/9Lyv3Vg0ACjzZiIygL1gFSo\n\t fZIzYN2UJOgygkWlhS67wzsgS25FPrJ7m9KVkICOHy3zXwCpxi+IiJz1IY32vztdV0\n\t mcu3XtlY6EmBg==", "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=85.13.140.57;\n helo=dd20012.kasserver.com; envelope-from=bernd@kuhls.net;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp2.osuosl.org 902E240202", "From": "Bernd Kuhls <bernd@kuhls.net>", "To": "buildroot@buildroot.org", "Cc": "Wade Berrier <wberrier@gmail.com>", "Date": "Fri, 3 Apr 2026 20:14:13 +0200", "Message-ID": "<20260403181413.3893668-1-bernd@kuhls.net>", "X-Mailer": "git-send-email 2.47.3", "MIME-Version": "1.0", "X-Spamd-Bar": "--", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=kuhls.net;\n s=kas202511301023; t=1775240054;\n bh=BbPH/1JzioTz1QaCfO9B4EWRVlvoE7B3dfPI4ri1yO8=;\n h=From:To:Cc:Subject:Date:From;\n b=LRmTF686kZ7QH6rrlD3V9k35T9JPcZJDICRNm2ikPm47DYZNt6K3fBeSWCLBXIajZ\n grwLsuXAH9bE43TLfOiaC3em+eu/PCbLC5fB6uwgVmR5sfLt2zDrRbberEjrbxDliQ\n FU3jdOEJq+z0U3UaaAKnC7lhCPZSzYsh/VeyYCz8Xq8t/Dj4Ndduy6x1D/OEuGixkh\n WNoy/i1ePjRglEOK9Rbbll5NSpahc4cgmHTPUIkDXc/rBuxA/KLLxd3NhzCZFunJgn\n vdIibFWeb1cLqXeDffEkKCb3NCIxv0W/Z14Eo/fv6FfgRBjOjIaWvqxKLU6cZLGUmw\n JMR4DRkU8MJAQ==", "X-Mailman-Original-Authentication-Results": [ "smtp2.osuosl.org;\n dmarc=pass (p=none dis=none)\n header.from=kuhls.net", "smtp2.osuosl.org;\n dkim=pass (2048-bit key,\n unprotected) header.d=kuhls.net header.i=@kuhls.net header.a=rsa-sha256\n header.s=kas202511301023 header.b=LRmTF686" ], "Subject": "[Buildroot] [PATCH 1/1] package/ngrep: bump version to 1.49.0", "X-BeenThere": "buildroot@buildroot.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Discussion and development of buildroot <buildroot.buildroot.org>", "List-Unsubscribe": "<https://lists.buildroot.org/mailman/options/buildroot>,\n <mailto:buildroot-request@buildroot.org?subject=unsubscribe>", "List-Archive": "<http://lists.buildroot.org/pipermail/buildroot/>", "List-Post": "<mailto:buildroot@buildroot.org>", "List-Help": "<mailto:buildroot-request@buildroot.org?subject=help>", "List-Subscribe": "<https://lists.buildroot.org/mailman/listinfo/buildroot>,\n <mailto:buildroot-request@buildroot.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "buildroot-bounces@buildroot.org", "Sender": "\"buildroot\" <buildroot-bounces@buildroot.org>" }, "content": "Removed patch 0001, included upstream:\nhttps://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe\n\nRemoved patch 0002, included upstream:\nhttps://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5\n\nRemoved patch 0003, included upstream:\nhttps://github.com/jpr5/ngrep/commit/c9ddace67b6faee8d7dd0cdf376c9275a99224f9\n\nRemoved patch 0004 which was never sent upstream, also libnet still\nprovides libnet-config and causes no build errors. Porting this patch to\nthe modified configure.ac script does not create any benefits so we drop\nthis patch along with autoreconf.\n\nRemoved patch 0005, included upstream:\nhttps://github.com/jpr5/ngrep/commit/742424ddd76e15bd151e40834e8f1fad65900b65\n\nRemoved patch 0006, included upstream:\nhttps://github.com/jpr5/ngrep/commit/e97f8e9d4b80e6e26e0bc4f586c7abfd772d888c\nhttps://github.com/jpr5/ngrep/commit/1e340b1eb334a74a6ab5373345aa1afce2e30c7c\n\nWchar is needed since this commit was added to 1.48.1:\nhttps://github.com/jpr5/ngrep/commit/8107128098392862b34204ece13ca907f1f74436\n\nPcre2 is now required instead of pcre:\nhttps://github.com/jpr5/ngrep/commit/cfcf1e6e9c4f8a2404810d8d1d90e6d1eaa0abdd\n\nUpdated license hash due to upstream commit:\nhttps://github.com/jpr5/ngrep/commit/fc5db167dec085805e76ad1f97bf38e1e850ec2c\n\nRemoved /pcap from configure option pcap-includes due to upstream commit\nhttps://github.com/jpr5/ngrep/commit/110fa39f8fae8efe2e9b35ad9bc922a305589f0b\nwhich now searches for pcap/pcap.h instead of pcap.h:\nhttps://github.com/jpr5/ngrep/commit/110fa39f8fae8efe2e9b35ad9bc922a305589f0b#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R200-R303\n\nAdded ac_cv_path_NGREP_PCRE2_CONFIG_SCRIPT to _CONF_ENV to avoid\n/usr/bin/pcre2-config being found.\n\nAdded ac_cv_path_LIBNET_CONFIG_BIN to _CONF_ENV as follow-up to the\nremoval of patch 0004.\n\nBuild-tested using this defconfig:\n\nBR2_PACKAGE_LIBNET=y\nBR2_PACKAGE_NGREP=y\n\n arm-aarch64 [ 1/32]: OK\n bootlin-aarch64-glibc [ 2/32]: OK\n bootlin-aarch64-glibc-old [ 3/32]: OK\n bootlin-arcle-hs38-uclibc [ 4/32]: OK\n bootlin-armv5-uclibc [ 5/32]: OK\n bootlin-armv7-glibc [ 6/32]: OK\n bootlin-armv7m-uclibc [ 7/32]: OK\n bootlin-armv7-musl [ 8/32]: OK\n bootlin-m68k-5208-uclibc [ 9/32]: OK\n bootlin-m68k-68040-uclibc [10/32]: OK\n bootlin-microblazeel-uclibc [11/32]: OK\n bootlin-mips64el-glibc [12/32]: OK\n bootlin-mipsel32r6-glibc [13/32]: OK\n bootlin-mipsel-uclibc [14/32]: OK\n bootlin-openrisc-uclibc [15/32]: OK\n bootlin-powerpc64le-power8-glibc [16/32]: OK\n bootlin-powerpc-e500mc-uclibc [17/32]: OK\n bootlin-riscv32-glibc [18/32]: OK\n bootlin-riscv64-glibc [19/32]: OK\n bootlin-riscv64-musl [20/32]: OK\n bootlin-s390x-z13-glibc [21/32]: OK\n bootlin-sh4-uclibc [22/32]: OK\n bootlin-sparc64-glibc [23/32]: OK\n bootlin-sparc-uclibc [24/32]: OK\n bootlin-x86-64-glibc [25/32]: OK\n bootlin-x86-64-musl [26/32]: OK\n bootlin-x86-64-uclibc [27/32]: OK\n bootlin-x86-i686-musl [28/32]: OK\n bootlin-xtensa-uclibc [29/32]: OK\n br-arm-basic [30/32]: SKIPPED\n br-arm-full-nothread [31/32]: OK\n br-arm-full-static [32/32]: OK\n\n32 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed\n\nSigned-off-by: Bernd Kuhls <bernd@kuhls.net>\n---\n ...nfigure-in-when-testing-for-use_pcre.patch | 24 ----------\n ...heck-for-libnet_init-in-configure-in.patch | 27 ------------\n package/ngrep/0003-fix-disable-tcpkill.patch | 39 ----------------\n ...ure.in-use-pkg-config-to-find-libnet.patch | 38 ----------------\n package/ngrep/0005-gcc15.patch | 34 --------------\n ...d-tcpkill.h-to-avoid-implicit-functi.patch | 44 -------------------\n package/ngrep/Config.in | 6 ++-\n package/ngrep/ngrep.hash | 4 +-\n package/ngrep/ngrep.mk | 14 +++---\n 9 files changed, 14 insertions(+), 216 deletions(-)\n delete mode 100644 package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch\n delete mode 100644 package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch\n delete mode 100644 package/ngrep/0003-fix-disable-tcpkill.patch\n delete mode 100644 package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch\n delete mode 100644 package/ngrep/0005-gcc15.patch\n delete mode 100644 package/ngrep/0006-Include-err.h-and-tcpkill.h-to-avoid-implicit-functi.patch", "diff": "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\ndeleted file mode 100644\nindex c7f0dec360..0000000000\n--- a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch\n+++ /dev/null\n@@ -1,24 +0,0 @@\n-From b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe Mon Sep 17 00:00:00 2001\n-From: Romain Francoise <romain@rfr.io>\n-Date: Mon, 1 Jan 2018 18:00:34 +0100\n-Subject: [PATCH] Fix typo in configure.in when testing for use_pcre\n-\n-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>\n-Upstream: https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe\n----\n- configure.in | 2 +-\n- 1 file changed, 1 insertion(+), 1 deletion(-)\n-\n-diff --git a/configure.in b/configure.in\n-index cff37e9..06c050a 100644\n---- a/configure.in\n-+++ b/configure.in\n-@@ -146,7 +146,7 @@ AC_ARG_ENABLE(pcre,\n- [ use_pcre=\"$enableval\" ],\n- [ use_pcre=\"no\" ])\n- \n--if test use_pcre = yes; then\n-+if test $use_pcre = yes; then\n- USE_PCRE=\"1\"\n- EXTRA_LIBS=\"$EXTRA_LIBS -lpcre\"\n- else\ndiff --git a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch\ndeleted file mode 100644\nindex 7fa2e2f3bc..0000000000\n--- a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch\n+++ /dev/null\n@@ -1,27 +0,0 @@\n-From 0a51c8bc62c7b49b8d67a360daa6b1957256f4f5 Mon Sep 17 00:00:00 2001\n-From: Romain Francoise <romain@rfr.io>\n-Date: Mon, 1 Jan 2018 18:01:13 +0100\n-Subject: [PATCH] Check for libnet_init in configure.in\n-\n-libnet_init_packet was the old libnet 1.0 function which is now long\n-deprecated.\n-\n-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>\n-Upstream: https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5\n----\n- configure.in | 2 +-\n- 1 file changed, 1 insertion(+), 1 deletion(-)\n-\n-diff --git a/configure.in b/configure.in\n-index 06c050a..dbef39b 100644\n---- a/configure.in\n-+++ b/configure.in\n-@@ -174,7 +174,7 @@ dnl\n- AC_ARG_ENABLE(tcpkill,\n- [ --enable-tcpkill enable connection killing support (default off)],\n- [\n-- AC_CHECK_LIB(net, libnet_init_packet,,echo !!! error: tcpkill feature enabled but no libnet found; exit)\n-+ AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit)\n- use_tcpkill=\"$enableval\"\n- ],\n- [ use_tcpkill=\"no\" ])\ndiff --git a/package/ngrep/0003-fix-disable-tcpkill.patch b/package/ngrep/0003-fix-disable-tcpkill.patch\ndeleted file mode 100644\nindex 894cd95b0f..0000000000\n--- a/package/ngrep/0003-fix-disable-tcpkill.patch\n+++ /dev/null\n@@ -1,39 +0,0 @@\n-From e8522284ef326bd9f222e04c4a970ffafa56fba6 Mon Sep 17 00:00:00 2001\n-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>\n-Date: Sat, 3 Nov 2018 23:23:36 +0100\n-Subject: [PATCH] fix --disable-tcpkill\n-\n-If the user uses --disable-tcpkill, build can fail if libnet is not\n-found on the system.\n-\n-To fix this, move AC_CHECK_LIB to found libnet outside AC_ARG_ENABLE\n-\n-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>\n-Upstream: https://github.com/jpr5/ngrep/pull/15\n----\n- configure.in | 6 ++----\n- 1 file changed, 2 insertions(+), 4 deletions(-)\n-\n-diff --git a/configure.in b/configure.in\n-index dbef39b..7c3dd43 100644\n---- a/configure.in\n-+++ b/configure.in\n-@@ -173,13 +173,11 @@ dnl\n- \n- AC_ARG_ENABLE(tcpkill,\n- [ --enable-tcpkill enable connection killing support (default off)],\n--[\n-- AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit)\n-- use_tcpkill=\"$enableval\"\n--],\n-+[ use_tcpkill=\"$enableval\" ],\n- [ use_tcpkill=\"no\" ])\n- \n- if test $use_tcpkill = yes; then\n-+ AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit)\n- USE_TCPKILL=\"1\"\n- EXTRA_OBJS=\"$EXTRA_OBJS tcpkill.o\"\n- EXTRA_DEFINES=\"$EXTRA_DEFINES $(libnet-config --defines)\"\n--- \n-2.17.1\n-\ndiff --git a/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch\ndeleted file mode 100644\nindex 71550da943..0000000000\n--- a/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch\n+++ /dev/null\n@@ -1,38 +0,0 @@\n-From 4788988827bf4c0d996d3e1e3b6ac52a23b97941 Mon Sep 17 00:00:00 2001\n-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>\n-Date: Tue, 9 Jan 2024 21:15:47 +0100\n-Subject: [PATCH] configure.in: use pkg-config to find libnet\n-\n-libnet-config is deprecated:\n-https://github.com/libnet/libnet/commit/1ec4a6e7d1d23811f0a14ecb51e46489a0175727\n-\n-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>\n-Upstream: unsent (upstream seems dead, no commit since 5 years\n----\n- configure.in | 6 ++++--\n- 1 file changed, 4 insertions(+), 2 deletions(-)\n-\n-diff --git a/configure.in b/configure.in\n-index 7c3dd43..882ff86 100644\n---- a/configure.in\n-+++ b/configure.in\n-@@ -176,12 +176,14 @@ AC_ARG_ENABLE(tcpkill,\n- [ use_tcpkill=\"$enableval\" ],\n- [ use_tcpkill=\"no\" ])\n- \n-+PKG_PROG_PKG_CONFIG\n- if test $use_tcpkill = yes; then\n- AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit)\n- USE_TCPKILL=\"1\"\n- EXTRA_OBJS=\"$EXTRA_OBJS tcpkill.o\"\n-- EXTRA_DEFINES=\"$EXTRA_DEFINES $(libnet-config --defines)\"\n-- EXTRA_LIBS=\"$EXTRA_LIBS $(libnet-config --libs)\"\n-+ PKG_CHECK_MODULES(LIBNET, libnet)\n-+ EXTRA_DEFINES=\"$EXTRA_DEFINES $LIBNET_CFLAGS\"\n-+ EXTRA_LIBS=\"$EXTRA_LIBS $LIBNET_LIBS\"\n- else\n- USE_TCPKILL=\"0\"\n- fi\n--- \n-2.43.0\n-\ndiff --git a/package/ngrep/0005-gcc15.patch b/package/ngrep/0005-gcc15.patch\ndeleted file mode 100644\nindex e1dd7785b8..0000000000\n--- a/package/ngrep/0005-gcc15.patch\n+++ /dev/null\n@@ -1,34 +0,0 @@\n-From 742424ddd76e15bd151e40834e8f1fad65900b65 Mon Sep 17 00:00:00 2001\n-From: Rudi Heitbaum <rudi@heitbaum.com>\n-Date: Mon, 9 Dec 2024 09:44:12 +0000\n-Subject: [PATCH] fix build with gcc-15\n-\n-Upstream: https://github.com/jpr5/ngrep/commit/742424ddd76e15bd151e40834e8f1fad65900b65\n-\n-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>\n----\n- ngrep.c | 4 ++--\n- 1 file changed, 2 insertions(+), 2 deletions(-)\n-\n-diff --git a/ngrep.c b/ngrep.c\n-index 3df9389..57b4ddd 100644\n---- a/ngrep.c\n-+++ b/ngrep.c\n-@@ -146,7 +146,7 @@ struct re_pattern_buffer pattern;\n- \n- char *match_data = NULL, *bin_data = NULL;\n- uint16_t match_len = 0;\n--int8_t (*match_func)() = &blank_match_func;\n-+int8_t (*match_func)(unsigned char *, uint32_t, uint16_t *, uint16_t *) = &blank_match_func;\n- \n- int8_t dump_single = 0;\n- void (*dump_func)(unsigned char *, uint32_t, uint16_t, uint16_t) = &dump_formatted;\n-@@ -177,7 +177,7 @@ FD_SET delay_fds;\n- SOCKET delay_socket = 0;\n- #endif\n- \n--void (*print_time)() = NULL, (*dump_delay)() = dump_delay_proc_init;\n-+void (*print_time)(struct pcap_pkthdr *) = NULL, (*dump_delay)(struct pcap_pkthdr *) = dump_delay_proc_init;\n- \n- \n- /*\ndiff --git a/package/ngrep/0006-Include-err.h-and-tcpkill.h-to-avoid-implicit-functi.patch b/package/ngrep/0006-Include-err.h-and-tcpkill.h-to-avoid-implicit-functi.patch\ndeleted file mode 100644\nindex 6d596bfe37..0000000000\n--- a/package/ngrep/0006-Include-err.h-and-tcpkill.h-to-avoid-implicit-functi.patch\n+++ /dev/null\n@@ -1,44 +0,0 @@\n-From 52515bae377f221b5473d9040f5f43ab1c672672 Mon Sep 17 00:00:00 2001\n-From: Florian Weimer <fweimer@redhat.com>\n-Date: Mon, 19 Dec 2022 11:49:06 +0100\n-Subject: [PATCH] Include <err.h> and \"tcpkill.h\" to avoid implicit function\n- declarations\n-\n-Implicit function declarations are a historic language feature that\n-were removed from C in 1999.\n-\n-Upstream: https://github.com/jpr5/ngrep/pull/28\n-\n-Signed-off-by: Thomas Bonnefille <thomas.bonnefille@bootlin.com>\n----\n- ngrep.c | 1 +\n- tcpkill.c | 1 +\n- 2 files changed, 2 insertions(+)\n-\n-diff --git a/ngrep.c b/ngrep.c\n-index 3df9389..b2fcceb 100644\n---- a/ngrep.c\n-+++ b/ngrep.c\n-@@ -98,6 +98,7 @@\n- #endif\n- \n- #include \"ngrep.h\"\n-+#include \"tcpkill.h\"\n- \n- \n- /*\n-diff --git a/tcpkill.c b/tcpkill.c\n-index 5388ec5..ac8fd2e 100644\n---- a/tcpkill.c\n-+++ b/tcpkill.c\n-@@ -14,6 +14,7 @@\n- #include <stdlib.h>\n- #include <unistd.h>\n- #include <string.h>\n-+#include <err.h>\n- #include <libnet.h>\n- #include <pcap.h>\n- \n--- \n-2.50.1\n-\ndiff --git a/package/ngrep/Config.in b/package/ngrep/Config.in\nindex 5f87f2f79b..6decaa60a9 100644\n--- a/package/ngrep/Config.in\n+++ b/package/ngrep/Config.in\n@@ -1,8 +1,12 @@\n config BR2_PACKAGE_NGREP\n \tbool \"ngrep\"\n+\tdepends on BR2_USE_WCHAR\n \tselect BR2_PACKAGE_LIBPCAP\n-\tselect BR2_PACKAGE_PCRE\n+\tselect BR2_PACKAGE_PCRE2\n \thelp\n \t Network grep.\n \n \t https://github.com/jpr5/ngrep/\n+\n+comment \"ngrep needs a toolchain w/ wchar\"\n+\tdepends on !BR2_USE_WCHAR\ndiff --git a/package/ngrep/ngrep.hash b/package/ngrep/ngrep.hash\nindex 7dd13b3b67..7cc9872ecc 100644\n--- a/package/ngrep/ngrep.hash\n+++ b/package/ngrep/ngrep.hash\n@@ -1,3 +1,3 @@\n # Locally computed:\n-sha256 dc4dbe20991cc36bac5e97e99475e2a1522fd88c59ee2e08f813432c04c5fff3 ngrep-1.47.tar.gz\n-sha256 d46e593e048e0b9fc803561ed4c283f37a2d5447e4dcfa10cad29b394c2b8b9e LICENSE\n+sha256 6c94b31681316b7469a3ace92d2aeec7c9f490bd6782453dff2ade0e289a3348 ngrep-1.49.0.tar.gz\n+sha256 de8f2aca6f09c8b7d6e4dde36ece0fc71be1584ff8ce6b1ef40fbe47f054467e LICENSE\ndiff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk\nindex dc69a34235..7232705895 100644\n--- a/package/ngrep/ngrep.mk\n+++ b/package/ngrep/ngrep.mk\n@@ -4,29 +4,29 @@\n #\n ################################################################################\n \n-NGREP_VERSION = 1.47\n-NGREP_SITE = $(call github,jpr5,ngrep,$(subst .,_,V$(NGREP_VERSION)))\n+NGREP_VERSION = 1.49.0\n+NGREP_SITE = $(call github,jpr5,ngrep,v$(NGREP_VERSION))\n NGREP_LICENSE = BSD-4-Clause-like, BSD-3-Clause (tcpkill)\n NGREP_LICENSE_FILES = LICENSE\n NGREP_INSTALL_STAGING = YES\n-# We're patching configure.in\n-NGREP_AUTORECONF = YES\n \n ifeq ($(BR2_STATIC_LIBS),y)\n NGREP_CONF_ENV += LIBS=`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`\n endif\n \n NGREP_CONF_OPTS = \\\n-\t--with-pcap-includes=$(STAGING_DIR)/usr/include/pcap \\\n-\t--enable-pcre \\\n+\t--with-pcap-includes=$(STAGING_DIR)/usr/include \\\n+\t--enable-pcre2 \\\n \t--disable-dropprivs \\\n \t--disable-pcap-restart\n+NGREP_CONF_ENV += ac_cv_path_NGREP_PCRE2_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/pcre2-config\n \n-NGREP_DEPENDENCIES = host-pkgconf libpcap pcre\n+NGREP_DEPENDENCIES = host-pkgconf libpcap pcre2\n \n ifeq ($(BR2_PACKAGE_LIBNET),y)\n NGREP_DEPENDENCIES += libnet\n NGREP_CONF_OPTS += --enable-tcpkill\n+NGREP_CONF_ENV += ac_cv_path_LIBNET_CONFIG_BIN=$(STAGING_DIR)/usr/bin/libnet-config\n else\n NGREP_CONF_OPTS += --disable-tcpkill\n endif\n", "prefixes": [ "1/1" ] }