diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-10 13:21:36 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-10 13:21:36 +0000 |
commit | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch) | |
tree | 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /sys-process/pidof-bsd | |
parent | bd4aeefe33e63f613512604e47bfca7b2187697d (diff) |
gentoo resync : 10.11.2019
Diffstat (limited to 'sys-process/pidof-bsd')
-rw-r--r-- | sys-process/pidof-bsd/Manifest | 7 | ||||
-rw-r--r-- | sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch | 14 | ||||
-rw-r--r-- | sys-process/pidof-bsd/files/pidof-bsd-20050501-firstarg.patch | 13 | ||||
-rw-r--r-- | sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch | 128 | ||||
-rw-r--r-- | sys-process/pidof-bsd/files/pidof-bsd-20050501-pname.patch | 46 | ||||
-rw-r--r-- | sys-process/pidof-bsd/metadata.xml | 5 | ||||
-rw-r--r-- | sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild | 33 |
7 files changed, 0 insertions, 246 deletions
diff --git a/sys-process/pidof-bsd/Manifest b/sys-process/pidof-bsd/Manifest deleted file mode 100644 index 990077814254..000000000000 --- a/sys-process/pidof-bsd/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX pidof-bsd-20050501-fbsd11.patch 252 BLAKE2B 7e915a58cd01f1939e56c7d900c873689cae09894747ea6fa6b42ea758c71d6f5432453ca1ed5e0312574d86dd61516555cc3f6a9f08991898d435d5d84f5bf7 SHA512 32c19975f2bc14e809a0416c52418416c9cfba62ed5bbda69b2773dd1dc931b7b2740054bf70f590403692f1944463e7cc6bef2dfc050d93bc5c7bc9f59559c3 -AUX pidof-bsd-20050501-firstarg.patch 485 BLAKE2B 669d832cbe90d0ec716fa9b544b9ae77318db132ee1434d208e992b6e3f3576b1b134e83b6bce6c903fcc6a5402cdf674a6c4198519ca6325bd1c9716797e9f8 SHA512 c7dd9d9c7d2d90c41b0c612284c9f23990e11d598ee6815480b2a31c2910703030511077781e9fc24e5054cc88fc6c50b6bf8eae1a9141a671f78c1be3cf9f09 -AUX pidof-bsd-20050501-gfbsd.patch 2825 BLAKE2B 48972ae404a5f0da4eb73d4a203879625305d351b2b2a759ce50f1ec33d746765329dc41dfd377e2d046c90c5ad591e0947d5ab5584c604cd49315975d76df4d SHA512 459bc1bb1452067207082c2b55ba86e47cb5a683cbc2ddf8b10545d8e961a0a8d9f5bba34236e150e391056364a4115be975b30e34df4c3dc82ed16bdad981a9 -AUX pidof-bsd-20050501-pname.patch 1374 BLAKE2B 3af207c7370141f6ddda3083902735bd0eb78c339540ece462d6ba7533c30e9978d4789fb624ac2cba971b10f5aff6004b198ab00539a84630c598fe9fb8c46d SHA512 5f3912a0f48db867181def6a6bb36f3544b069be89af0d0290d073f7d92041abda449c8b84694fed45e1d35a50bfa4bd157d695ab166fb61cc3b6c8d99e5f417 -DIST pidof-bsd-20050501.tar.gz 1769 BLAKE2B 6f64d23913e08adc52eef5550becb7f54a1eab805e1a7fe7883632756647bb633d617486fb7a4fa09459d32cdcfb09f41b5c157cc877a71fb07744e2cfced562 SHA512 27691305165848363415a7d487b36a87db0750a9c08e6327eef05f5e87326c91fbf46c415673f83268981a22bbfcfaaf5ef280c06c24b3ebb50d1483527f9c94 -EBUILD pidof-bsd-20050501-r4.ebuild 622 BLAKE2B 6089385eab27a2d962756445bf007d5ab68d62e8bba93e7af8b931e324d9c3ddb6d7b890174aae8ef38a2361bbe5b3eecfcbbce29e0a7a621be6190a574b7db2 SHA512 06cbad4e0531a16ffa83ae5d7ac8ccf9f951057476b32bc3a4b5b6096e28e969e23148ebb050310226bb311011082945980df2444d558f3b9d543a4a2f579880 -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch deleted file mode 100644 index 4a1b16285205..000000000000 --- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/pidof/Makefile b/pidof/Makefile -index d2d760b..67d2725 100644 ---- a/pidof/Makefile -+++ b/pidof/Makefile -@@ -2,8 +2,7 @@ - - PROG= pidof - SRCS= pidof.c --NOMAN= yes -+NO_MAN= yes - LDADD= -lkvm --LINKS= ${BINDIR}/pidof - - .include <bsd.prog.mk> diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-firstarg.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-firstarg.patch deleted file mode 100644 index dfb15ae7b94b..000000000000 --- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-firstarg.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pidof/pidof.c -=================================================================== ---- pidof.orig/pidof.c -+++ pidof/pidof.c -@@ -67,7 +67,7 @@ get_pid_of_process(const char *process_n - char **p_argv = NULL; - - if ((p_argv = kvm_getargv(kd, p+i, 0)) != NULL) -- for (; *p_argv != NULL; p_argv++) -+ if ( *p_argv != NULL ) - if (strcmp(process_name, basename(*p_argv)) == 0) { - (void)printf("%d ", (int)p[i].ki_pid); - processes_found++; diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch deleted file mode 100644 index bb7a776b630d..000000000000 --- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch +++ /dev/null @@ -1,128 +0,0 @@ -? .pidof.c.swp -? pidof -? pidof.core -Index: pidof.c -=================================================================== -RCS file: /cvsroot/bmp-plugins/pidof/pidof.c,v -retrieving revision 1.4 -diff -u -r1.4 pidof.c ---- pidof.c 1 May 2005 16:26:19 -0000 1.4 -+++ pidof.c 13 Sep 2005 16:11:08 -0000 -@@ -26,6 +26,7 @@ - * $Id$ - */ - -+#include <unistd.h> - #include <stdio.h> - #include <string.h> - #include <err.h> -@@ -37,56 +38,91 @@ - #include <fcntl.h> - #include <stdlib.h> - #include <sysexits.h> -+#include <libgen.h> - --static int get_pid_of_process(char *process_name); -+static int get_pid_of_process(const char *process_name); - static void usage(void); - -+static int match_argv; -+static pid_t own_pid; -+ - static int --get_pid_of_process(char *process_name) -+get_pid_of_process(const char *process_name) - { - static kvm_t *kd = NULL; - struct kinfo_proc *p; -- int i, n_processes, processes_found; -- -- processes_found = 0; -+ int i, n_processes, -+ processes_found = 0; - - if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open")) == NULL) - (void)errx(1, "%s", kvm_geterr(kd)); - else { - p = kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_processes); -- for (i = 0; i<n_processes; i++) -- if (strncmp(process_name, p[i].ki_comm, COMMLEN+1) == 0) { -- (void)printf("%d ", (int)p[i].ki_pid); -- processes_found++; -- } -+ for (i = 0; i<n_processes; i++) { -+ if (p[i].ki_pid != own_pid) -+ if (strncmp(process_name, p[i].ki_comm, COMMLEN+1) == 0) { -+ (void)printf("%d ", (int)p[i].ki_pid); -+ processes_found++; -+ } else if (match_argv == 1) { -+ char **p_argv = NULL; -+ -+ if ((p_argv = kvm_getargv(kd, p+i, 0)) != NULL) -+ for (; *p_argv != NULL; p_argv++) -+ if (strcmp(process_name, basename(*p_argv)) == 0) { -+ (void)printf("%d ", (int)p[i].ki_pid); -+ processes_found++; -+ break; -+ } -+ } -+ } - - kvm_close(kd); - } -- -- return processes_found; -+ -+ return (processes_found); - } - - static void - usage() - { - -- (void)fprintf(stderr, "usage: pidof name1 name2 ...\n"); -+ (void)fprintf(stderr, "usage: pidof [-x] name1 name2 ...\n"); - exit(EX_USAGE); - } - - int - main(int argc, char **argv) - { -- int i, procs_found; -+ int i, procs_found, -+ ch; - - procs_found = 0; -+ match_argv = 0; - -- if (argc <= 1) -- usage(); -+ own_pid = getpid(); -+ -+ while ((ch = getopt(argc, argv, "x")) != -1) { -+ switch (ch) { -+ case 'x': -+ match_argv = 1; -+ break; -+ case '?': -+ default: -+ usage(); -+ break; -+ } -+ } -+ argc -= optind; -+ argv += optind; - -- for (i = 1; i<argc; procs_found += get_pid_of_process(argv[i++])); -+ if (argc < 1) -+ usage(); -+ -+ for (i = 0; i<argc; i++) { -+ procs_found += get_pid_of_process(argv[i]); -+ } - - (void)printf("\n"); - -- return (procs_found > 0) ? 0 : 1; -+ return ((procs_found > 0) ? 0 : 1); - } diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-pname.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-pname.patch deleted file mode 100644 index 13e890c6a37c..000000000000 --- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-pname.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/pidof.c 2006-09-21 15:14:03 +0100 -+++ b/pidof.c 2006-09-21 15:13:47 +0100 -@@ -53,14 +53,22 @@ - struct kinfo_proc *p; - int i, n_processes, - processes_found = 0; -+ char *pname = NULL; -+ -+ if (process_name == NULL) -+ return 0; -+ -+ if ((pname = strdup(basename(process_name))) == NULL) -+ return 0; - -- if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open")) == NULL) -- (void)errx(1, "%s", kvm_geterr(kd)); -- else { -+ if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, NULL)) == NULL) { -+ free(pname); -+ (void)errx(1, "%s", kvm_geterr(kd)); -+ } else { - p = kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_processes); - for (i = 0; i<n_processes; i++) { - if (p[i].ki_pid != own_pid) -- if (strncmp(process_name, p[i].ki_comm, COMMLEN+1) == 0) { -+ if (strncmp(pname, p[i].ki_comm, COMMLEN+1) == 0) { - (void)printf("%d ", (int)p[i].ki_pid); - processes_found++; - } else if (match_argv == 1) { -@@ -68,7 +76,7 @@ - - if ((p_argv = kvm_getargv(kd, p+i, 0)) != NULL) - if ( *p_argv != NULL ) -- if (strcmp(process_name, basename(*p_argv)) == 0) { -+ if (strcmp(pname, basename(*p_argv)) == 0) { - (void)printf("%d ", (int)p[i].ki_pid); - processes_found++; - break; -@@ -77,6 +85,7 @@ - } - - kvm_close(kd); -+ free(pname); - } - - return (processes_found); diff --git a/sys-process/pidof-bsd/metadata.xml b/sys-process/pidof-bsd/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/sys-process/pidof-bsd/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild b/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild deleted file mode 100644 index cc88235d1961..000000000000 --- a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit bsdmk - -DESCRIPTION="pidof(1) utility for *BSD" -HOMEPAGE="https://people.freebsd.org/~novel/pidof.html" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="" - -DEPEND="sys-freebsd/freebsd-mk-defs" -RDEPEND="!sys-process/psmisc" - -S="${WORKDIR}/pidof" - -PATCHES=( "${FILESDIR}/${P}-gfbsd.patch" - "${FILESDIR}/${P}-firstarg.patch" - "${FILESDIR}/${P}-pname.patch" - "${FILESDIR}/${P}-fbsd11.patch" ) - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_install() { - into / - dobin pidof -} |