diff --git a/srcpkgs/ngrep/patches/ngrep-1.45-fix-ipv6.patch b/srcpkgs/ngrep/patches/ngrep-1.45-fix-ipv6.patch deleted file mode 100644 index 17b5663a554..00000000000 --- a/srcpkgs/ngrep/patches/ngrep-1.45-fix-ipv6.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ngrep.c 2010-04-21 12:16:52.000000000 +0200 -+++ ngrep.c 2010-04-21 12:11:49.581088102 +0200 -@@ -711,10 +711,12 @@ void process(u_char *d, struct pcap_pkth - data = (unsigned char *)(tcp_pkt) + tcphdr_offset; - len -= link_offset + ip_hl + tcphdr_offset; - -+/* - #if USE_IPv6 - if (ip_ver == 6) - len -= ntohs(ip6_pkt->ip6_plen); --#endif -+#endif -+*/ - - if ((int32_t)len < 0) - len = 0; -@@ -731,11 +733,12 @@ void process(u_char *d, struct pcap_pkth - data = (unsigned char *)(udp_pkt) + udphdr_offset; - len -= link_offset + ip_hl + udphdr_offset; - -+/* - #if USE_IPv6 - if (ip_ver == 6) - len -= ntohs(ip6_pkt->ip6_plen); - #endif -- -+*/ - if ((int32_t)len < 0) - len = 0; - -@@ -769,7 +772,7 @@ void process(u_char *d, struct pcap_pkth - uint16_t icmp6hdr_offset = (frag_offset) ? 0 : 4; - - data = (unsigned char *)(icmp6_pkt) + icmp6hdr_offset; -- len -= link_offset + ip_hl + ntohs(ip6_pkt->ip6_plen) + icmp6hdr_offset; -+ len -= link_offset + ip_hl + icmp6hdr_offset; - - if ((int32_t)len < 0) - len = 0; diff --git a/srcpkgs/ngrep/patches/ngrep-1.45-use-system-pcre.patch b/srcpkgs/ngrep/patches/ngrep-1.45-use-system-pcre.patch deleted file mode 100644 index 083f3801630..00000000000 --- a/srcpkgs/ngrep/patches/ngrep-1.45-use-system-pcre.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- configure.in 2006-11-14 21:43:56.000000000 -0600 -+++ configure.in 2006-11-29 10:34:48.000000000 -0600 -@@ -28,8 +28,8 @@ - dnl - - EXTRA_DEFINES="" --EXTRA_INCLUDES="" --EXTRA_LIBS="" -+EXTRA_INCLUDES="$EXTRA_INCLUDES" -+EXTRA_LIBS="$EXTRA_LIBS" - - - dnl -@@ -130,8 +130,8 @@ - echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' - echo - -- REGEX_DIR='pcre-5.0' -- REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o" -+# REGEX_DIR='pcre-5.0' -+# REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o" - USE_PCRE="1" - - else -@@ -146,7 +146,7 @@ - - fi - --( cd $REGEX_DIR && ./configure ) -+#( cd $REGEX_DIR && ./configure ) - - AC_SUBST(REGEX_DIR) - AC_SUBST(REGEX_OBJS) ---- Makefile.in 2006-11-28 07:35:37.000000000 -0600 -+++ Makefile.in 2006-11-29 08:20:32.000000000 -0600 -@@ -38,7 +38,7 @@ - - all: $(TARGET) - --$(TARGET): $(REGEX_OBJS) $(OBJS) -+$(TARGET): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) - - debug: $(REGEX_OBJS) $(OBJS) ---- ngrep.c 2006-11-28 07:38:43.000000000 -0600 -+++ ngrep.c 2006-11-29 08:10:48.000000000 -0600 -@@ -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/srcpkgs/ngrep/template b/srcpkgs/ngrep/template index 1c180a9247d..ac46afc7c74 100644 --- a/srcpkgs/ngrep/template +++ b/srcpkgs/ngrep/template @@ -1,33 +1,25 @@ # Template file for 'ngrep' pkgname=ngrep -version=1.45 -revision=5 -hostmakedepends="automake pkg-config" +version=1.47 +revision=1 +wrksrc="ngrep-${version/./_}" +build_style=gnu-configure +configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre" +hostmakedepends="pkg-config" makedepends="pcre-devel libpcap-devel libressl-devel" -short_desc="grep-like utility for network interfaces" +short_desc="Like GNU grep applied to the network layer" maintainer="Juan RP " license="MIT" -homepage="http://ngrep.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7 +homepage="https://github.com/jpr5/ngrep" +distfiles="https://github.com/jpr5/ngrep/archive/V${version/./_}.tar.gz" +checksum=dc4dbe20991cc36bac5e97e99475e2a1522fd88c59ee2e08f813432c04c5fff3 -pre_configure() { - autoreconf -fi -} +if [ "$CROSS_BUILD" ]; then + configure_args+=" --with-pcap-includes=$XBPS_CROSS_BASE/usr/include/pcap" +else + configure_args+=" --with-pcap-includes=/usr/include/pcap" +fi -do_configure() { - if [ "$CROSS_BUILD" ]; then - configure_args+=" --with-pcap-includes=$XBPS_CROSS_BASE/usr/include/pcap " - else - configure_args+=" --with-pcap-includes=/usr/include/pcap " - fi - ./configure ${configure_args} --enable-ipv6 --enable-pcre EXTRA_LIBS="-lpcre" -} - -do_build() { - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} install +post_install() { + vlicense LICENSE }