[pkgsrc/trunk]: pkgsrc/net/xl2tpd Sync with latest.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/baecded5cc63
branches:  trunk
changeset: 370240:baecded5cc63
user:      christos <christos%pkgsrc.org@localhost>
date:      Fri Oct 13 17:24:05 2017 +0000

description:
Sync with latest.

diffstat:

 net/xl2tpd/Makefile                |    6 +-
 net/xl2tpd/PLIST                   |    3 +-
 net/xl2tpd/distinfo                |   29 +++--
 net/xl2tpd/patches/patch-Makefile  |   10 +-
 net/xl2tpd/patches/patch-control.c |   62 +------------
 net/xl2tpd/patches/patch-l2tp.h    |   19 +---
 net/xl2tpd/patches/patch-md5.c     |   16 +--
 net/xl2tpd/patches/patch-misc.c    |   10 +-
 net/xl2tpd/patches/patch-misc.h    |    8 +-
 net/xl2tpd/patches/patch-network.c |  177 ++----------------------------------
 net/xl2tpd/patches/patch-osport.h  |   15 +++
 net/xl2tpd/patches/patch-pty.c     |   27 ++--
 net/xl2tpd/patches/patch-xl2tpd.c  |   12 +-
 13 files changed, 91 insertions(+), 303 deletions(-)

diffs (truncated from 601 to 300 lines):

diff -r 50273bbbc229 -r baecded5cc63 net/xl2tpd/Makefile
--- a/net/xl2tpd/Makefile       Fri Oct 13 17:19:04 2017 +0000
+++ b/net/xl2tpd/Makefile       Fri Oct 13 17:24:05 2017 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2015/06/01 14:01:21 hauke Exp $
+# $NetBSD: Makefile,v 1.4 2017/10/13 17:24:05 christos Exp $
 #
 
-DISTNAME=              xl2tpd-20140214
+DISTNAME=              xl2tpd-20171013
 CATEGORIES=            net
-PKGREVISION=           1
+#PKGREVISION=          1
 MASTER_SITES=          -https://github.com/xelerance/xl2tpd/archive/master.zip
 EXTRACT_SUFX=          .zip
 WRKSRC=                        ${WRKDIR}/xl2tpd-master
diff -r 50273bbbc229 -r baecded5cc63 net/xl2tpd/PLIST
--- a/net/xl2tpd/PLIST  Fri Oct 13 17:19:04 2017 +0000
+++ b/net/xl2tpd/PLIST  Fri Oct 13 17:24:05 2017 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2015/06/01 14:01:21 hauke Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/10/13 17:24:05 christos Exp $
 bin/pfc
 man/man1/pfc.1
 man/man5/l2tp-secrets.5
 man/man5/xl2tpd.conf.5
 man/man8/xl2tpd.8
+man/man8/xl2tpd-control.8
 sbin/xl2tpd
 sbin/xl2tpd-control
 share/examples/rc.d/xl2tpd
diff -r 50273bbbc229 -r baecded5cc63 net/xl2tpd/distinfo
--- a/net/xl2tpd/distinfo       Fri Oct 13 17:19:04 2017 +0000
+++ b/net/xl2tpd/distinfo       Fri Oct 13 17:24:05 2017 +0000
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.9 2017/08/19 00:27:13 jlam Exp $
+$NetBSD: distinfo,v 1.10 2017/10/13 17:24:05 christos Exp $
 
