pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/sysutils/psmisc



Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jun 29 13:11:00 UTC 2026

Modified Files:
        pkgsrc/sysutils/psmisc: Makefile PLIST distinfo
Added Files:
        pkgsrc/sysutils/psmisc/patches: patch-configure.ac patch-src_killall.c
Removed Files:
        pkgsrc/sysutils/psmisc/patches: patch-ab patch-ac patch-ad patch-ae
            patch-af patch-ag

Log Message:
psmisc: updated to 23.7

Changes in 23.7
* build-sys: Make disable-statx work
* fuser: Fallback to stat() if no statx() Debian 1030747
* fuser: silently ignore EACCES when scanning proc directories
* killall: small formatting fixes Debian
* pstree: Do not assume root PID
* pslog: include config.h
* misc: Update gettext to 0.21


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/psmisc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/psmisc/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/psmisc/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/sysutils/psmisc/patches/patch-ab
cvs rdiff -u -r1.5 -r0 pkgsrc/sysutils/psmisc/patches/patch-ac
cvs rdiff -u -r1.7 -r0 pkgsrc/sysutils/psmisc/patches/patch-ad \
    pkgsrc/sysutils/psmisc/patches/patch-af
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/psmisc/patches/patch-ae
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/psmisc/patches/patch-ag
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/psmisc/patches/patch-configure.ac \
    pkgsrc/sysutils/psmisc/patches/patch-src_killall.c

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

Modified files:

Index: pkgsrc/sysutils/psmisc/Makefile
diff -u pkgsrc/sysutils/psmisc/Makefile:1.34 pkgsrc/sysutils/psmisc/Makefile:1.35
--- pkgsrc/sysutils/psmisc/Makefile:1.34        Fri Jun  4 12:31:24 2021
+++ pkgsrc/sysutils/psmisc/Makefile     Mon Jun 29 13:11:00 2026
@@ -1,44 +1,37 @@
-# $NetBSD: Makefile,v 1.34 2021/06/04 12:31:24 gdt Exp $
+# $NetBSD: Makefile,v 1.35 2026/06/29 13:11:00 adam Exp $
 
-DISTNAME=              psmisc-20.1
-CATEGORIES=            sysutils
-PKGREVISION=           4
-#MASTER_SITES=         https://gitlab.com/psmisc/psmisc/-/archive/v22.21/psmisc-v22.21.tar.gz
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=psmisc/}
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              https://gitlab.com/psmisc/psmisc
-COMMENT=               Miscellaneous procfs tools: killall, pidof, and pstree
-LICENSE=               gnu-gpl-v2
+DISTNAME=      psmisc-v23.7
+PKGNAME=       ${DISTNAME:S/-v/-/}
+CATEGORIES=    sysutils
+MASTER_SITES=  ${MASTER_SITE_GITLAB:=psmisc/psmisc/-/archive/v${PKGVERSION_NOREV}/}
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://gitlab.com/psmisc/psmisc
+COMMENT=       Miscellaneous procfs tools: killall, pidof, and pstree
+LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=            pstree<=2.16
+CONFLICTS+=    pstree<=2.16
 
+USE_LANGUAGES=         c
+USE_TOOLS+=            autoconf automake autoreconf gmake
 GNU_CONFIGURE=         yes
-PLIST_VARS+=           fuser
-LIBS+=                 ${BUILDLINK_LDADD.getopt}
+CONFIGURE_ARGS+=       --disable-harden-flags
+CONFIGURE_ARGS+=       --disable-statx
+
+PLIST_VARS+=   fuser
 
-#
 # fuser works only on Linux.
-#
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Linux"
 PLIST.fuser=           yes
-
-.else
-SUBST_CLASSES+=                fuser
-SUBST_STAGE.fuser=     pre-configure
-SUBST_FILES.fuser=     src/Makefile.in doc/Makefile.in
-SUBST_SED.fuser=       -e '/^man_MANS =/s/fuser.1//' \
-                       -e '/^bin_PROGRAMS =/s/fuser//'
 .endif
 
