CVS commit: pkgsrc/net/upclient

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 21 10:38:34 UTC 2026

Modified Files:
        pkgsrc/net/upclient: distinfo
        pkgsrc/net/upclient/patches: patch-aa patch-ab patch-ac
Added Files:
        pkgsrc/net/upclient/patches: patch-src_base64.c patch-src_network.c
            patch-src_stats-sol.c patch-src_upclient.c

Log Message:
upclient: Various fixes for recent gcc.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/upclient/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/upclient/patches/patch-aa \
    pkgsrc/net/upclient/patches/patch-ac
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/upclient/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/net/upclient/patches/patch-src_base64.c \
    pkgsrc/net/upclient/patches/patch-src_network.c \
    pkgsrc/net/upclient/patches/patch-src_stats-sol.c \
    pkgsrc/net/upclient/patches/patch-src_upclient.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/upclient/distinfo
diff -u pkgsrc/net/upclient/distinfo:1.17 pkgsrc/net/upclient/distinfo:1.18
--- pkgsrc/net/upclient/distinfo:1.17   Tue Oct 26 11:07:07 2021
+++ pkgsrc/net/upclient/distinfo        Sat Mar 21 10:38:34 2026
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.17 2021/10/26 11:07:07 nia Exp $
+$NetBSD: distinfo,v 1.18 2026/03/21 10:38:34 nia Exp $
 
 BLAKE2s (upclient-4.2.1.23.tar.gz) = 3ba3c5e0af3466bbf1cd4cbc130940bcd5776549657bcdf89074c94be387d05b
 SHA512 (upclient-4.2.1.23.tar.gz) = 822e1b269861b306e468a196756bba79babf06c89d3a441293f1d418458f2f563c3b18c9bdab587aba81a8bba1dd1db088d01c03a91d3900be485146535fc4fc
 Size (upclient-4.2.1.23.tar.gz) = 29386 bytes
-SHA1 (patch-aa) = 2e1dacd293b69e0d2338e1a316d7d1d7015447c2
-SHA1 (patch-ab) = dd1e318cee6e27fcf433b2123cf8f3f6ed8eb548
-SHA1 (patch-ac) = 5fa3dad86297d9a6bf5047008813996c0e930e7c
+SHA1 (patch-aa) = ced6fd730065b76104779fb7e980f5fd94ddbf1d
+SHA1 (patch-ab) = 208df5f16c002bcf4e2689a1eb7ec46cfc124649
+SHA1 (patch-ac) = 7777617c58b6886484e43b52524494a510f15373
 SHA1 (patch-ad) = 57aac6d38f7f4fcdc1b4545d2f6df0815a9db496
 SHA1 (patch-ae) = f8b73cfa9d736f3b06556224373486144548afc8
+SHA1 (patch-src_base64.c) = 701bcc013e30c2ddb815aa9c2cbb769ad895b3be
+SHA1 (patch-src_network.c) = 0f87363a030329870adeb8c2fcb7610118f62f1d
+SHA1 (patch-src_stats-sol.c) = 7af57cb2c590e562150e223987b474c7021e22dc
+SHA1 (patch-src_upclient.c) = 4469f576f6e633c3b5de501e9a512e2879260fd4

Index: pkgsrc/net/upclient/patches/patch-aa
diff -u pkgsrc/net/upclient/patches/patch-aa:1.8 pkgsrc/net/upclient/patches/patch-aa:1.9
--- pkgsrc/net/upclient/patches/patch-aa:1.8    Wed Jul  2 18:22:42 2003
+++ pkgsrc/net/upclient/patches/patch-aa        Sat Mar 21 10:38:34 2026
@@ -1,8 +1,32 @@
-$NetBSD: patch-aa,v 1.8 2003/07/02 18:22:42 jmmv Exp $
+$NetBSD: patch-aa,v 1.9 2026/03/21 10:38:34 nia Exp $
 
---- src/options.c.orig 2001-06-16 21:15:04.000000000 +0200
+--- src/options.c.orig 2001-06-16 19:15:04.000000000 +0000
 +++ src/options.c