-SHA1 (xl2tpd-20140214.zip) = 6d5d38674b6671ef1cd1880a548645ae08725a9e
-RMD160 (xl2tpd-20140214.zip) = 684f3d1d07ce3b0629123f056f8cf3f6d67c41f3
-SHA512 (xl2tpd-20140214.zip) = dc3425caebf5851909912c0e53cc699b725700ff0ec6285ab2b8fc3c72e4ea862810c8c1c9606ff89217c18e7ebf518c52dedb4b6154eb3b6d25eb7fadad0802
-Size (xl2tpd-20140214.zip) = 591764 bytes
-SHA1 (patch-Makefile) = 1e5ba70de0510b18bb0d811970a1cb4576b802a2
-SHA1 (patch-control.c) = 3b1aa772be07bdc1312d94c8e0b1543086b6fb7f
-SHA1 (patch-l2tp.h) = d068d47170da6a1a3d960ef6f7a7027c10c8820f
-SHA1 (patch-md5.c) = cc100db8b9314a86a96464cde4df78c387b56e9a
-SHA1 (patch-misc.c) = 8c1b0bff81af1f5718cbf1d02e4f47fcad14c9a9
-SHA1 (patch-misc.h) = dd7a42bee5a16cc583bfcfc31b1fc589d39515ab
-SHA1 (patch-network.c) = f5aae9874b7024eb339b439b5bd0354dd4f320fc
-SHA1 (patch-pty.c) = ade58a4e34f0977ebaba713b0be74ed943047a13
-SHA1 (patch-xl2tpd.c) = b5ff4245b380d9aff480f9dbe961c92faf691b3d
+SHA1 (xl2tpd-20171013.zip) = 6495031d98b8d803503e47ca20a1902fb116779c
+RMD160 (xl2tpd-20171013.zip) = 4e6cbe6fd9792e14e4bc33ad7daeef3e917eda1b
+SHA512 (xl2tpd-20171013.zip) = 95868ebcea53f55ae0c3edae6b0a5904d8aa13a046b8e0c0eb06eb1eb656ee16245aa002694dfb080e1295ceea27bc6c147d4ef7702b038925bcfdac522d7e91
+Size (xl2tpd-20171013.zip) = 548262 bytes
+SHA1 (patch-Makefile) = 4aca35c2abef9936dbc5d93c2bbb9a98d7ce9b5e
+SHA1 (patch-control.c) = d827e19630fc5c4a8c4e4159d1cc89d07f49e540
+SHA1 (patch-l2tp.h) = 7289337a0b8c72fff095df5be349ae8e60357a99
+SHA1 (patch-md5.c) = 70316f37538d525693f243f3c415ea141aa6bb4e
+SHA1 (patch-misc.c) = f357e60438211a8c94789712cb55c7fc690bce1a
+SHA1 (patch-misc.h) = faa5bf97b2fbc853e867177686eb324e7341d341
+SHA1 (patch-network.c) = 5d5a9cce0f780a24489caebc25d87a09d937a084
+SHA1 (patch-osport.h) = 370d7b5c617022d4ca6d87abcd595327dcfd0cfe
+SHA1 (patch-pty.c) = 3284ab1ea19d3ccce459bdb4742a7f33e8e557fe
+SHA1 (patch-xl2tpd.c) = 9e94b1b0e6f6cd99c11353d1d3df37e307d6ac39
diff -r 50273bbbc229 -r baecded5cc63 net/xl2tpd/patches/patch-Makefile
--- a/net/xl2tpd/patches/patch-Makefile Fri Oct 13 17:19:04 2017 +0000
+++ b/net/xl2tpd/patches/patch-Makefile Fri Oct 13 17:24:05 2017 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.2 2017/08/19 00:27:13 jlam Exp $
+$NetBSD: patch-Makefile,v 1.3 2017/10/13 17:24:05 christos Exp $
 
 Default to NetBSD
 Fix man directory
 
---- Makefile.orig      2013-06-17 06:17:24.000000000 -0400
-+++ Makefile   2013-06-26 14:26:45.000000000 -0400
+--- Makefile.orig      2017-08-02 13:46:06.000000000 -0400
++++ Makefile   2017-10-13 12:46:33.893556318 -0400
 @@ -54,7 +54,7 @@
  #
  #KERNELSRC=/lib/modules/`uname -r`/build/
@@ -23,7 +23,7 @@
  #
  #
  # Uncomment the next line for FreeBSD
-@@ -83,6 +83,11 @@
+@@ -89,6 +89,11 @@
  #
  #OSFLAGS?= -DOPENBSD
  #LDLIBS?= -lutil
@@ -35,7 +35,7 @@
  
  # Feature flags
  #
-@@ -103,7 +108,7 @@
+@@ -109,7 +114,7 @@
  PREFIX?=/usr/local
  SBINDIR?=$(DESTDIR)${PREFIX}/sbin
  BINDIR?=$(DESTDIR)${PREFIX}/bin
diff -r 50273bbbc229 -r baecded5cc63 net/xl2tpd/patches/patch-control.c
--- a/net/xl2tpd/patches/patch-control.c        Fri Oct 13 17:19:04 2017 +0000
+++ b/net/xl2tpd/patches/patch-control.c        Fri Oct 13 17:24:05 2017 +0000
@@ -1,58 +1,13 @@
-$NetBSD: patch-control.c,v 1.2 2013/07/18 12:06:39 joerg Exp $
+$NetBSD: patch-control.c,v 1.3 2017/10/13 17:24:05 christos Exp $
 
 Remove static from inline; each inlined copy might have its own buffer and
 this is not want you want if you define it static. In this case it does not
 matter, since it is only 4K and we don't return it, so don't try to play
 around with saving stack space for no good reason.
 
