CVS commit: pkgsrc/sysutils/pidof

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Oct 10 17:55:25 UTC 2024

Modified Files:
        pkgsrc/sysutils/pidof: Makefile distinfo
        pkgsrc/sysutils/pidof/patches: patch-aa
Added Files:
        pkgsrc/sysutils/pidof/patches: patch-src_Makefile

Log Message:
pidof: Ensure all needed functions are defined.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/pidof/Makefile \
    pkgsrc/sysutils/pidof/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/pidof/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/pidof/patches/patch-src_Makefile

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

Modified files:

Index: pkgsrc/sysutils/pidof/Makefile
diff -u pkgsrc/sysutils/pidof/Makefile:1.5 pkgsrc/sysutils/pidof/Makefile:1.6
--- pkgsrc/sysutils/pidof/Makefile:1.5  Sat Nov 12 09:10:24 2022
+++ pkgsrc/sysutils/pidof/Makefile      Thu Oct 10 17:55:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/11/12 09:10:24 nikita Exp $
+# $NetBSD: Makefile,v 1.6 2024/10/10 17:55:25 nia Exp $
 
 DISTNAME=      sysvinit-2.96
 PKGNAME=       ${DISTNAME:S/sysvinit/pidof/}
@@ -16,6 +16,9 @@ BUILD_DIRS=   src
 BUILD_TARGET=  killall5
 AUTO_MKDIRS=   yes
 
+CFLAGS.NetBSD+=        -D_NETBSD_SOURCE
+CFLAGS.SunOS+= -D__EXTENSIONS__
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/src/killall5       \
            ${DESTDIR}${PREFIX}/sbin/pidof
Index: pkgsrc/sysutils/pidof/distinfo
diff -u pkgsrc/sysutils/pidof/distinfo:1.5 pkgsrc/sysutils/pidof/distinfo:1.6
--- pkgsrc/sysutils/pidof/distinfo:1.5  Tue Oct 26 11:20:01 2021
+++ pkgsrc/sysutils/pidof/distinfo      Thu Oct 10 17:55:25 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:20:01 nia Exp $
+$NetBSD: distinfo,v 1.6 2024/10/10 17:55:25 nia Exp $
 
 BLAKE2s (sysvinit-2.96.tar.xz) = f125a3e893d315db42c89b133044ae811c72845d27a5ce6060c3adae9744c27f
 SHA512 (sysvinit-2.96.tar.xz) = 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d
 Size (sysvinit-2.96.tar.xz) = 122164 bytes
-SHA1 (patch-aa) = bf9018fc648438574f246e0cc019492e31648377
+SHA1 (patch-aa) = cbda0f40919f0ad70d1030be8e6a71d69c2046b9
+SHA1 (patch-src_Makefile) = 7835f0674b27a9b08f07dcbcf599085e0ece0c11

Index: pkgsrc/sysutils/pidof/patches/patch-aa
diff -u pkgsrc/sysutils/pidof/patches/patch-aa:1.2 pkgsrc/sysutils/pidof/patches/patch-aa:1.3
--- pkgsrc/sysutils/pidof/patches/patch-aa:1.2  Tue Dec 31 13:55:14 2019
+++ pkgsrc/sysutils/pidof/patches/patch-aa      Thu Oct 10 17:55:25 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2019/12/31 13:55:14 mef Exp $
+$NetBSD: patch-aa,v 1.3 2024/10/10 17:55:25 nia Exp $
 
 Disable the NFS code
 
---- src/killall5.c.orig        2019-09-12 02:43:12.000000000 +0900
-+++ src/killall5.c     2019-12-31 22:43:43.093313776 +0900
-@@ -44,7 +44,9 @@
+--- src/killall5.c.orig        2019-09-11 17:43:12.000000000 +0000
++++ src/killall5.c
+@@ -44,12 +44,15 @@
  #include <errno.h>
  #include <getopt.h>
  #include <limits.h>
