[pkgsrc/trunk]: pkgsrc/net/nidentd * Some fixes to work properly with NAT/masq

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/46bd6c625c5f
branches:  trunk
changeset: 482750:46bd6c625c5f
user:      symka <symka%pkgsrc.org@localhost>
date:      Tue Nov 02 18:40:23 2004 +0000

description:
* Some fixes to work properly with NAT/masq
* Bumped pkgrevision to 2
* Maintainer of this package from now on me - symka@

Ok'eyd by hubertf.

diffstat:

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

diffs (60 lines):

diff -r e546b5505c69 -r 46bd6c625c5f net/nidentd/Makefile
--- a/net/nidentd/Makefile      Tue Nov 02 17:52:35 2004 +0000
+++ b/net/nidentd/Makefile      Tue Nov 02 18:40:23 2004 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2003/10/07 19:35:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2004/11/02 18:40:23 symka Exp $
 #
 
 DISTNAME=      nidentd-1.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net sysutils
 MASTER_SITES=  ftp://ftp.tgr.lubin.edu.pl/pub/NetBSD/nidentd/
 EXTRACT_SUFX=  .tgz
 
-MAINTAINER=    hubertf%NetBSD.org@localhost
+MAINTAINER=    symka%NetBSD.org@localhost
 COMMENT=       identd that supports IPv4, IPv6, NAT, fake and random
 
 DEPENDS+=      lsof>=4.61:../../sysutils/lsof
diff -r e546b5505c69 -r 46bd6c625c5f net/nidentd/distinfo
--- a/net/nidentd/distinfo      Tue Nov 02 17:52:35 2004 +0000
+++ b/net/nidentd/distinfo      Tue Nov 02 18:40:23 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/10/07 19:35:34 hubertf Exp $
+$NetBSD: distinfo,v 1.5 2004/11/02 18:40:23 symka Exp $
 
 SHA1 (nidentd-1.0.tgz) = 5ad5f5f27514a9b647f00bdd8f132203c29987be
 Size (nidentd-1.0.tgz) = 1831 bytes
-SHA1 (patch-aa) = af6041e9ce57c86fe09d085bcf6349cf1d3939ac
+SHA1 (patch-aa) = f55a84def1d83822dbf5467deb6a7b0ce56a0bed
diff -r e546b5505c69 -r 46bd6c625c5f net/nidentd/patches/patch-aa
--- a/net/nidentd/patches/patch-aa      Tue Nov 02 17:52:35 2004 +0000
+++ b/net/nidentd/patches/patch-aa      Tue Nov 02 18:40:23 2004 +0000
@@ -1,7 +1,5 @@
-$NetBSD: patch-aa,v 1.4 2003/10/07 19:35:34 hubertf Exp $
-
---- nidentd.orig       Sat May  4 14:53:01 2002
-+++ nidentd
+--- nidentd.orig       2002-05-04 14:53:01.000000000 +0200
++++ nidentd    2004-11-02 20:12:43.000000000 +0200
 @@ -2,8 +2,8 @@
  
  v_lsof="/usr/pkg/sbin/lsof -P -n -Di"
@@ -13,11 +11,13 @@
  
  # Protocol independent
  
-@@ -40,7 +40,7 @@ if [ -n $qlport ] && [ -n $qrport ] && [
+@@ -39,8 +39,8 @@
+   then
      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'`
+-              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 }'`
++              masqip=`$v_ipnat -l | grep "MAP" | grep " $qlport " | grep " $qrport" | awk '{ print $2 }' | tr -c -d '.1234567890'`
 +              hostn=`grep ^"$masqip:" $v_nat_conf | awk -F: '{ print $2 }'`
          if [ $hostn ]
            then