---- control.c.orig     2013-06-17 10:17:24.000000000 +0000
-+++ control.c
-@@ -75,7 +75,7 @@ struct buffer *new_outgoing (struct tunn
-     return tmp;
- }
- 
--inline void recycle_outgoing (struct buffer *buf, struct sockaddr_in peer)
-+void recycle_outgoing (struct buffer *buf, struct sockaddr_in peer)
- {
-     /* 
-      * This should only be used for ZLB's!
-@@ -1139,7 +1139,7 @@ int control_finish (struct tunnel *t, st
-     return 0;
- }
- 
--inline int check_control (const struct buffer *buf, struct tunnel *t,
-+static inline int check_control (const struct buffer *buf, struct tunnel *t,
-                           struct call *c)
- {
-     /*
-@@ -1275,7 +1275,7 @@ inline int check_control (const struct b
-     return 0;
- }
- 
--inline int check_payload (struct buffer *buf, struct tunnel *t,
-+static inline int check_payload (struct buffer *buf, struct tunnel *t,
-                           struct call *c)
- {
-     /*
-@@ -1381,7 +1381,7 @@ inline int check_payload (struct buffer 
- #endif
-     return 0;
- }
--inline int expand_payload (struct buffer *buf, struct tunnel *t,
-+static inline int expand_payload (struct buffer *buf, struct tunnel *t,
-                            struct call *c)
- {
-     /*
-@@ -1561,7 +1561,7 @@ void send_zlb (void *data)
-     toss (buf);
- }
- 
--inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c,
-+static inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c,
-                          int convert)
- {
-     /*
-@@ -1571,7 +1571,7 @@ inline int write_packet (struct buffer *
+--- control.c.orig     2017-08-02 13:46:06.000000000 -0400
++++ control.c  2017-10-13 12:46:33.920249976 -0400
+@@ -1600,7 +1600,7 @@
      int x;
      unsigned char e;
      int err;
@@ -61,12 +16,3 @@
      int pos = 0;
  
      if (c->fd < 0)
-@@ -1739,7 +1739,7 @@ void handle_special (struct buffer *buf,
-     }
- }
- 
--inline int handle_packet (struct buffer *buf, struct tunnel *t,
-+int handle_packet (struct buffer *buf, struct tunnel *t,
-                           struct call *c)
- {
-     int res;
diff -r 50273bbbc229 -r baecded5cc63 net/xl2tpd/patches/patch-l2tp.h
--- a/net/xl2tpd/patches/patch-l2tp.h   Fri Oct 13 17:19:04 2017 +0000
+++ b/net/xl2tpd/patches/patch-l2tp.h   Fri Oct 13 17:24:05 2017 +0000
@@ -1,11 +1,10 @@
-$NetBSD: patch-l2tp.h,v 1.2 2013/07/12 19:06:31 christos Exp $
+$NetBSD: patch-l2tp.h,v 1.3 2017/10/13 17:24:05 christos Exp $
 
 Include common.h first since it typedefs things other headers need
-Conditionalize in_pktinfo
 
---- l2tp.h.orig        2013-06-17 06:17:24.000000000 -0400
-+++ l2tp.h     2013-07-12 15:00:53.000000000 -0400
-@@ -28,13 +28,13 @@
+--- l2tp.h.orig        2017-08-02 13:46:06.000000000 -0400
++++ l2tp.h     2017-10-13 12:46:33.946695069 -0400
+@@ -30,13 +30,13 @@
  #endif
  #include "osport.h"
  #include "scheduler.h"
@@ -20,13 +19,3 @@
  #include "ipsecmast.h"
  
  #define CONTROL_PIPE "/var/run/xl2tpd/l2tp-control"
-@@ -172,7 +172,9 @@
-     struct call *self;
-     struct lns *lns;            /* LNS that owns us */
-     struct lac *lac;            /* LAC that owns us */
-+#ifdef IP_PKTINFO
-     struct in_pktinfo my_addr;  /* Address of my endpoint */
-+#endif
- };
- 
- struct tunnel_list
diff -r 50273bbbc229 -r baecded5cc63 net/xl2tpd/patches/patch-md5.c
--- a/net/xl2tpd/patches/patch-md5.c    Fri Oct 13 17:19:04 2017 +0000
+++ b/net/xl2tpd/patches/patch-md5.c    Fri Oct 13 17:24:05 2017 +0000
@@ -1,10 +1,9 @@
-$NetBSD: patch-md5.c,v 1.2 2013/07/12 19:06:31 christos Exp $
+$NetBSD: patch-md5.c,v 1.3 2017/10/13 17:24:05 christos Exp $
 
 Include endian.h for NetBSD
