CVS commit: pkgsrc/net/proftpd

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jun 15 07:36:25 UTC 2026

Modified Files:
        pkgsrc/net/proftpd: Makefile.common distinfo
Added Files:
        pkgsrc/net/proftpd/patches: patch-src_table.c

Log Message:
proftpd: Fails with C23 default language.

Uses "bool" as a variable name, which conflicts with the C23
keyword.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/proftpd/Makefile.common
cvs rdiff -u -r1.57 -r1.58 pkgsrc/net/proftpd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/proftpd/patches/patch-src_table.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/proftpd/Makefile.common
diff -u pkgsrc/net/proftpd/Makefile.common:1.17 pkgsrc/net/proftpd/Makefile.common:1.18
--- pkgsrc/net/proftpd/Makefile.common:1.17     Thu Dec 28 23:01:41 2023
+++ pkgsrc/net/proftpd/Makefile.common  Mon Jun 15 07:36:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2023/12/28 23:01:41 zafer Exp $
+# $NetBSD: Makefile.common,v 1.18 2026/06/15 07:36:25 nia Exp $
 
 # used by net/proftpd/Makefile
 # used by net/proftpd/Makefile.module
@@ -21,6 +21,8 @@ PATCHDIR=             ${.CURDIR}/../../net/proftpd/
 
 USE_TOOLS+=            gmake intltool msgfmt perl:run autoconf
 USE_LIBTOOL=           yes
+# Uses bool as a variable name, which conflicts with the C23 keyword.
+FORCE_C_STD=           gnu99
 GNU_CONFIGURE=         yes
 GNU_CONFIGURE_STRICT=  no # has sub-configures
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}

Index: pkgsrc/net/proftpd/distinfo
diff -u pkgsrc/net/proftpd/distinfo:1.57 pkgsrc/net/proftpd/distinfo:1.58
--- pkgsrc/net/proftpd/distinfo:1.57    Wed Dec 20 17:05:00 2023
+++ pkgsrc/net/proftpd/distinfo Mon Jun 15 07:36:25 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2023/12/20 17:05:00 wiz Exp $
+$NetBSD: distinfo,v 1.58 2026/06/15 07:36:25 nia Exp $
 
 BLAKE2s (proftpd-1.3.8b.tar.gz) = 9b720dd369ce8bdee0190f579535cd1e0dca45fe22fc75adcab9951203478853
 SHA512 (proftpd-1.3.8b.tar.gz) = 291a91f220d711fefdbff18ef4e056080ad99c94dc4c71d0651f725932e1f2d9438fb75fbc2017e0f30a9a18a354b2d515788fbd538a80414f8c2d4eaaace396
@@ -10,3 +10,4 @@ SHA1 (patch-contrib_mod__load_mod__load.
 SHA1 (patch-contrib_mod__sftp_Makefile.in) = cda07c1d8836071f1d86ea07cb1d8d09d036bd43
 SHA1 (patch-locale_en__US.po) = 6c8c55130072dccc8cdda18fa2a70a7aab13c328
 SHA1 (patch-src_pidfile.c) = fbe032bf1d9fbe089c44851e4da008d2a1c2945f
+SHA1 (patch-src_table.c) = 51b2c302ba5f2cdc198e05212f2b93a041174be1

Added files:

Index: pkgsrc/net/proftpd/patches/patch-src_table.c
diff -u /dev/null pkgsrc/net/proftpd/patches/patch-src_table.c:1.1
--- /dev/null   Mon Jun 15 07:36:25 2026
+++ pkgsrc/net/proftpd/patches/patch-src_table.c        Mon Jun 15 07:36:25 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_table.c,v 1.1 2026/06/15 07:36:25 nia Exp $
+
+Avoid using bool as a variable name, it conflicts with the C keyword/typedef.
+
+--- src/table.c.orig   2026-06-15 07:32:35.496258584 +0000
++++ src/table.c
+@@ -1277,10 +1277,10 @@ void pr_table_dump(void (*dumpf)(const char *fmt, ...)
+   }
+ }
+ 
+-int table_handling_signal(int bool) {
+-  if (bool == TRUE ||
+-      bool == FALSE) {
+-    handling_signal = bool;
++int table_handling_signal(int boolvar) {
++  if (boolvar == TRUE ||
++      boolvar == FALSE) {
++    handling_signal = boolvar;
+     return 0;
+   }
+