Update to 1.21. Changes:

- Fix memory leak caused by latcp -d & llogin -d
- Loads of protocol fixes and speed enhancements
  NOTE: There are known problems with DECserver 90L terminal servers
- Add better support for DS90L servers reverse LAT
- Fix REQID message in moprc so it works with more servers.

5 files changed, 42 insertions, 33 deletions

diff --git a/net/latd/Makefile b/net/latd/Makefile
index 1ad786bafa1..ae3a43ebd50 100644
--- a/net/latd/Makefile
+++ b/net/latd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 17:18:32 asau Exp $
+# $NetBSD: Makefile,v 1.12 2013/10/08 19:46:15 shattered Exp $
 #
 
-DISTNAME=	latd-1.18
+DISTNAME=	latd-1.21
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=linux-decnet/}
 
@@ -18,6 +18,6 @@ USE_LANGUAGES=	c c++
 CPPFLAGS+=	-DPREFIX="\"${PREFIX}\""
 
 EGDIR=		${PREFIX}/share/examples/latd
-CONF_FILES=	${EGDIR}/latd.conf ${PKG_SYSCONFDIR}/latd.conf
+CONF_FILES=	${EGDIR}/latd.conf.sample ${PKG_SYSCONFDIR}/latd.conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/latd/PLIST b/net/latd/PLIST
index e3261045bab..efecfd7f703 100644
--- a/net/latd/PLIST
+++ b/net/latd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:09:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/10/08 19:46:15 shattered Exp $
 bin/llogin
 man/man1/llogin.1
 man/man5/latd.conf.5
@@ -8,4 +8,4 @@ man/man8/moprc.8
 sbin/latcp
 sbin/latd
 sbin/moprc
-share/examples/latd/latd.conf
+share/examples/latd/latd.conf.sample
diff --git a/net/latd/distinfo b/net/latd/distinfo
index 80fd45f1e52..77d34baa2cd 100644
--- a/net/latd/distinfo
+++ b/net/latd/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.7 2011/11/25 22:14:17 joerg Exp $
+$NetBSD: distinfo,v 1.8 2013/10/08 19:46:15 shattered Exp $
 
-SHA1 (latd-1.18.tar.gz) = a7cecdb97507f485e726ea4c2fef0a59ad3adbae
-RMD160 (latd-1.18.tar.gz) = a0be3bd71b76c6a07c47fc2ad863526303d365bf
-Size (latd-1.18.tar.gz) = 233882 bytes
+SHA1 (latd-1.21.tar.gz) = 172e3f844cd7d1301426111f0f71dd70a3d149f7
+RMD160 (latd-1.21.tar.gz) = 9d19461578d206dfbd6aaa3d26a25de20ed76438
+Size (latd-1.21.tar.gz) = 241045 bytes
 SHA1 (patch-aa) = 418d4ba46aab3259af771673ccfde08274bee8af
-SHA1 (patch-ab) = 2576c94b699f15690ffeb2596a1d7d9292c67f9d
+SHA1 (patch-ab) = 861d49314a31688b9683dcfbf036207c7633bdaf
 SHA1 (patch-ac) = c078151ba47ef878937e9cf818a3d0ad6dd3be7b
 SHA1 (patch-ad) = d453bf076aa8368313530718095b77cafe1b554e
 SHA1 (patch-ae) = 931842733d2166c0fd29b5f0d0772c44f1d79fd3
 SHA1 (patch-af) = 3b2f723ec163d925dee42b7d6597f8219ebe22df
-SHA1 (patch-ag) = 46a4d98c15bfef8a1fa6dab04b23be3fa1f4b42c
+SHA1 (patch-ag) = 9db4cbd98d852c7adde7ebfda20871f76e0bd82a
 SHA1 (patch-circuit.cc) = 4f20d6247bcc450d6462554c01e09a2ffa989719
 SHA1 (patch-connection.h) = 2762cebe59c9e3af1fa1bd9d96cf923ad563c22d
 SHA1 (patch-llogin.cc) = 37e81f5df945c956169c70ce4f35b77734bce8a0
diff --git a/net/latd/patches/patch-ab b/net/latd/patches/patch-ab
index 39fe7dfadce..d7948baee95 100644
--- a/net/latd/patches/patch-ab
+++ b/net/latd/patches/patch-ab
@@ -1,32 +1,41 @@
-$NetBSD: patch-ab,v 1.3 2011/11/25 22:14:17 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2013/10/08 19:46:15 shattered Exp $
 
 --- interfaces-bpf.cc.orig	2003-03-17 09:32:30.000000000 +0000
 +++ interfaces-bpf.cc
-@@ -15,6 +15,7 @@
+@@ -15,17 +15,19 @@
      GNU General Public License for more details.
  ******************************************************************************/
  
+-#include <unistd.h>
+-#include <stdio.h>
+-#include <fcntl.h>
 +#include <assert.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <fcntl.h>
-@@ -25,6 +26,8 @@
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <sys/uio.h>
+ #include <errno.h>
++#include <fcntl.h>
++#include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
+ #include <syslog.h>
++#include <unistd.h>
+ #include <sys/ioctl.h>
+-#include <sys/types.h>
+-#include <sys/time.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
++#include <sys/types.h>
+ #include <sys/uio.h>
+-#include <assert.h>
  
  #include <net/if.h>
  #include <net/bpf.h>
-@@ -383,7 +386,11 @@ int BPFInterfaces::send_packet(int ifn, 
+@@ -384,7 +386,11 @@ int BPFInterfaces::send_packet(int ifn, 
    /* write this packet: */
    iov[0].iov_base = (char* )&ether_packet;
    iov[0].iov_len = sizeof(ether_packet);
 +#if defined(__DragonFly__)
-+  iov[1].iov_base = (char *)data;
+   iov[1].iov_base = (char *)data;
 +#else
-   iov[1].iov_base = data;
++  iov[1].iov_base = data;
 +#endif
    iov[1].iov_len = len;
    if (writev(_latd_bpf_fd, iov, 2) < 0) {
diff --git a/net/latd/patches/patch-ag b/net/latd/patches/patch-ag
index 5d2befe5751..bc0dd82e3fd 100644
--- a/net/latd/patches/patch-ag
+++ b/net/latd/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2011/11/25 22:14:17 joerg Exp $
+$NetBSD: patch-ag,v 1.3 2013/10/08 19:46:15 shattered Exp $
 
 --- services.h.orig	2002-10-14 14:33:46.000000000 +0000
 +++ services.h
-@@ -12,6 +12,8 @@
+@@ -13,6 +13,8 @@
      GNU General Public License for more details.
  ******************************************************************************/
  
@@ -11,12 +11,12 @@ $NetBSD: patch-ag,v 1.2 2011/11/25 22:14:17 joerg Exp $
  class LATServices
  {
   public:
-@@ -71,7 +73,7 @@ class LATServices
+@@ -75,7 +77,7 @@ class LATServices
        const std::string get_ident() { return ident; }
-       bool         is_available();
-       bool         remove_node(const std::string &node);
--      void         serviceinfo::list_service(std::ostrstream &output);
-+      void         list_service(std::ostrstream &output);
-       void         expire_nodes(time_t);
- 
-     private:
+       bool  is_available();
+       bool  remove_node(const std::string &node);
+-      void  serviceinfo::list_service(std::ostrstream &output);
++      void  list_service(std::ostrstream &output);
+       void  expire_nodes(time_t);
+       void  list_nodes(std::ostrstream &output);
+       bool  touch_dummy_node_respond_counter(const std::string &str_name);