[pkgsrc/trunk]: pkgsrc/net/nidentd Bump to 1.0nb1: Fix bug in handling of mas...

[hubertf <hubertf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eb388cc002eb
branches:  trunk
changeset: 462651:eb388cc002eb
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Tue Oct 07 19:35:34 2003 +0000

description:
Bump to 1.0nb1: Fix bug in handling of masquerading.
Original patch by Simas Mockevicius <symka%vejas.lt@localhost>

diffstat:

 net/nidentd/Makefile         |   3 ++-
 net/nidentd/distinfo         |   4 ++--
 net/nidentd/patches/patch-aa |  23 +++++++++++++++--------
 3 files changed, 19 insertions(+), 11 deletions(-)

diffs (60 lines):

diff -r 9852f52a2a0a -r eb388cc002eb net/nidentd/Makefile
--- a/net/nidentd/Makefile      Tue Oct 07 18:30:54 2003 +0000
+++ b/net/nidentd/Makefile      Tue Oct 07 19:35:34 2003 +0000
@@ -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 -r 9852f52a2a0a -r eb388cc002eb net/nidentd/distinfo
--- a/net/nidentd/distinfo      Tue Oct 07 18:30:54 2003 +0000
+++ b/net/nidentd/distinfo      Tue Oct 07 19:35:34 2003 +0000
@@ -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 -r 9852f52a2a0a -r eb388cc002eb net/nidentd/patches/patch-aa
--- a/net/nidentd/patches/patch-aa      Tue Oct 07 18:30:54 2003 +0000
+++ b/net/nidentd/patches/patch-aa      Tue Oct 07 19:35:34 2003 +0000
@@ -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"