CVS commit: pkgsrc/x11/x11vnc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr  8 12:49:57 UTC 2026

Modified Files:
        pkgsrc/x11/x11vnc: Makefile distinfo
Added Files:
        pkgsrc/x11/x11vnc/patches: patch-src_unixpw.c
Removed Files:
        pkgsrc/x11/x11vnc/patches: patch-x11vnc_unixpw.c

Log Message:
x11vnc: fix build on -current

while here, rename patch so pkglint is happy


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/x11/x11vnc/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/x11vnc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/x11vnc/patches/patch-src_unixpw.c
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/x11vnc/patches/patch-x11vnc_unixpw.c

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

Modified files:

Index: pkgsrc/x11/x11vnc/Makefile
diff -u pkgsrc/x11/x11vnc/Makefile:1.104 pkgsrc/x11/x11vnc/Makefile:1.105
--- pkgsrc/x11/x11vnc/Makefile:1.104    Fri Feb  6 10:06:20 2026
+++ pkgsrc/x11/x11vnc/Makefile  Wed Apr  8 12:49:57 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2026/02/06 10:06:20 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.105 2026/04/08 12:49:57 wiz Exp $
 
 DISTNAME=      x11vnc-0.9.17
 PKGREVISION=   3
@@ -15,6 +14,8 @@ LICENSE=      gnu-gpl-v2
 USE_TOOLS+=    autoconf automake autoreconf gmake pkg-config
 GNU_CONFIGURE= yes
 
+CFLAGS+=       -Wno-implicit-function-declaration
+
 .include "options.mk"
 
 pre-configure:

Index: pkgsrc/x11/x11vnc/distinfo
diff -u pkgsrc/x11/x11vnc/distinfo:1.26 pkgsrc/x11/x11vnc/distinfo:1.27
--- pkgsrc/x11/x11vnc/distinfo:1.26     Sat May  3 16:51:15 2025
+++ pkgsrc/x11/x11vnc/distinfo  Wed Apr  8 12:49:57 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2025/05/03 16:51:15 nia Exp $
+$NetBSD: distinfo,v 1.27 2026/04/08 12:49:57 wiz Exp $
 
 BLAKE2s (x11vnc-0.9.17.tar.gz) = afca0d47d38c54bfd38a08140191248c9ed3b48f0a19a80f668a52a0e7605582
 SHA512 (x11vnc-0.9.17.tar.gz) = 687c41e03cca43dbca6ffdeb40960dddfba54ba00cf890f89f63fd66b9559a4c09602f84c1d4b7ffd7ac58818b90893013925d94a45a6feb83ab8cf7a02c1fe8
 Size (x11vnc-0.9.17.tar.gz) = 1691520 bytes
 SHA1 (patch-configure.ac) = 8ec2a6c8727614aacec4fb18340b16a215902ca5
 SHA1 (patch-src_uinput.c) = 37976b4bfe07535a8b183496e384456aa11bf0bf
-SHA1 (patch-x11vnc_unixpw.c) = bb611f4b307a54ef2898de635acde59da9102074
+SHA1 (patch-src_unixpw.c) = bb611f4b307a54ef2898de635acde59da9102074

Added files:

Index: pkgsrc/x11/x11vnc/patches/patch-src_unixpw.c
diff -u /dev/null pkgsrc/x11/x11vnc/patches/patch-src_unixpw.c:1.1
--- /dev/null   Wed Apr  8 12:49:57 2026
+++ pkgsrc/x11/x11vnc/patches/patch-src_unixpw.c        Wed Apr  8 12:49:57 2026
@@ -0,0 +1,67 @@
+$NetBSD: patch-src_unixpw.c,v 1.1 2026/04/08 12:49:57 wiz Exp $
+
+* Use openpty(3) if available
+
+--- src/unixpw.c.orig  2018-02-04 21:43:38.000000000 +0000
++++ src/unixpw.c
+@@ -92,6 +92,18 @@ extern char *crypt(const char*, const ch
+ #define IS_BSD
+ #endif
+ 
++#if HAVE_OPENPTY
++#if HAVE_UTIL_H
++#include <util.h>
++#endif
++#if HAVE_LIBUTIL_H
++#include <libutil.h>
++#endif
++#if HAVE_PTY_H
++#include <pty.h>
++#endif
++#endif
++
+ int white_pixel(void);
+ void unixpw_screen(int init);
+ void unixpw_keystroke(rfbBool down, rfbKeySym keysym, int init);
+@@ -581,6 +593,23 @@ char *get_pty_ptmx(int *fd_p) {
+ #endif /* GRANTPT */
+ }
+ 
++#if HAVE_OPENPTY
++char *get_pty_openpty(int *fd_p) {
++      int fd, sfd;
++
++      *fd_p = -1;
++
++      if (openpty(&fd, &sfd, slave_str, NULL, NULL) < 0) {
++              return NULL;
++      }
++
++#if HAVE_SYS_IOCTL_H && defined(TIOCFLUSH)
++      ioctl(fd, TIOCFLUSH, (char *) 0);
++#endif
++      *fd_p = fd;
++      return slave_str;
++}
++#endif
+ 
+ char *get_pty_loop(int *fd_p) {
+       char master_str[16];
+@@ -625,6 +654,9 @@ char *get_pty(int *fd_p) {
+       if (getenv("BSD_PTY")) {
+               return get_pty_loop(fd_p);
+       }
++#if HAVE_OPENPTY
++      return get_pty_openpty(fd_p);
++#else
+ #ifdef IS_BSD
+       return get_pty_loop(fd_p);
+ #else
+@@ -635,6 +667,7 @@ char *get_pty(int *fd_p) {
+       return get_pty_loop(fd_p);
+ #endif
+ #endif
++#endif
+ }
+ 
+ void try_to_be_nobody(void) {