-memset the right size, not just the first sizeof(ptr) bits.
 
---- md5.c.orig 2013-06-17 06:17:24.000000000 -0400
-+++ md5.c      2013-07-12 14:52:02.000000000 -0400
+--- md5.c.orig 2017-08-02 13:46:06.000000000 -0400
++++ md5.c      2017-10-13 12:46:33.972632069 -0400
 @@ -7,6 +7,8 @@
  # include <endian.h>
  #elif defined(SOLARIS)
@@ -14,12 +13,3 @@
  #endif
  #if __BYTE_ORDER == __BIG_ENDIAN
  #define HIGHFIRST 1
-@@ -166,7 +168,7 @@
-     MD5Transform (ctx->buf, (uint32 *) ctx->in);
-     byteReverse ((unsigned char *) ctx->buf, 4);
-     memcpy (digest, ctx->buf, 16);
--    memset (ctx, 0, sizeof (ctx));      /* In case it's sensitive */
-+    memset (ctx, 0, sizeof (*ctx));      /* In case it's sensitive */
- }
- 
- #ifndef ASM_MD5
diff -r 50273bbbc229 -r baecded5cc63 net/xl2tpd/patches/patch-misc.c
--- a/net/xl2tpd/patches/patch-misc.c   Fri Oct 13 17:19:04 2017 +0000
+++ b/net/xl2tpd/patches/patch-misc.c   Fri Oct 13 17:24:05 2017 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-misc.c,v 1.1 2013/07/12 19:06:31 christos Exp $
+$NetBSD: patch-misc.c,v 1.2 2017/10/13 17:24:05 christos Exp $
 
 Declare inline in a separate file.
 
---- misc.c.orig        2013-06-17 06:17:24.000000000 -0400
-+++ misc.c     2013-07-12 14:58:32.000000000 -0400
-@@ -170,33 +170,6 @@
+--- misc.c.orig        2017-08-02 13:46:06.000000000 -0400
++++ misc.c     2017-10-13 12:51:24.225866762 -0400
+@@ -175,33 +175,6 @@
      printf ("}\n");
  }
  
--inline void swaps (void *buf_v, int len)
+-void swaps (void *buf_v, int len)
 -{
 -#ifdef __alpha
 -    /* Reverse byte order alpha is little endian so lest save a step.
diff -r 50273bbbc229 -r baecded5cc63 net/xl2tpd/patches/patch-misc.h
--- a/net/xl2tpd/patches/patch-misc.h   Fri Oct 13 17:19:04 2017 +0000
+++ b/net/xl2tpd/patches/patch-misc.h   Fri Oct 13 17:24:05 2017 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-misc.h,v 1.1 2013/07/12 19:06:31 christos Exp $
+$NetBSD: patch-misc.h,v 1.2 2017/10/13 17:24:05 christos Exp $
 
 Portable inlines are in header files.
 
---- misc.h.orig        2013-06-17 06:17:24.000000000 -0400
-+++ misc.h     2013-07-12 14:58:05.000000000 -0400
+--- misc.h.orig        2017-08-02 13:46:06.000000000 -0400
++++ misc.h     2017-10-13 12:49:29.042331434 -0400
 @@ -65,7 +65,6 @@
  extern struct buffer *new_buf (int);
  extern void udppush_handler (int);
  extern int addfcs (struct buffer *buf);
--extern inline void swaps (void *, int);
+-extern void swaps (void *, int);
  extern void do_packet_dump (struct buffer *);
  extern void status (const char *fmt, ...);
  extern void status_handler (int signal);
diff -r 50273bbbc229 -r baecded5cc63 net/xl2tpd/patches/patch-network.c
--- a/net/xl2tpd/patches/patch-network.c        Fri Oct 13 17:19:04 2017 +0000
+++ b/net/xl2tpd/patches/patch-network.c        Fri Oct 13 17:24:05 2017 +0000
@@ -1,170 +1,15 @@
-$NetBSD: patch-network.c,v 1.4 2015/02/19 22:27:59 joerg Exp $
+$NetBSD: patch-network.c,v 1.5 2017/10/13 17:24:05 christos Exp $
 
-Handle not having IP_PKTINFO
-Handle not having SO_NO_CHECK
-Don't set control buf if controllen == 0
-Avoid pointer aliasing issue and fix test that was done in the wrong
-byte order
+Argument to setsockopt should be int not long