CVS commit: pkgsrc/net/xl2tpd

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   christos
Date:           Sun Nov  1 17:52:34 UTC 2026

Modified Files:
        pkgsrc/net/xl2tpd: distinfo
        pkgsrc/net/xl2tpd/patches: patch-xl2tpd.c

Log Message:
open the control fd with O_RDWR so that select does not return immediately,
adjusting to the new NetBSD behavior


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/xl2tpd/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/xl2tpd/patches/patch-xl2tpd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/xl2tpd/distinfo
diff -u pkgsrc/net/xl2tpd/distinfo:1.12 pkgsrc/net/xl2tpd/distinfo:1.13
--- pkgsrc/net/xl2tpd/distinfo:1.12     Tue Oct 26 07:07:12 2021
+++ pkgsrc/net/xl2tpd/distinfo  Sun Nov  1 12:52:34 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:07:12 nia Exp $
+$NetBSD: distinfo,v 1.13 2026/11/01 17:52:34 christos Exp $
 
 BLAKE2s (xl2tpd-20171013.zip) = 6df247633b9b7323b48d021970f41b91314c6e3dcdc206c880536eea5889e68b
 SHA512 (xl2tpd-20171013.zip) = 95868ebcea53f55ae0c3edae6b0a5904d8aa13a046b8e0c0eb06eb1eb656ee16245aa002694dfb080e1295ceea27bc6c147d4ef7702b038925bcfdac522d7e91
@@ -12,4 +12,4 @@ SHA1 (patch-misc.h) = faa5bf97b2fbc853e8
 SHA1 (patch-network.c) = 5d5a9cce0f780a24489caebc25d87a09d937a084
 SHA1 (patch-osport.h) = 370d7b5c617022d4ca6d87abcd595327dcfd0cfe
 SHA1 (patch-pty.c) = 3284ab1ea19d3ccce459bdb4742a7f33e8e557fe
-SHA1 (patch-xl2tpd.c) = 9e94b1b0e6f6cd99c11353d1d3df37e307d6ac39
+SHA1 (patch-xl2tpd.c) = afc506ef428584b4f500dbcd33644643bd2bee49

Index: pkgsrc/net/xl2tpd/patches/patch-xl2tpd.c
diff -u pkgsrc/net/xl2tpd/patches/patch-xl2tpd.c:1.3 pkgsrc/net/xl2tpd/patches/patch-xl2tpd.c:1.4
--- pkgsrc/net/xl2tpd/patches/patch-xl2tpd.c:1.3        Fri Oct 13 13:24:05 2017
+++ pkgsrc/net/xl2tpd/patches/patch-xl2tpd.c    Sun Nov  1 12:52:34 2026
@@ -1,9 +1,10 @@
-$NetBSD: patch-xl2tpd.c,v 1.3 2017/10/13 17:24:05 christos Exp $
+$NetBSD: patch-xl2tpd.c,v 1.4 2026/11/01 17:52:34 christos Exp $
 
-Expose functions
+1. Expose functions
+2. Open with O_RDWR instead of O_RDONLY so that select blocks.
 
 --- xl2tpd.c.orig      2017-08-02 13:46:06.000000000 -0400
-+++ xl2tpd.c   2017-10-13 12:50:10.384619299 -0400
++++ xl2tpd.c   2026-11-01 12:44:14.097909457 -0500
 @@ -20,6 +20,7 @@
  #define _DEFAULT_SOURCE
  #define _XOPEN_SOURCE_EXTENDED        1
@@ -12,3 +13,21 @@ Expose functions
  
  #include <stdlib.h>
  #include <sys/types.h>
+@@ -1802,7 +1803,7 @@
+ 
+ static void open_controlfd()
+ {
+-    control_fd = open (gconfig.controlfile, O_RDONLY | O_NONBLOCK, 0600);
++    control_fd = open (gconfig.controlfile, O_RDWR | O_NONBLOCK, 0600);
+     if (control_fd < 0)
+     {
+         l2tp_log (LOG_CRIT, "%s: Unable to open %s for reading.\n",
+@@ -1811,7 +1812,7 @@
+     }
+ 
+     /* turn off O_NONBLOCK */
+-    if(fcntl(control_fd, F_SETFL, O_RDONLY)==-1) {
++    if(fcntl(control_fd, F_SETFL, O_RDWR)==-1) {
+         l2tp_log(LOG_CRIT, "Can not turn off nonblocking mode for controlfd: %s\n",
+                 strerror(errno));
+         exit(1);