diff options
| author | hubertf <hubertf> | 2003-10-07 19:35:34 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2003-10-07 19:35:34 +0000 |
| commit | ddf82bc899c18381dd317264b022c0641524801d (patch) | |
| tree | 86a5545ed034e33fdb03021a2d46cdbba8e9eb6b /net/nidentd | |
| parent | 9539775becab797cfdefc22fdc474fb4d37b10e6 (diff) | |
| download | pkgsrc-ddf82bc899c18381dd317264b022c0641524801d.tar.gz | |
Bump to 1.0nb1: Fix bug in handling of masquerading.
Original patch by Simas Mockevicius <symka@vejas.lt>
Diffstat (limited to 'net/nidentd')
| -rw-r--r-- | net/nidentd/Makefile | 3 | ||||
| -rw-r--r-- | net/nidentd/distinfo | 4 | ||||
| -rw-r--r-- | net/nidentd/patches/patch-aa | 23 |
3 files changed, 19 insertions, 11 deletions
diff --git a/net/nidentd/Makefile b/net/nidentd/Makefile index 39b8d62c1b4..bbe7d3b98b2 100644 --- a/net/nidentd/Makefile +++ b/net/nidentd/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:51:28 grant Exp $ +# $NetBSD: Makefile,v 1.7 2003/10/07 19:35:34 hubertf Exp $ # DISTNAME= nidentd-1.0 +PKGREVISION= 1 CATEGORIES= net sysutils MASTER_SITES= ftp://ftp.tgr.lubin.edu.pl/pub/NetBSD/nidentd/ EXTRACT_SUFX= .tgz diff --git a/net/nidentd/distinfo b/net/nidentd/distinfo index d7f6db79ed7..2b849584193 100644 --- a/net/nidentd/distinfo +++ b/net/nidentd/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/05/05 23:51:27 hubertf Exp $ +$NetBSD: distinfo,v 1.4 2003/10/07 19:35:34 hubertf Exp $ SHA1 (nidentd-1.0.tgz) = 5ad5f5f27514a9b647f00bdd8f132203c29987be Size (nidentd-1.0.tgz) = 1831 bytes -SHA1 (patch-aa) = 3fed5dab21289532f36f44d2eb4594f241eb0130 +SHA1 (patch-aa) = af6041e9ce57c86fe09d085bcf6349cf1d3939ac diff --git a/net/nidentd/patches/patch-aa b/net/nidentd/patches/patch-aa index 6d6da9f2e03..abcc7112f94 100644 --- a/net/nidentd/patches/patch-aa +++ b/net/nidentd/patches/patch-aa @@ -1,17 +1,24 @@ -$NetBSD: patch-aa,v 1.3 2002/05/05 23:51:28 hubertf Exp $ +$NetBSD: patch-aa,v 1.4 2003/10/07 19:35:34 hubertf Exp $ ---- nidentd.orig Mon May 6 00:37:54 2002 +--- nidentd.orig Sat May 4 14:53:01 2002 +++ nidentd -@@ -1,9 +1,9 @@ - #!/bin/sh +@@ -2,8 +2,8 @@ --v_lsof="/usr/pkg/sbin/lsof -P -n -Di" -+v_lsof="@LOCALBASE@/sbin/lsof -P -n -Di" + v_lsof="/usr/pkg/sbin/lsof -P -n -Di" v_ipnat="/usr/sbin/ipnat -l" -v_nat_conf="/usr/local/etc/nidentd.nat" -v_fake_conf="/usr/local/etc/nidentd.fake" -+v_nat_conf="@LOCALBASE@/etc/nidentd.nat" -+v_fake_conf="@LOCALBASE@/etc/nidentd.fake" ++v_nat_conf="/usr/pkg/etc/nidentd.nat" ++v_fake_conf="/usr/pkg/etc/nidentd.fake" # Protocol independent +@@ -40,7 +40,7 @@ if [ -n $qlport ] && [ -n $qrport ] && [ + if [ $qlport -eq $lport ] && [ $qrport -eq $rport ] + then + masqip=`$v_ipnat -l | grep -e "MAP" -e " $qlport " -e " $qrport" | awk '{ print $2 }' | tr -c -d '.1234567890'` +- hostn=`grep ^$masqip $v_nat_conf | awk -F: '{ print $2 }'` ++ hostn=`grep ^"$masqip:" $v_nat_conf | awk -F: '{ print $2 }'` + if [ $hostn ] + then + printf "$qlport , $qrport : USERID : UNIX : $hostn\r\n" |