@@ -14,7 +14,13 @@ Disable the NFS code
  #include <stdarg.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -253,6 +255,7 @@ static inline int isnetfs(const char * t
+ #include <signal.h>
+ #include <string.h>
++#include <strings.h>
+ #include <syslog.h>
+ #include <sys/mman.h>
+ #include <sys/param.h>
+@@ -253,6 +256,7 @@ static inline int isnetfs(const char * t
        return 0;
  }
  
@@ -22,7 +28,7 @@ Disable the NFS code
  /*
   *     Remember all NFS typed partitions.
   */
-@@ -318,6 +321,7 @@ void init_nfs(void)
+@@ -318,6 +322,7 @@ void init_nfs(void)
        }
        endmntent(mnt);
  }
@@ -30,7 +36,7 @@ Disable the NFS code
  
  static void clear_shadow(SHADOW *restrict shadow)
  {
-@@ -396,6 +400,7 @@ static int maxsymlinks(void)
+@@ -396,6 +401,7 @@ static int maxsymlinks(void)
        return v;
  }
  
@@ -38,7 +44,7 @@ Disable the NFS code
  /*
   *     Check path is located on a network based partition.
   */
-@@ -465,6 +470,7 @@ int check4nfs(const char * path, char * 
+@@ -465,6 +471,7 @@ int check4nfs(const char * path, char * 
  
        return 0;
  }
@@ -46,7 +52,7 @@ Disable the NFS code
  
  int readarg(FILE *fp, char *buf, int sz)
  {
-@@ -683,10 +689,12 @@ int readproc(int do_stat)
+@@ -683,10 +690,12 @@ int readproc(int do_stat)
                p->nfs = 0;
  
                switch (do_stat) {
@@ -59,7 +65,7 @@ Disable the NFS code
                case DO_STAT:
                        if (stat(path, &st) != 0) {
                                char * ptr;
-@@ -806,8 +814,10 @@ PIDQ_HEAD *pidof(char *prog)
+@@ -806,8 +815,10 @@ PIDQ_HEAD *pidof(char *prog)
        if (prog[0] == '/') {
                memset(&real[0], 0, sizeof(real));
  
@@ -70,7 +76,7 @@ Disable the NFS code
  
                if (real[0] != '\0')
                        prog = &real[0];        /* Binary located on network FS. */
-@@ -1089,8 +1099,10 @@ int main_pidof(int argc, char **argv)
+@@ -1089,8 +1100,10 @@ int main_pidof(int argc, char **argv)
                }
        }
  

Added files:

Index: pkgsrc/sysutils/pidof/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/sysutils/pidof/patches/patch-src_Makefile:1.1
--- /dev/null   Thu Oct 10 17:55:25 2024
+++ pkgsrc/sysutils/pidof/patches/patch-src_Makefile    Thu Oct 10 17:55:25 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile,v 1.1 2024/10/10 17:55:25 nia Exp $
+
+Set correct compiler flags for standards & functions used.
+
+--- src/Makefile.orig  2019-09-11 17:43:12.000000000 +0000
++++ src/Makefile
+@@ -10,7 +10,7 @@
+ 
+ CPPFLAGS =
+ CFLAGS  ?= -O2
+-override CFLAGS += -ansi -fomit-frame-pointer -fstack-protector-strong -W -Wall -Wunreachable-code -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE -D_GNU_SOURCE 
-DVERSION=\"$(VERSION)\"
++override CFLAGS += -std=gnu89 -fomit-frame-pointer -fstack-protector-strong -W -Wall -Wunreachable-code -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE=600 
-D_POSIX_C_SOURCE=200112L -D_GNU_SOURCE -DVERSION=\"$(VERSION)\"
+ override CFLAGS += $(shell getconf LFS_CFLAGS)
+ STATIC        =
+ MANDB := s@^\('\\\\\"\)[^\*-]*-\*- coding: [^[:blank:]]\+ -\*-@\1@