diff --git a/main/ngrep/APKBUILD b/main/ngrep/APKBUILD index 7ea772827a3..415e2cd6488 100644 --- a/main/ngrep/APKBUILD +++ b/main/ngrep/APKBUILD @@ -1,41 +1,25 @@ # Contributor: Francesco Colista # Maintainer: Francesco Colista pkgname=ngrep -pkgver=1.47 -_pkgver="${pkgver/./_}" -pkgrel=5 +pkgver=1.48.3 +pkgrel=0 pkgdesc="A grep-like utility that allows you to search for network packets on an interface" url="https://ngrep.sourceforge.net/" arch="all" license="custom" -makedepends="autoconf automake libpcap-dev pcre-dev" +makedepends="autoconf automake libpcap-dev pcre2-dev" options="!check" subpackages="$pkgname-dbg $pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/jpr5/ngrep/archive/V$_pkgver.tar.gz - inc.patch - fix-two-configure-issues-for-system-pcre-and-libnet.patch - fix-build-with-gcc-15.patch - " -builddir="$srcdir"/$pkgname-$_pkgver - -prepare() { - default_prepare - update_config_sub - autoreconf -vif -} +source="$pkgname-$pkgver.tar.gz::https://github.com/jpr5/ngrep/archive/v$pkgver.tar.gz" build() { - export EXTRA_INCLUDES=$(pcre-config --cflags) - export EXTRA_LIBS=$(pcre-config --libs) - CFLAGS="$CFLAGS -DSTDC_HEADERS" ./configure \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ - --enable-pcre \ - --enable-ipv6 \ - --with-pcap-includes=/usr/include/pcap \ - --disable-pcap-restart + --enable-pcre2 \ + --enable-ipv6 make } @@ -45,8 +29,5 @@ package() { } sha512sums=" -47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657 ngrep-1.47.tar.gz -0e6e5d5c018f1aebefd764091158d3b5bb0fda0463cc1fc4062690d653422b920be374ce49535459bfc48b2509e4a95903392de482bb8b15ef831cf6c2eb3392 inc.patch -b8627d0195af140c6bfe4d1a453ffe585085d8549b31674dcaade9b9c5965ada4ada4f12a4aea06265196961f484c06f49a0cd9c438e0a7705b1eea8da7b0f38 fix-two-configure-issues-for-system-pcre-and-libnet.patch -34def477fcc25b566c7c678e86342ceeded77767173296f988daf6d496f39d6ed7fb9c12ffc97cd06ef9238bd94b3a5482c1d54cb9f3719763adcdb5ab07955a fix-build-with-gcc-15.patch +d7c716b4d4be10a23b430369b51f82a27038d4a3437e33ca1bf76651db5d0fff0f015452620a70c74b665fd8a672645fcfa1195fd59151772dda6f5b900f41c9 ngrep-1.48.3.tar.gz " diff --git a/main/ngrep/inc.patch b/main/ngrep/inc.patch deleted file mode 100644 index ac9a362b8e2..00000000000 --- a/main/ngrep/inc.patch +++ /dev/null @@ -1,21 +0,0 @@ -otherwise, building the regex library fails on missing config.h: - - gcc -Iregex-0.12 -I/usr/include/pcap -Os -fomit-frame-pointer -g -DSTDC_HEADERS -I. -DHAVE_CONFIG_H -DLINUX -D_BSD_SOURCE=1 -D__FAVOR_BSD=1 -Os -fomit-frame-pointer -c -o regex.o regex.c - regex.c:43:10: fatal error: config.h: No such file or directory - 43 | #include "config.h" - | ^~~~~~~~~~ - compilation terminated. - - - ---- a/Makefile.in -+++ b/Makefile.in -@@ -6,7 +6,7 @@ - CC=@CC@ - - CPPFLAGS = @DEFS@ -D@OS@ @EXTRA_DEFINES@ @CPPFLAGS@ --CFLAGS = @EXTRA_INCLUDES@ @CFLAGS@ -+CFLAGS = @EXTRA_INCLUDES@ @CFLAGS@ -I@abs_srcdir@ - LDFLAGS = @EXTRA_LDFLAGS@ @LDFLAGS@ - LIBS = @LIBS@ @EXTRA_LIBS@ -