From: Michael Tremer Date: Sun, 2 Oct 2016 19:51:32 +0000 (-0400) Subject: procps: Drop package X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc2bd2f13d1c2be8bf1202c168d5f511461d2987;p=ipfire-3.x.git procps: Drop package This was replaced by procps-ng quite a while ago Signed-off-by: Michael Tremer --- diff --git a/procps/patches/procps-3.2.8-selinux.patch b/procps/patches/procps-3.2.8-selinux.patch deleted file mode 100644 index a8c1f742c..000000000 --- a/procps/patches/procps-3.2.8-selinux.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/Makefile b/Makefile -index 09fb3ed..4d05900 100644 ---- a/Makefile -+++ b/Makefile -@@ -73,12 +73,12 @@ CURSES := -lncurses - # Something like this is probably needed to make the SE Linux - # library loading not conflict with embedded systems stuff. - # --#ifeq ($(SHARED),1) --#ldl := -ldl --#LIBTYPE := -DSHAREDLIB --#else --#LIBTYPE := -DSTATICLIB --#endif -+ifeq ($(SHARED),1) -+ldl := -ldl -+LIBTYPE := -DSHAREDLIB -+else -+LIBTYPE := -DSTATICLIB -+endif - - # Preprocessor flags. - PKG_CPPFLAGS := -D_GNU_SOURCE -I proc -@@ -103,7 +103,7 @@ PKG_CFLAGS := -fno-common -ffast-math \ - # Note that some stuff below is conditional on CFLAGS containing - # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.) - CFLAGS := -O2 -s --ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) -+ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) $(LIBTYPE) - - PKG_LDFLAGS := -Wl,-warn-common - LDFLAGS := -diff --git a/ps/output.c b/ps/output.c -index 87bf9de..edbb4cb 100644 ---- a/ps/output.c -+++ b/ps/output.c -@@ -1099,7 +1099,7 @@ static int pr_sgi_p(char *restrict const outbuf, const proc_t *restrict const pp - return snprintf(outbuf, COLWID, "*"); - } - -- -+#ifdef STATICLIB - /****************** FLASK & seLinux security stuff **********************/ - // move the bulk of this to libproc sometime - -@@ -1131,7 +1131,7 @@ fail: - return 1; - } - --#if 0 -+#else - // This needs more study, considering: - // 1. the static linking option (maybe disable this in that case) - // 2. the -z and -Z option issue -diff --git a/ps/parser.c b/ps/parser.c -index 5ad9035..2659d4d 100644 ---- a/ps/parser.c -+++ b/ps/parser.c -@@ -231,7 +231,7 @@ static const char *parse_sysv_option(void){ - // In the meantime, please do not add to it. The list is - // intended to ONLY contain flags defined by the POSIX and UNIX - // standards published by The Open Group, IEEE, and ISO. -- if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX -+ if(!strchr("aAdefgGlnoptuUZ", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX - - switch(*flagptr){ - case 'A': -diff --git a/ps/ps.1 b/ps/ps.1 -index 64953d5..aab2584 100644 ---- a/ps/ps.1 -+++ b/ps/ps.1 -@@ -450,6 +450,9 @@ display virtual memory format - Do not show flags; show rss in place of addr. - This option can only be used with \fB\-l\fR. - -+.opt \-Z -+display security context format (SELinux, etc.) -+ - .opt \-\-format \ format - user\-defined format. Identical to \fB\-o\fR and \fBo\fR. - -diff --git a/w.c b/w.c -index 1b2a0fc..207a8a1 100644 ---- a/w.c -+++ b/w.c -@@ -163,6 +163,10 @@ static const proc_t *getproc(const utmp_t *restrict const u, const char *restric - if(best && tmp->start_time <= best->start_time) continue; - best = tmp; - } -+ /* It is there but SELinux wouldn't allow us to know the detail. Really -+ w should just be given rights */ -+ if(!kill(u->ut_pid, 0) || errno != ESRCH) -+ *found_utpid = 1; - return best ? best : secondbest; - } - diff --git a/procps/patches/procps-3.2.8-watch_unicode-2.patch b/procps/patches/procps-3.2.8-watch_unicode-2.patch deleted file mode 100644 index bfc78d3af..000000000 --- a/procps/patches/procps-3.2.8-watch_unicode-2.patch +++ /dev/null @@ -1,148 +0,0 @@ -Submitted By: Matt Burgess -Date: 2009-05-11 -Initial Package Version: 3.2.8 -Upstream Status: Submitted -Origin: http://wiki.linuxfromscratch.org/lfs/ticket/2113 -Description: Fixes a unicode related bug in the watch program - -diff -Naur procps-3.2.8.orig/Makefile procps-3.2.8/Makefile ---- procps-3.2.8.orig/Makefile 2009-05-10 18:50:48.000000000 +0000 -+++ procps-3.2.8/Makefile 2009-05-12 19:06:50.000000000 +0000 -@@ -67,7 +67,7 @@ - # plus the top-level Makefile to make it work stand-alone. - _TARFILES := Makefile - --CURSES := -lncurses -+CURSES := -lncursesw - - # This seems about right for the dynamic library stuff. - # Something like this is probably needed to make the SE Linux -diff -Naur procps-3.2.8.orig/watch.c procps-3.2.8/watch.c ---- procps-3.2.8.orig/watch.c 2007-05-28 03:13:23.000000000 +0000 -+++ procps-3.2.8/watch.c 2009-05-12 19:17:25.000000000 +0000 -@@ -25,6 +25,8 @@ - #include - #include - #include "proc/procps.h" -+#include -+#include - - #ifdef FORCE_8BIT - #undef isprint -@@ -134,6 +136,27 @@ - } - } - -+static wint_t -+readwc(FILE *stream, mbstate_t *mbs) -+{ -+ for (;;) { -+ int chr; -+ char c; -+ wchar_t wc; -+ size_t len; -+ -+ chr = getc(stream); -+ if (chr == EOF) -+ return WEOF; -+ c = chr; -+ len = mbrtowc(&wc, &c, 1, mbs); -+ if (len == (size_t)-1) -+ memset(mbs, 0, sizeof(*mbs)); -+ else if (len != (size_t)-2) -+ return wc; -+ } -+} -+ - int - main(int argc, char *argv[]) - { -@@ -239,6 +262,7 @@ - FILE *p; - int x, y; - int oldeolseen = 1; -+ mbstate_t mbs; - - if (screen_size_changed) { - get_terminal_size(); -@@ -266,49 +290,65 @@ - do_exit(2); - } - -+ memset(&mbs, 0, sizeof(mbs)); - for (y = show_title; y < height; y++) { - int eolseen = 0, tabpending = 0; - for (x = 0; x < width; x++) { -- int c = ' '; -- int attr = 0; -+ wint_t c = L' '; -+ int attr = 0, c_width; -+ cchar_t cc; -+ wchar_t wstr[2]; - - if (!eolseen) { - /* if there is a tab pending, just spit spaces until the - next stop instead of reading characters */ - if (!tabpending) - do -- c = getc(p); -- while (c != EOF && !isprint(c) -- && c != '\n' -- && c != '\t'); -- if (c == '\n') -+ c = readwc(p, &mbs); -+ while (c != WEOF && !iswprint(c) -+ && c != L'\n' -+ && c != L'\t'); -+ if (c == L'\n') - if (!oldeolseen && x == 0) { - x = -1; - continue; - } else - eolseen = 1; -- else if (c == '\t') -+ else if (c == L'\t') - tabpending = 1; -- if (c == EOF || c == '\n' || c == '\t') -- c = ' '; -+ if (c == WEOF || c == L'\n' || c == L'\t') -+ c = L' '; - if (tabpending && (((x + 1) % 8) == 0)) - tabpending = 0; - } -+ wstr[0] = c; -+ wstr[1] = 0; -+ setcchar (&cc, wstr, 0, 0, NULL); - move(y, x); - if (option_differences) { -- chtype oldch = inch(); -- char oldc = oldch & A_CHARTEXT; -+ cchar_t oldc; -+ wchar_t oldwstr[2]; -+ attr_t attrs; -+ short colors; -+ -+ in_wch(&oldc); -+ getcchar(&oldc, oldwstr, &attrs, &colors, NULL); - attr = !first_screen -- && ((char)c != oldc -+ && (wstr[0] != oldwstr[0] - || - (option_differences_cumulative -- && (oldch & A_ATTRIBUTES))); -+ && attrs)); - } - if (attr) - standout(); -- addch(c); -+ add_wch(&cc); -+ - if (attr) - standend(); -+ c_width = wcwidth(c); -+ if (c_width > 1) -+ x += c_width - 1; -+ - } - oldeolseen = eolseen; - } diff --git a/procps/procps.nm b/procps/procps.nm deleted file mode 100644 index 817a4f1e5..000000000 --- a/procps/procps.nm +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team # -############################################################################### - -name = procps -version = 3.2.8 -release = 4 - -groups = Applications/System -url = http://procps.sourceforge.net/ -license = GPLv2+ and LGPLv2+ -summary = System and process monitoring utilities. - -description - The procps package contains a set of system utilities that provide - system information. Procps includes ps, free, skill, pkill, pgrep, - snice, tload, top, uptime, vmstat, w, watch and pdwx. -end - -source_dl = - -build - requires - libselinux-devel - ncurses-devel - end - - make_build_targets += \ - SHARED=1 \ - CFLAGS="%{CFLAGS}" \ - W_SHOWFROM=-DW_SHOWFROM - - make_install_targets += \ - SKIP="/bin/kill /usr/share/man/man1/kill.1" - - install_cmds - chmod -R 755 %{BUILDROOT}/{bin,%{lib},sbin} - end -end - -packages - package %{name} - groups += Base - end - - package %{name}-debuginfo - template DEBUGINFO - end -end