-@@ -294,13 +294,10 @@ int read_config(void) {
+@@ -8,7 +8,10 @@
+ #include "options.h"
+ 
+ /* System includes */
+-#include "stdio.h"
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <ctype.h>
+ 
+ /**
+  * Global variables, very ugly, watch through sunglasses!
+@@ -158,9 +161,10 @@ static int process_option(const char *ke
+  * @desc      isblank() for Solaris
+  */
+ #if defined(PLATFORM_SOLARIS)
+-static int isblank(const char chr) {
++static int my_isblank(const char chr) {
+   return(chr == ' ' || chr == '\t');
+ }
++#define isblank my_isblank
+ #endif
+ 
+ /**
+@@ -294,13 +298,10 @@ int read_config(void) {
  
    /* Try to open config file in current directory */
    if(!(fp = fopen(CONFIGFILE, "r"))) {
Index: pkgsrc/net/upclient/patches/patch-ac
diff -u pkgsrc/net/upclient/patches/patch-ac:1.8 pkgsrc/net/upclient/patches/patch-ac:1.9
--- pkgsrc/net/upclient/patches/patch-ac:1.8    Tue Sep 19 22:25:48 2006
+++ pkgsrc/net/upclient/patches/patch-ac        Sat Mar 21 10:38:34 2026
@@ -1,16 +1,20 @@
-$NetBSD: patch-ac,v 1.8 2006/09/19 22:25:48 joerg Exp $
+$NetBSD: patch-ac,v 1.9 2026/03/21 10:38:34 nia Exp $
 
 --- src/stats-bsd.c.orig       2001-06-16 19:12:53.000000000 +0000
 +++ src/stats-bsd.c
-@@ -10,6 +10,7 @@
+@@ -10,17 +10,28 @@
  #include "stats.h"
  
  /* System includes */
 +#include <sys/param.h>
  #include <kvm.h>
  #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
  #include <errno.h>
-@@ -17,10 +18,16 @@
++#include <err.h>
+ #include <fcntl.h>
++#include <unistd.h>
  #include <limits.h>
  #include <syslog.h>
  #include <sys/time.h>
@@ -28,7 +32,7 @@ $NetBSD: patch-ac,v 1.8 2006/09/19 22:25
  
  /**
   * @desc      Get statistics
-@@ -75,6 +82,35 @@ void getstats(unsigned long *puptime, do
+@@ -75,6 +86,35 @@ void getstats(unsigned long *puptime, do
    }
  
    if(cfg_sendidle) {
@@ -64,7 +68,7 @@ $NetBSD: patch-ac,v 1.8 2006/09/19 22:25
      static kvm_t *kp;
      static int initialized = 0;
      static struct nlist namelist [] = {
-@@ -131,5 +167,6 @@ void getstats(unsigned long *puptime, do
+@@ -131,5 +171,6 @@ void getstats(unsigned long *puptime, do
      } else {
        cfg_sendidle = 0;
      }

Index: pkgsrc/net/upclient/patches/patch-ab
diff -u pkgsrc/net/upclient/patches/patch-ab:1.5 pkgsrc/net/upclient/patches/patch-ab:1.6
--- pkgsrc/net/upclient/patches/patch-ab:1.5    Tue May  7 22:25:04 2002
+++ pkgsrc/net/upclient/patches/patch-ab        Sat Mar 21 10:38:34 2026
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2002/05/07 22:25:04 hubertf Exp $
+$NetBSD: patch-ab,v 1.6 2026/03/21 10:38:34 nia Exp $
 
---- scripts/upchk.orig Tue Jun 19 11:15:24 2001
-+++ scripts/upchk      Tue Jun 19 11:15:51 2001
+--- scripts/upchk.orig 2001-05-31 23:30:24.000000000 +0000
++++ scripts/upchk
 @@ -24,7 +24,7 @@
  #
  
  # change this to the full path AND name of your upclient executable:
 -upclient="/usr/local/sbin/upclient"
-+upclient="@PREFIX@/bin/upclient"
++upclient="/usr/pkg/bin/upclient"
  
  # change this to the name of your upclient's pidfile (as defined in
  # config.h of the upclient distribution)

Added files:

Index: pkgsrc/net/upclient/patches/patch-src_base64.c
diff -u /dev/null pkgsrc/net/upclient/patches/patch-src_base64.c:1.1
--- /dev/null   Sat Mar 21 10:38:34 2026
+++ pkgsrc/net/upclient/patches/patch-src_base64.c      Sat Mar 21 10:38:34 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_base64.c,v 1.1 2026/03/21 10:38:34 nia Exp $
+
+Fix implicit function declarations.
+
+--- src/base64.c.orig  2001-06-16 17:06:56.000000000 +0000
++++ src/base64.c
+@@ -9,6 +9,8 @@
+ 
+ /* System includes */
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #if !defined(PLATFORM_WINNT) && !defined(PLATFORM_BEOS)
+   #include <syslog.h>
+ #endif
Index: pkgsrc/net/upclient/patches/patch-src_network.c
diff -u /dev/null pkgsrc/net/upclient/patches/patch-src_network.c:1.1
--- /dev/null   Sat Mar 21 10:38:34 2026
+++ pkgsrc/net/upclient/patches/patch-src_network.c     Sat Mar 21 10:38:34 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_network.c,v 1.1 2026/03/21 10:38:34 nia Exp $
+
+Fix implicit function declarations.
+
+--- src/network.c.orig 2026-03-21 10:18:36.685564505 +0000
++++ src/network.c
+@@ -11,6 +11,7 @@
+ /* System includes */
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #ifdef PLATFORM_WINNT
+   #include <windows.h>
Index: pkgsrc/net/upclient/patches/patch-src_stats-sol.c
diff -u /dev/null pkgsrc/net/upclient/patches/patch-src_stats-sol.c:1.1
--- /dev/null   Sat Mar 21 10:38:34 2026
+++ pkgsrc/net/upclient/patches/patch-src_stats-sol.c   Sat Mar 21 10:38:34 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_stats-sol.c,v 1.1 2026/03/21 10:38:34 nia Exp $
+
+Fix implicit function declarations.
+
+--- src/stats-sol.c.orig       2026-03-21 10:18:21.173346657 +0000
++++ src/stats-sol.c
+@@ -11,9 +11,11 @@
+ 
+ /* System includes */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <utmpx.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ #include <strings.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
Index: pkgsrc/net/upclient/patches/patch-src_upclient.c
diff -u /dev/null pkgsrc/net/upclient/patches/patch-src_upclient.c:1.1
--- /dev/null   Sat Mar 21 10:38:34 2026
+++ pkgsrc/net/upclient/patches/patch-src_upclient.c    Sat Mar 21 10:38:34 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_upclient.c,v 1.1 2026/03/21 10:38:34 nia Exp $
+
+Fix implicit function declarations.
+
+--- src/upclient.c.orig        2026-03-21 10:22:14.803978262 +0000
++++ src/upclient.c
+@@ -98,6 +98,8 @@
+ int past_idle_times[NUM_IDLE_ELEMENTS] = { -1 };
+ #endif
+ 
++int read_config(void);
++
+ 
+ /**
+  * @desc      Actual function that makes the connection to the