Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/pidof-bsd/files/, sys-process/pidof-bsd/
Date: Sun, 03 Nov 2019 17:05:24
Message-Id: 1572800712.3f3f56ff3fb8ebfb518d4f4c873037623937c671.zlogene@gentoo
1 commit: 3f3f56ff3fb8ebfb518d4f4c873037623937c671
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 3 17:04:11 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 3 17:05:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3f56ff
7
8 sys-process/pidof-bsd: remove last rited pkg
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 sys-process/pidof-bsd/Manifest | 1 -
13 .../files/pidof-bsd-20050501-fbsd11.patch | 14 ---
14 .../files/pidof-bsd-20050501-firstarg.patch | 13 ---
15 .../pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch | 128 ---------------------
16 .../pidof-bsd/files/pidof-bsd-20050501-pname.patch | 46 --------
17 sys-process/pidof-bsd/metadata.xml | 5 -
18 sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild | 33 ------
19 7 files changed, 240 deletions(-)
20
21 diff --git a/sys-process/pidof-bsd/Manifest b/sys-process/pidof-bsd/Manifest
22 deleted file mode 100644
23 index b1e138bd45e..00000000000
24 --- a/sys-process/pidof-bsd/Manifest
25 +++ /dev/null
26 @@ -1 +0,0 @@
27 -DIST pidof-bsd-20050501.tar.gz 1769 BLAKE2B 6f64d23913e08adc52eef5550becb7f54a1eab805e1a7fe7883632756647bb633d617486fb7a4fa09459d32cdcfb09f41b5c157cc877a71fb07744e2cfced562 SHA512 27691305165848363415a7d487b36a87db0750a9c08e6327eef05f5e87326c91fbf46c415673f83268981a22bbfcfaaf5ef280c06c24b3ebb50d1483527f9c94
28
29 diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch
30 deleted file mode 100644
31 index 4a1b1628520..00000000000
32 --- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch
33 +++ /dev/null
34 @@ -1,14 +0,0 @@
35 -diff --git a/pidof/Makefile b/pidof/Makefile
36 -index d2d760b..67d2725 100644
37 ---- a/pidof/Makefile
38 -+++ b/pidof/Makefile
39 -@@ -2,8 +2,7 @@
40 -
41 - PROG= pidof
42 - SRCS= pidof.c
43 --NOMAN= yes
44 -+NO_MAN= yes
45 - LDADD= -lkvm
46 --LINKS= ${BINDIR}/pidof
47 -
48 - .include <bsd.prog.mk>
49
50 diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-firstarg.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-firstarg.patch
51 deleted file mode 100644
52 index dfb15ae7b94..00000000000
53 --- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-firstarg.patch
54 +++ /dev/null
55 @@ -1,13 +0,0 @@
56 -Index: pidof/pidof.c
57 -===================================================================
58 ---- pidof.orig/pidof.c
59 -+++ pidof/pidof.c
60 -@@ -67,7 +67,7 @@ get_pid_of_process(const char *process_n
61 - char **p_argv = NULL;
62 -
63 - if ((p_argv = kvm_getargv(kd, p+i, 0)) != NULL)
64 -- for (; *p_argv != NULL; p_argv++)
65 -+ if ( *p_argv != NULL )
66 - if (strcmp(process_name, basename(*p_argv)) == 0) {
67 - (void)printf("%d ", (int)p[i].ki_pid);
68 - processes_found++;
69
70 diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch
71 deleted file mode 100644
72 index bb7a776b630..00000000000
73 --- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch
74 +++ /dev/null
75 @@ -1,128 +0,0 @@
76 -? .pidof.c.swp
77 -? pidof
78 -? pidof.core
79 -Index: pidof.c
80 -===================================================================
81 -RCS file: /cvsroot/bmp-plugins/pidof/pidof.c,v
82 -retrieving revision 1.4
83 -diff -u -r1.4 pidof.c
84 ---- pidof.c 1 May 2005 16:26:19 -0000 1.4
85 -+++ pidof.c 13 Sep 2005 16:11:08 -0000
86 -@@ -26,6 +26,7 @@
87 - * $Id$
88 - */
89 -
90 -+#include <unistd.h>
91 - #include <stdio.h>
92 - #include <string.h>
93 - #include <err.h>
94 -@@ -37,56 +38,91 @@
95 - #include <fcntl.h>
96 - #include <stdlib.h>
97 - #include <sysexits.h>
98 -+#include <libgen.h>
99 -
100 --static int get_pid_of_process(char *process_name);
101 -+static int get_pid_of_process(const char *process_name);
102 - static void usage(void);
103 -
104 -+static int match_argv;
105 -+static pid_t own_pid;
106 -+
107 - static int
108 --get_pid_of_process(char *process_name)
109 -+get_pid_of_process(const char *process_name)
110 - {
111 - static kvm_t *kd = NULL;
112 - struct kinfo_proc *p;
113 -- int i, n_processes, processes_found;
114 --
115 -- processes_found = 0;
116 -+ int i, n_processes,
117 -+ processes_found = 0;
118 -
119 - if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open")) == NULL)
120 - (void)errx(1, "%s", kvm_geterr(kd));
121 - else {
122 - p = kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_processes);
123 -- for (i = 0; i<n_processes; i++)
124 -- if (strncmp(process_name, p[i].ki_comm, COMMLEN+1) == 0) {
125 -- (void)printf("%d ", (int)p[i].ki_pid);
126 -- processes_found++;
127 -- }
128 -+ for (i = 0; i<n_processes; i++) {
129 -+ if (p[i].ki_pid != own_pid)
130 -+ if (strncmp(process_name, p[i].ki_comm, COMMLEN+1) == 0) {
131 -+ (void)printf("%d ", (int)p[i].ki_pid);
132 -+ processes_found++;
133 -+ } else if (match_argv == 1) {
134 -+ char **p_argv = NULL;
135 -+
136 -+ if ((p_argv = kvm_getargv(kd, p+i, 0)) != NULL)
137 -+ for (; *p_argv != NULL; p_argv++)
138 -+ if (strcmp(process_name, basename(*p_argv)) == 0) {
139 -+ (void)printf("%d ", (int)p[i].ki_pid);
140 -+ processes_found++;
141 -+ break;
142 -+ }
143 -+ }
144 -+ }
145 -
146 - kvm_close(kd);
147 - }
148 --
149 -- return processes_found;
150 -+
151 -+ return (processes_found);
152 - }
153 -
154 - static void
155 - usage()
156 - {
157 -
158 -- (void)fprintf(stderr, "usage: pidof name1 name2 ...\n");
159 -+ (void)fprintf(stderr, "usage: pidof [-x] name1 name2 ...\n");
160 - exit(EX_USAGE);
161 - }
162 -
163 - int
164 - main(int argc, char **argv)
165 - {
166 -- int i, procs_found;
167 -+ int i, procs_found,
168 -+ ch;
169 -
170 - procs_found = 0;
171 -+ match_argv = 0;
172 -
173 -- if (argc <= 1)
174 -- usage();
175 -+ own_pid = getpid();
176 -+
177 -+ while ((ch = getopt(argc, argv, "x")) != -1) {
178 -+ switch (ch) {
179 -+ case 'x':
180 -+ match_argv = 1;
181 -+ break;
182 -+ case '?':
183 -+ default:
184 -+ usage();
185 -+ break;
186 -+ }
187 -+ }
188 -+ argc -= optind;
189 -+ argv += optind;
190 -
191 -- for (i = 1; i<argc; procs_found += get_pid_of_process(argv[i++]));
192 -+ if (argc < 1)
193 -+ usage();
194 -+
195 -+ for (i = 0; i<argc; i++) {
196 -+ procs_found += get_pid_of_process(argv[i]);
197 -+ }
198 -
199 - (void)printf("\n");
200 -
201 -- return (procs_found > 0) ? 0 : 1;
202 -+ return ((procs_found > 0) ? 0 : 1);
203 - }
204
205 diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-pname.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-pname.patch
206 deleted file mode 100644
207 index 13e890c6a37..00000000000
208 --- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-pname.patch
209 +++ /dev/null
210 @@ -1,46 +0,0 @@
211 ---- a/pidof.c 2006-09-21 15:14:03 +0100
212 -+++ b/pidof.c 2006-09-21 15:13:47 +0100
213 -@@ -53,14 +53,22 @@
214 - struct kinfo_proc *p;
215 - int i, n_processes,
216 - processes_found = 0;
217 -+ char *pname = NULL;
218 -+
219 -+ if (process_name == NULL)
220 -+ return 0;
221 -+
222 -+ if ((pname = strdup(basename(process_name))) == NULL)
223 -+ return 0;
224 -
225 -- if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open")) == NULL)
226 -- (void)errx(1, "%s", kvm_geterr(kd));
227 -- else {
228 -+ if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, NULL)) == NULL) {
229 -+ free(pname);
230 -+ (void)errx(1, "%s", kvm_geterr(kd));
231 -+ } else {
232 - p = kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_processes);
233 - for (i = 0; i<n_processes; i++) {
234 - if (p[i].ki_pid != own_pid)
235 -- if (strncmp(process_name, p[i].ki_comm, COMMLEN+1) == 0) {
236 -+ if (strncmp(pname, p[i].ki_comm, COMMLEN+1) == 0) {
237 - (void)printf("%d ", (int)p[i].ki_pid);
238 - processes_found++;
239 - } else if (match_argv == 1) {
240 -@@ -68,7 +76,7 @@
241 -
242 - if ((p_argv = kvm_getargv(kd, p+i, 0)) != NULL)
243 - if ( *p_argv != NULL )
244 -- if (strcmp(process_name, basename(*p_argv)) == 0) {
245 -+ if (strcmp(pname, basename(*p_argv)) == 0) {
246 - (void)printf("%d ", (int)p[i].ki_pid);
247 - processes_found++;
248 - break;
249 -@@ -77,6 +85,7 @@
250 - }
251 -
252 - kvm_close(kd);
253 -+ free(pname);
254 - }
255 -
256 - return (processes_found);
257
258 diff --git a/sys-process/pidof-bsd/metadata.xml b/sys-process/pidof-bsd/metadata.xml
259 deleted file mode 100644
260 index 6f49eba8f49..00000000000
261 --- a/sys-process/pidof-bsd/metadata.xml
262 +++ /dev/null
263 @@ -1,5 +0,0 @@
264 -<?xml version="1.0" encoding="UTF-8"?>
265 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
266 -<pkgmetadata>
267 -<!-- maintainer-needed -->
268 -</pkgmetadata>
269
270 diff --git a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild b/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild
271 deleted file mode 100644
272 index cc88235d196..00000000000
273 --- a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild
274 +++ /dev/null
275 @@ -1,33 +0,0 @@
276 -# Copyright 1999-2019 Gentoo Authors
277 -# Distributed under the terms of the GNU General Public License v2
278 -
279 -EAPI=5
280 -inherit bsdmk
281 -
282 -DESCRIPTION="pidof(1) utility for *BSD"
283 -HOMEPAGE="https://people.freebsd.org/~novel/pidof.html"
284 -SRC_URI="mirror://gentoo/${P}.tar.gz"
285 -
286 -LICENSE="BSD"
287 -SLOT="0"
288 -KEYWORDS=""
289 -IUSE=""
290 -
291 -DEPEND="sys-freebsd/freebsd-mk-defs"
292 -RDEPEND="!sys-process/psmisc"
293 -
294 -S="${WORKDIR}/pidof"
295 -
296 -PATCHES=( "${FILESDIR}/${P}-gfbsd.patch"
297 - "${FILESDIR}/${P}-firstarg.patch"
298 - "${FILESDIR}/${P}-pname.patch"
299 - "${FILESDIR}/${P}-fbsd11.patch" )
300 -
301 -src_prepare() {
302 - epatch "${PATCHES[@]}"
303 -}
304 -
305 -src_install() {
306 - into /
307 - dobin pidof
308 -}