pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/pidof (sysutils/pidof) Updated 2.88sdf to 2.9...
details: https://anonhg.NetBSD.org/pkgsrc/rev/eb5fba6662c2
branches: trunk
changeset: 420069:eb5fba6662c2
user: mef <mef%pkgsrc.org@localhost>
date: Tue Dec 31 13:55:14 2019 +0000
description:
(sysutils/pidof) Updated 2.88sdf to 2.96, ChangeLog lines to large, omitted.
(..sysutils/pidof)% wc ChangeLog-2.88sdf-2.96
434 3459 22753 ChangeLog-2.88sdf-2.96
The last part is as below:
sysvinit (2.96) released; urgency=low
[ Jesse Smith ]
* Added -z command line paramter to pidof which tells pidof to
try to find processes in uninterruptable (D) or zombie (Z) states.
This can cause pidof to hang, but produces a more complete process
list.
Closes Savannah bug #56534
* Reformatted init code to make if/while logic more clear.
* Cleaned up some output from readbootlog.
* Added -e flag to bootlogd. When -e is used, data saved
to the boot log file does not have escape characters
removed. This means colour and cursor movement codes
stay in the log file. The may then look nicer when
read with "less -R', but may appear cluttered or
out of alignment when viewed with other, plain-text tools.
When -e is not used, escape characters are removed/filtered.
Closes Debian bug #672361.
* Make sure src/Makefile cleans up all executable files
when parent Makefile calls "make clean".
diffstat:
sysutils/pidof/Makefile | 6 ++--
sysutils/pidof/distinfo | 12 +++++-----
sysutils/pidof/patches/patch-aa | 49 ++++++++++++++--------------------------
3 files changed, 26 insertions(+), 41 deletions(-)
diffs (147 lines):
diff -r d0b336a5d44d -r eb5fba6662c2 sysutils/pidof/Makefile
--- a/sysutils/pidof/Makefile Tue Dec 31 13:33:37 2019 +0000
+++ b/sysutils/pidof/Makefile Tue Dec 31 13:55:14 2019 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2016/09/20 12:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/12/31 13:55:14 mef Exp $
-DISTNAME= sysvinit-2.88dsf
+DISTNAME= sysvinit-2.96
PKGNAME= ${DISTNAME:S/sysvinit/pidof/}
CATEGORIES= sysutils
MASTER_SITES= http://download.savannah.gnu.org/releases/sysvinit/
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://download.savannah.gnu.org/releases/sysvinit/
diff -r d0b336a5d44d -r eb5fba6662c2 sysutils/pidof/distinfo
--- a/sysutils/pidof/distinfo Tue Dec 31 13:33:37 2019 +0000
+++ b/sysutils/pidof/distinfo Tue Dec 31 13:55:14 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:32:26 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/12/31 13:55:14 mef Exp $
-SHA1 (sysvinit-2.88dsf.tar.bz2) = f2ca149df1314a91f3007cccd7a0aa47d990de26
-RMD160 (sysvinit-2.88dsf.tar.bz2) = 8109e9b90caff544be4a3b37c808baf16914d0bd
-SHA512 (sysvinit-2.88dsf.tar.bz2) = 0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf
-Size (sysvinit-2.88dsf.tar.bz2) = 105551 bytes
-SHA1 (patch-aa) = 45c9f8ebc73af24a28e511e44c5bcd9f97e9d475
+SHA1 (sysvinit-2.96.tar.xz) = 3f826119b988dfd149f63bab987d735eb5d32eaa
+RMD160 (sysvinit-2.96.tar.xz) = b36db1266c51a22b493c8284250b7e3d7e9cda1d
+SHA512 (sysvinit-2.96.tar.xz) = 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d
+Size (sysvinit-2.96.tar.xz) = 122164 bytes
+SHA1 (patch-aa) = bf9018fc648438574f246e0cc019492e31648377
diff -r d0b336a5d44d -r eb5fba6662c2 sysutils/pidof/patches/patch-aa
--- a/sysutils/pidof/patches/patch-aa Tue Dec 31 13:33:37 2019 +0000
+++ b/sysutils/pidof/patches/patch-aa Tue Dec 31 13:55:14 2019 +0000
@@ -1,23 +1,20 @@
-$NetBSD: patch-aa,v 1.1 2014/07/22 08:20:24 manu Exp $
+$NetBSD: patch-aa,v 1.2 2019/12/31 13:55:14 mef Exp $
Disable the NFS code
---- src/killall5.c.orig 2014-07-01 02:01:37.000000000 +0200
-+++ src/killall5.c 2014-07-03 09:53:15.000000000 +0200
-@@ -42,9 +42,11 @@
- */
- #include <dirent.h>
+--- 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 @@
#include <errno.h>
#include <getopt.h>
+ #include <limits.h>
+#ifdef linux
#include <mntent.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
- #include <signal.h>
-@@ -236,8 +238,9 @@
- }
+@@ -253,6 +255,7 @@ static inline int isnetfs(const char * t
return 0;
}
@@ -25,9 +22,7 @@
/*
* Remember all NFS typed partitions.
*/
- void init_nfs(void)
-@@ -301,8 +304,9 @@
- }
+@@ -318,6 +321,7 @@ void init_nfs(void)
}
endmntent(mnt);
}
@@ -35,19 +30,15 @@
static void clear_shadow(SHADOW *restrict shadow)
{
- SHADOW *s, *n, *l;
-@@ -365,8 +369,9 @@
- out:
- return 0;
+@@ -396,6 +400,7 @@ static int maxsymlinks(void)
+ return v;
}
+#ifdef linux
/*
* Check path is located on a network based partition.
*/
- int check4nfs(const char * path, char * real)
-@@ -430,8 +435,9 @@
- }
+@@ -465,6 +470,7 @@ int check4nfs(const char * path, char *
return 0;
}
@@ -55,23 +46,20 @@
int readarg(FILE *fp, char *buf, int sz)
{
- int c = 0, f = 0;
-@@ -607,11 +613,13 @@
-
+@@ -683,10 +689,12 @@ int readproc(int do_stat)
p->nfs = 0;
switch (do_stat) {
+#ifdef linux
case DO_NETFS:
if ((p->nfs = check4nfs(path, buf)))
- break;
+ goto link;
+ /* else fall through */
+#endif
case DO_STAT:
- if (stat(path, &st) != 0)
- break;
- p->dev = st.st_dev;
-@@ -695,10 +703,12 @@
- /* Try to stat the executable. */
+ if (stat(path, &st) != 0) {
+ char * ptr;
+@@ -806,8 +814,10 @@ PIDQ_HEAD *pidof(char *prog)
if (prog[0] == '/') {
memset(&real[0], 0, sizeof(real));
@@ -82,9 +70,7 @@
if (real[0] != '\0')
prog = &real[0]; /* Binary located on network FS. */
-
-@@ -926,10 +936,12 @@
- exit(1);
+@@ -1089,8 +1099,10 @@ int main_pidof(int argc, char **argv)
}
}
@@ -95,4 +81,3 @@
/* Print out process-ID's one by one. */
readproc((flags & PIDOF_NETFS) ? DO_NETFS : DO_STAT);
-
Home |
Main Index |
Thread Index |
Old Index