diff options
author | adam <adam> | 2005-02-25 09:23:40 +0000 |
---|---|---|
committer | adam <adam> | 2005-02-25 09:23:40 +0000 |
commit | 26ae114fc964154ec90c336a7ca6cc571d5b0ddf (patch) | |
tree | f6cfa83bcf40d12a8da7da121522e0f1855c595e /net | |
parent | abea0d820af7294834352fb0cb98c69c5cb5cf40 (diff) | |
download | pkgsrc-26ae114fc964154ec90c336a7ca6cc571d5b0ddf.tar.gz |
Changes 1.43:
* healed the win32 code fork: ngrep now builds from the same
source tree for all platforms including Windows
* re-wrote the privilege revocation logic after problems were
reported with the SPC version, and removed non-root
drop_privs capability altogether
* fix off-by-one bug which caused ngrep to exit 1 packet early
when ``-A'' as invoked
* Fixed problematic configtest for old broken-redhat-glibc UDP header
* ngrep now sets a pcap filter "ip" by default, if one is not specified
* header offset fix to 802.11 processing
* support IGMP and Raw (unknown IP protocol) type packets
* support for latest versions of libpcap (0.8.3) and winpcap (3.1 beta 4)
* updated configure to autoconf 2.59, and config.guess and
config.sub to latest versions
* updated PCRE from 3.4 to 5.0
* and various minor changes and updates to improve ngrep
Diffstat (limited to 'net')
-rw-r--r-- | net/ngrep/Makefile | 6 | ||||
-rw-r--r-- | net/ngrep/distinfo | 13 | ||||
-rw-r--r-- | net/ngrep/patches/patch-aa | 14 | ||||
-rw-r--r-- | net/ngrep/patches/patch-ab | 41 | ||||
-rw-r--r-- | net/ngrep/patches/patch-ac | 63 |
5 files changed, 28 insertions, 109 deletions
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile index 5bcdf1c9bf5..1d24e3d7a6b 100644 --- a/net/ngrep/Makefile +++ b/net/ngrep/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2005/02/21 20:26:13 hubertf Exp $ -# +# $NetBSD: Makefile,v 1.21 2005/02/25 09:23:40 adam Exp $ -DISTNAME= ngrep-1.42 -PKGREVISION= 2 +DISTNAME= ngrep-1.43 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ngrep/} EXTRACT_SUFX= .tar.bz2 diff --git a/net/ngrep/distinfo b/net/ngrep/distinfo index 4e92934301e..d8840b3ed33 100644 --- a/net/ngrep/distinfo +++ b/net/ngrep/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.8 2005/02/24 12:13:55 agc Exp $ +$NetBSD: distinfo,v 1.9 2005/02/25 09:23:40 adam Exp $ -SHA1 (ngrep-1.42.tar.bz2) = 03987bc4f6344ecd0d56313f42f2c254f37ac271 -RMD160 (ngrep-1.42.tar.bz2) = 54ad8e4794d57adb26e209dd381d47d1ed5e468e -Size (ngrep-1.42.tar.bz2) = 527699 bytes -SHA1 (patch-aa) = cf3076ba4a0c471d429ae76bafe7dab46d20fa30 -SHA1 (patch-ab) = 9522bd13976c850d109f91f6a5ec5a2aa7272d4e -SHA1 (patch-ac) = 9624cedda7f30ead25dc82cc7bb254bf0da8cf6b +SHA1 (ngrep-1.43.tar.bz2) = 879ff987839da8d155c3d529f8e4010c3a9f565e +RMD160 (ngrep-1.43.tar.bz2) = 6fa4c6f5e55c5021d4c9565677ea77b8f375f7f4 +Size (ngrep-1.43.tar.bz2) = 447819 bytes +SHA1 (patch-aa) = 094e184213a401a67c7c409e8f7245fa27f9dcd3 +SHA1 (patch-ab) = 08576e9080ba79abb9e9ad1a161cb51a2d768025 diff --git a/net/ngrep/patches/patch-aa b/net/ngrep/patches/patch-aa index 0e0c2b644eb..a88556ba42d 100644 --- a/net/ngrep/patches/patch-aa +++ b/net/ngrep/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.6 2004/04/13 13:50:05 adam Exp $ +$NetBSD: patch-aa,v 1.7 2005/02/25 09:23:41 adam Exp $ ---- configure.orig 2004-01-04 21:03:31.000000000 +0000 +--- configure.orig 2005-02-24 04:25:20.000000000 +0000 +++ configure -@@ -3274,16 +3274,8 @@ pcap_dir="" +@@ -3231,16 +3231,8 @@ fi; + pcap_dir="" for dir in $PCAP_DIR ; do - if test -d $dir -a -r "$dir/pcap.h" -a \ - -r "$dir/net/bpf.h" ; then + if test -d $dir -a -r "$dir/pcap.h" ; then - if test -n "$pcap_dir" -a "$pcap_dir" != "$dir"; then - echo - echo; echo more than one set found in: @@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.6 2004/04/13 13:50:05 adam Exp $ fi done -@@ -3309,7 +3301,12 @@ if test "${ac_cv_lib_pcap_pcap_open_live +@@ -3421,7 +3413,12 @@ if test "${ac_cv_lib_pcap_pcap_open_live echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33,5 +33,5 @@ $NetBSD: patch-aa,v 1.6 2004/04/13 13:50:05 adam Exp $ + LIBS="-lpcap $LIBS" ;; +esac cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ + _ACEOF diff --git a/net/ngrep/patches/patch-ab b/net/ngrep/patches/patch-ab index e503186e430..1e1e0ac829f 100644 --- a/net/ngrep/patches/patch-ab +++ b/net/ngrep/patches/patch-ab @@ -1,28 +1,13 @@ -$NetBSD: patch-ab,v 1.4 2002/11/26 21:45:40 cjep Exp $ ---- pcre-3.4/config.guess.orig Tue Aug 22 09:05:44 2000 -+++ pcre-3.4/config.guess Thu Jun 6 22:49:38 2002 -@@ -165,6 +165,24 @@ - arm32:NetBSD:*:*) - echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; -+ acorn26:NetBSD:*:*) -+ echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ exit 0 ;; -+ acorn32:NetBSD:*:*) -+ echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ exit 0 ;; -+ cats:NetBSD:*:*) -+ echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ exit 0 ;; -+ evbarm:NetBSD:*:*) -+ echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ exit 0 ;; -+ hpcarm:NetBSD:*:*) -+ echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ exit 0 ;; -+ shark:NetBSD:*:*) -+ echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ exit 0 ;; - SR2?01:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit 0;; +$NetBSD: patch-ab,v 1.5 2005/02/25 09:23:41 adam Exp $ + +--- Makefile.in.orig 2005-02-25 10:20:17.000000000 +0000 ++++ Makefile.in +@@ -25,7 +25,7 @@ exec_prefix = @exec_prefix@ + + bindir = $(prefix)/bin + datadir = $(prefix)/share +-mandir = $(datadir)/man ++mandir = $(prefix)/man + + BINDIR_INSTALL = $(prefix)/bin + MANDIR_INSTALL = $(mandir)/man8 diff --git a/net/ngrep/patches/patch-ac b/net/ngrep/patches/patch-ac deleted file mode 100644 index 18d503b0466..00000000000 --- a/net/ngrep/patches/patch-ac +++ /dev/null @@ -1,63 +0,0 @@ ---- ngrep.c.orig 2004-03-28 21:15:59.000000000 -0500 -+++ ngrep.c 2004-07-04 19:21:18.000000000 -0400 -@@ -999,40 +999,29 @@ - - { - struct passwd *pw = getpwnam(DROPPRIVS_USER); -- gid_t newgid = pw->pw_uid, oldgid = getegid(); -- uid_t newuid = pw->pw_gid, olduid = geteuid(); -- -- if (!olduid) -- setgroups(1, &newgid); -- -- if (newgid != oldgid) { --#if !defined(LINUX) -- setegid(newgid); -- if (setgid(newgid) == -1) --#else -- if (setregid(newgid, newgid) == -1) --#endif -- { -- perror("attempt to drop privileges failed"); -- clean_exit(-1); -- } -+ gid_t newgid = pw->pw_gid, oldgid = getegid(); -+ uid_t newuid = pw->pw_uid, olduid = geteuid(); -+ gid_t groups[2]; -+ -+ groups[0] = groups[1] = newgid; -+ if (setgroups(1, groups) == -1) -+ { -+ perror("attempt to set groups failed"); -+ clean_exit(-1); - } - -- if (newuid != olduid) { --#if !defined(LINUX) --#if !defined(MACOSX) -- seteuid(newuid); --#endif -- if (setuid(newuid) == -1) --#else -- if (setreuid(newuid, newuid) == -1) --#endif -- { -- perror("attempt to drop privileges failed"); -- clean_exit(-1); -- } -+ if (setgid(newgid) == -1) -+ { -+ perror("attempt to drop group privileges failed"); -+ clean_exit(-1); - } -- -+ -+ if (setuid(newuid) == -1) -+ { -+ perror("attempt to drop user privileges failed"); -+ clean_exit(-1); -+ } -+ - if ((newgid != oldgid && (setegid(oldgid) != -1 || getegid() != newgid)) || - (newuid != olduid && (seteuid(olduid) != -1 || geteuid() != newuid))) { - perror("attempt to drop privileges failed"); |