-#
-# "make install" doesn't install the link from killall -> pidof.
-#
-post-install:
-       ${RM} -f ${DESTDIR}${PREFIX}/bin/pidof
-       ${LN} -f ${DESTDIR}${PREFIX}/bin/killall ${DESTDIR}${PREFIX}/bin/pidof
+pre-configure:
+       cd ${WRKSRC} && autoreconf -fi && ${SH} po/update-potfiles
 
-.include "../../mk/termcap.buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/psmisc/PLIST
diff -u pkgsrc/sysutils/psmisc/PLIST:1.2 pkgsrc/sysutils/psmisc/PLIST:1.3
--- pkgsrc/sysutils/psmisc/PLIST:1.2    Mon Aug 10 07:31:31 2015
+++ pkgsrc/sysutils/psmisc/PLIST        Mon Jun 29 13:11:00 2026
@@ -1,9 +1,44 @@
-@comment $NetBSD: PLIST,v 1.2 2015/08/10 07:31:31 dholland Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/06/29 13:11:00 adam Exp $
 ${PLIST.fuser}bin/fuser
 bin/killall
-bin/pidof
+bin/prtstat
+bin/pslog
 bin/pstree
+bin/pstree.x11
 ${PLIST.fuser}man/man1/fuser.1
 man/man1/killall.1
-man/man1/pidof.1
+man/man1/peekfd.1
+man/man1/prtstat.1
+man/man1/pslog.1
 man/man1/pstree.1
+share/locale/bg/LC_MESSAGES/psmisc.mo
+share/locale/ca/LC_MESSAGES/psmisc.mo
+share/locale/cs/LC_MESSAGES/psmisc.mo
+share/locale/da/LC_MESSAGES/psmisc.mo
+share/locale/de/LC_MESSAGES/psmisc.mo
+share/locale/el/LC_MESSAGES/psmisc.mo
+share/locale/eo/LC_MESSAGES/psmisc.mo
+share/locale/es/LC_MESSAGES/psmisc.mo
+share/locale/eu/LC_MESSAGES/psmisc.mo
+share/locale/fi/LC_MESSAGES/psmisc.mo
+share/locale/fr/LC_MESSAGES/psmisc.mo
+share/locale/hr/LC_MESSAGES/psmisc.mo
+share/locale/hu/LC_MESSAGES/psmisc.mo
+share/locale/id/LC_MESSAGES/psmisc.mo
+share/locale/it/LC_MESSAGES/psmisc.mo
+share/locale/ja/LC_MESSAGES/psmisc.mo
+share/locale/ka/LC_MESSAGES/psmisc.mo
+share/locale/ko/LC_MESSAGES/psmisc.mo
+share/locale/nb/LC_MESSAGES/psmisc.mo
+share/locale/nl/LC_MESSAGES/psmisc.mo
+share/locale/pl/LC_MESSAGES/psmisc.mo
+share/locale/pt/LC_MESSAGES/psmisc.mo
+share/locale/pt_BR/LC_MESSAGES/psmisc.mo
+share/locale/ro/LC_MESSAGES/psmisc.mo
+share/locale/ru/LC_MESSAGES/psmisc.mo
+share/locale/sr/LC_MESSAGES/psmisc.mo
+share/locale/sv/LC_MESSAGES/psmisc.mo
+share/locale/uk/LC_MESSAGES/psmisc.mo
+share/locale/vi/LC_MESSAGES/psmisc.mo
+share/locale/zh_CN/LC_MESSAGES/psmisc.mo
+share/locale/zh_TW/LC_MESSAGES/psmisc.mo

Index: pkgsrc/sysutils/psmisc/distinfo
diff -u pkgsrc/sysutils/psmisc/distinfo:1.11 pkgsrc/sysutils/psmisc/distinfo:1.12
--- pkgsrc/sysutils/psmisc/distinfo:1.11        Tue Oct 26 11:20:01 2021
+++ pkgsrc/sysutils/psmisc/distinfo     Mon Jun 29 13:11:00 2026
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 11:20:01 nia Exp $
+$NetBSD: distinfo,v 1.12 2026/06/29 13:11:00 adam Exp $
 
