oidentd-2.0.3 update for SUBDIR

[Jolan Luff <jolan@encryptedemail.net>]

patch for oidentd MASTER_SITES. also includes the patch that fixes the
-f option.


-jolan



08:36am[root@norm]/usr/ports/net# diff -uNr --exclude=CVS oidentd.orig/
oidentd/
diff -uNr --exclude=CVS oidentd.orig/Makefile oidentd/Makefile
--- oidentd.orig/Makefile       Mon May 13 04:15:47 2002
+++ oidentd/Makefile    Mon May 13 04:18:58 2002
@@ -3,8 +3,7 @@
 COMMENT=       "ident daemon with custom responses and NAT support"
 DISTNAME=      oidentd-2.0.3
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ojnk
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ojnk/}

 HOMEPAGE=      http://ojnk.sourceforge.net

diff -uNr --exclude=CVS oidentd.orig/patches/patch-oidentd_openbsd30_c
oidentd/patches/patch-oidentd_openbsd30_c
--- oidentd.orig/patches/patch-oidentd_openbsd30_c      Wed Dec 31
18:00:00 1969
+++ oidentd/patches/patch-oidentd_openbsd30_c   Sat Apr 20 15:43:13 2002
@@ -0,0 +1,41 @@
+--- src/kernel/openbsd30.c.orig        Sat Dec 29 10:30:25 2001
++++ src/kernel/openbsd30.c     Sat Apr 20 12:47:49 2002
+@@ -42,6 +42,7 @@
+ #include <netinet/ip_var.h>
+ #include <netinet/tcp_timer.h>
+ #include <netinet/tcp_var.h>
++#include <arpa/inet.h>
+
+ #ifdef MASQ_SUPPORT
+ #     include <sys/ioctl.h>
+@@ -144,12 +145,12 @@
+       sin_setv4(natlook.rsaddr.v4.s_addr, &ss);
+
+       if (opt_enabled(FORWARD)) {
+-              ret = fwd_request(sock, fport, lport, natlook.rsaddr.v4.s_addr, &ss);
++              ret = fwd_request(sock, ntohs(fport), ntohs(lport), natlook.rsaddr.v4.s_addr, &ss);
+               if (ret == 0)
+                       return(0);
+
+               debug("Forward to %s (%d %d) failed.",
+-                              inet_ntoa(natlook.rsaddr.v4.s_addr), lport, rsport);
++                              inet_ntoa(natlook.rsaddr.v4), ntohs(lport), ntohs(natlook.rsport));
+       }
+
+       ret = find_masq_entry(&ss, user, sizeof(user), os, sizeof(os));
+@@ -157,13 +158,13 @@
+               char ipbuf[MAX_IPLEN];
+
+               sockprintf(sock, "%d , %d : USERID : %s : %s\r\n",
+-                              lport, fport, os, user);
++                              ntohs(lport), ntohs(fport), os, user);
+
+               get_ip(faddr, ipbuf, sizeof(ipbuf));
+
+               o_log(NORMAL,
+                               "[%s] (NAT) Successful lookup: %d , %d : %s",
+-                              ipbuf, lport, fport, user);
++                              ipbuf, ntohs(lport), ntohs(fport), user);
+
+               return (0);
+       }