-BLAKE2s (psmisc-20.1.tar.gz) = 455436f3fd78af0b4037878c3b71d0f0a9bca636351ea93b63060d5d137756ad
-SHA512 (psmisc-20.1.tar.gz) = 14553afd185d968042a10eefadaec089f4deb821fee70b69d520565ccbaa485c65137af2279bcfc2abbfdeb3e35bad2beaa5357372fbe6cfa587d10e9bdc2f9b
-Size (psmisc-20.1.tar.gz) = 57767 bytes
-SHA1 (patch-ab) = 74134f6cd2ea0270fdbaff8c0acb9e40767cc5cb
-SHA1 (patch-ac) = 9f9a7c7c5155345a1045aee70a2dd65a25ec7219
-SHA1 (patch-ad) = 6e2886ca59160d161d334e276675f187f138db7c
-SHA1 (patch-ae) = 484305118582c575f8c4827783aa3d5f57b25b5d
-SHA1 (patch-af) = ecba31c5e44291e695eb4b9ea19b9a70cdbd3f67
-SHA1 (patch-ag) = a03a4a0c0dbf065e2b2785cee8f23579a11ae13f
+BLAKE2s (psmisc-v23.7.tar.bz2) = cc84a432aa65fd37530669b9147d6ab5d6dc8f86695b2de094fb91ad028091b3
+SHA512 (psmisc-v23.7.tar.bz2) = facb57c8f4dcd4ed7ece729c2108f91aaaf2f2c5123c71f8f645d30c4bfb8ec147f1f222da262c37e18a7b0def7c25b66e3b5d0e216a45a016e8085f472121eb
+Size (psmisc-v23.7.tar.bz2) = 268418 bytes
+SHA1 (patch-configure.ac) = 38bf28e9c81c00894fbc97b1662904562d0b31aa
+SHA1 (patch-src_killall.c) = 0c1b8dc90a825b5c2862be4851b73afc1a2ccfb3

Added files:

Index: pkgsrc/sysutils/psmisc/patches/patch-configure.ac
diff -u /dev/null pkgsrc/sysutils/psmisc/patches/patch-configure.ac:1.1
--- /dev/null   Mon Jun 29 13:11:00 2026
+++ pkgsrc/sysutils/psmisc/patches/patch-configure.ac   Mon Jun 29 13:11:00 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-configure.ac,v 1.1 2026/06/29 13:11:00 adam Exp $
+
+fuser is for Linux only.
+
+--- configure.ac.orig  2024-11-17 09:42:46.507146070 +0000
++++ configure.ac
+@@ -167,11 +167,11 @@ AC_CHECK_MEMBERS([struct pt_regs.orig_d0
+                   struct pt_regs.d0],[],[], [#include <asm/ptrace.h>])
+ 
+ case ${host_os} in
+-  gnu*)
+-    want_fuser=no
++  linux*)
++    want_fuser=yes
+     ;;
+   *)
+-    want_fuser=yes
++    want_fuser=no
+       ;;
+ esac
+ AM_CONDITIONAL(WANT_FUSER, test $want_fuser = yes)
Index: pkgsrc/sysutils/psmisc/patches/patch-src_killall.c
diff -u /dev/null pkgsrc/sysutils/psmisc/patches/patch-src_killall.c:1.1
--- /dev/null   Mon Jun 29 13:11:00 2026
+++ pkgsrc/sysutils/psmisc/patches/patch-src_killall.c  Mon Jun 29 13:11:00 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_killall.c,v 1.1 2026/06/29 13:11:00 adam Exp $
+
+Avoid non-portable getopt_long_only().
+
+--- src/killall.c.orig 2024-03-03 10:57:39.000000000 +0000
++++ src/killall.c
+@@ -940,7 +940,7 @@ main (int argc, char **argv)
+ 
+ 
+     opterr = 0;
+-    while ( (optc = getopt_long_only(argc,argv,"egy:o:ilqrs:u:vwZ:VIn:",options,NULL)) != -1) {
++    while ( (optc = getopt_long(argc,argv,"egy:o:ilqrs:u:vwZ:VIn:",options,NULL)) != -1) {
+             switch (optc) {
+             case 'e':
+                 exact = 1;



Home | Main Index | Thread Index | Old Index