Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f21aa928bcb2342afc8fa76c7d8216ec9ec983b
commit 6f21aa928bcb2342afc8fa76c7d8216ec9ec983b Author: crazy <[email protected]> Date: Fri Dec 23 16:18:39 2016 +0100 procps-ng-3.3.12-1-x86_64 * replaces procps , stuff start to want the lib diff --git a/source/base/procps-ng/FrugalBuild b/source/base/procps-ng/FrugalBuild new file mode 100644 index 0000000..7ad3ea5 --- /dev/null +++ b/source/base/procps-ng/FrugalBuild @@ -0,0 +1,40 @@ +# Compiling Time: 0.06 SBU +# Maintainer: James Buren <[email protected]> +# Contributor: Miklos Vajna <[email protected]> + +pkgname=procps-ng +pkgver=3.3.12 +pkgrel=1 +pkgdesc="utilities for displaying process information" +url="https://gitlab.com/procps-ng/procps"; +depends=('ncurses>=6.0-12') +groups=('base' 'core') +archs=('x86_64') +backup=('etc/sysctl.conf') +up2date="lynx -dump https://sourceforge.net/projects/procps-ng/files/Production/ | grep 'latest version' | sed 's/.*-ng-\(.*\).tar.*/\1/'" +source=(https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-$pkgver.tar.xz) +options+=('static') +sha1sums=('82c0745f150f1385ca01fe7d24f05f74e31c94c6') + +replaces=('procps') +provides=('procps') +conflicts=('procps') + +build() +{ + Fsed '^\([^#]\)' '#\1' sysctl.conf + Fbuild --enable-wide-percent --disable-modern-top ## lol @ that is red and weird + Fmkdir etc/sysctl.d + ### systemd 207++ just uses files from /etc/sysctl.d + Ffilerel /etc/sysctl.conf + ## use a symlink since some apps may stillw ant to read /etc/sysctl.conf + Fln /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf +## just KERN_CRIT messages go to tty/console +cat > $Fdestdir/etc/sysctl.d/20-printk-be-quiet.conf << EOF +kernel.printk = 2 2 2 2 +EOF + + +} + +# optimization ok diff --git a/source/base/procps/FrugalBuild b/source/base/procps/FrugalBuild deleted file mode 100644 index dc457cb..0000000 --- a/source/base/procps/FrugalBuild +++ /dev/null @@ -1,55 +0,0 @@ -# Compiling Time: 0.06 SBU -# Maintainer: James Buren <[email protected]> -# Contributor: Miklos Vajna <[email protected]> - -pkgname=procps -pkgver=3.2.8 -pkgrel=14 -pkgdesc="utilities for displaying process information" -url="http://procps.sf.net"; -depends=('ncurses>=6.0-12') -groups=('base' 'core') -archs=('x86_64') -backup=('etc/sysctl.conf') -up2date="lynx -dump http://procps.sourceforge.net/ |grep 'latest release'|cut -d - -f 2|sed 's/.tar.gz.//'|cut -d ' ' -f 1" -source=(http://procps.sourceforge.net/procps-$pkgver.tar.gz \ - procps-3.2.5-top-sort.patch procps-3.2.8-make.patch procps-3.2.8-constructor-order.patch \ - procps-3.2.7-ps-cgroup.patch procps-3.2.8-ps-cgroup-suppress-root-group.patch \ - procps-3.2.8-kernel3-uts.patch) -options+=('static') -sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829' \ - 'ad7782f3f4d118fa67c667d611a1eb2f4c736808' \ - '4a67774ef9b37a8d2e2571ac4fc90aa3aa212852' \ - '39b2fdc7cfe60f35f8c9570413e5e955318de5cd' \ - 'f4321158ff2e7c0c3ab99d71bc54e148c6b85afb' \ - 'e9970d940f99b10a721422d5f166a0afe8ff797f' \ - 'e2b2917e5462bd0aa3cb1b62942dbe8e8e81c16b') - -build() -{ - Fsed '^\(CFLAGS :=\).*' "\1 $CFLAGS" Makefile - Fsed '^\(ldconfig :=\) .*' '\1 true' Makefile - Fsed '\$(lib64)' 'lib' Makefile - Fsed '^\([^#]\)' '#\1' sysctl.conf - Fbuild - Fmkdir etc/sysctl.d - Ffilerel proc/*.h /usr/include/proc/ - make -f proc/module.mk libproc.a || return 1 - Ffilerel proc/libproc.a /usr/lib/libproc.a - ### systemd 207++ just uses files from /etc/sysctl.d - Ffilerel /etc/sysctl.conf - ## use a symlink since some apps may stillw ant to read /etc/sysctl.conf - Fln /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf -## just KERN_CRIT messages go to tty/console -cat > $Fdestdir/etc/sysctl.d/20-printk-be-quiet.conf << EOF -kernel.printk = 2 2 2 2 -EOF - -## workaround for systemd bug #2691 -#cat > $Fdestdir/etc/sysctl.d/50-coredump.conf << EOF -#kernel.core_pattern = core -#EOF - -} - -# optimization ok diff --git a/source/base/procps/procps-3.2.5-top-sort.patch b/source/base/procps/procps-3.2.5-top-sort.patch deleted file mode 100644 index b160bcc..0000000 --- a/source/base/procps/procps-3.2.5-top-sort.patch +++ /dev/null @@ -1,39 +0,0 @@ -Under certain conditions, top's display can break. -This patch is by Curtis Doty, updated by Andreas Kling for 3.2.5. - -To reproduce bug: - - run top - - turn on color mode ('z') - - highlight sort column ('x') - - move sort column all the way to the left ('<') - - get drunk - -procps e-mail: http://sourceforge.net/mailarchive/forum.php?thread_id=6042978&forum_id=12454 -Redhat bug: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=140975 -Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=80296 - ---- procps-3.2.5/top.c~ 2005-01-26 06:15:18.000000000 +0100 -+++ procps-3.2.5/top.c 2005-02-01 09:23:35.000000000 +0100 -@@ -2952,12 +2952,10 @@ - for (x = 0; x < q->maxpflgs; x++) { - char cbuf[ROWBUFSIZ], _z[ROWBUFSIZ]; - FLG_t i = q->procflags[x]; // support for our field/column -- const char *f = Fieldstab[i].fmts; // macro AND sometimes the fmt -+ const char *f = Fieldstab[i].fmts + ((x==0) && !Rc.mode_altscr); - unsigned s = Fieldstab[i].scale; // string must be altered ! - unsigned w = Fieldstab[i].width; - -- int advance = (x==0) && !Rc.mode_altscr; -- - switch (i) { - case P_CMD: - { char tmp[ROWBUFSIZ]; -@@ -3069,7 +3067,7 @@ - - } /* end: switch 'procflag' */ - -- rp = scat(rp, cbuf+advance); -+ rp = scat(rp, cbuf); - } /* end: for 'maxpflgs' */ - - PUFF( diff --git a/source/base/procps/procps-3.2.7-ps-cgroup.patch b/source/base/procps/procps-3.2.7-ps-cgroup.patch deleted file mode 100644 index 69a86fa..0000000 --- a/source/base/procps/procps-3.2.7-ps-cgroup.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/ps/output.c b/ps/output.c -index 87bf9de..b3cf257 100644 ---- a/ps/output.c -+++ b/ps/output.c -@@ -204,6 +204,39 @@ int pr_nop(char *restrict const outbuf, const proc_t *restrict const pp){ - return snprintf(outbuf, COLWID, "%c", '-'); - } - -+static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){ -+ char filename[48]; -+ FILE *fd; -+ int counter = 0; -+ int c; -+ int is_cgroup = 0; -+ -+ outbuf[0]='\0'; -+ snprintf(filename, sizeof filename, "/proc/%d/cgroup", pp->tgid); -+ fd = fopen(filename, "r"); -+ if (likely(fd == NULL)) goto fail; -+ while (( (c = fgetc(fd)) != EOF) && (counter<665)) { -+ if (is_cgroup == 0) { -+ if (c == ':') { -+ is_cgroup = 1; -+ if (counter>0) -+ outbuf[counter++]=';'; -+ } -+ }else -+ if ((c == '\n') || (c == '\0')) -+ is_cgroup = 0; -+ else -+ outbuf[counter++]=c; -+ } -+ outbuf[counter]='\0'; -+ close(fd); -+ if (counter>0) -+ return counter; -+fail: -+ outbuf[0] = '-'; -+ outbuf[1] = '\0'; -+ return 1; -+} - - /********* Unix 98 ************/ - -@@ -1293,6 +1326,7 @@ static const format_struct format_array[] = { - {"bsdtime", "TIME", pr_bsdtime, sr_nop, 6, 0, LNX, ET|RIGHT}, - {"c", "C", pr_c, sr_pcpu, 2, 0, SUN, ET|RIGHT}, - {"caught", "CAUGHT", pr_sigcatch, sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigcatch*/ -+{"cgroup", "CGROUP", pr_cgroup, sr_nop, 35, 0, LNX, PO|LEFT}, /* cgroups*/ - {"class", "CLS", pr_class, sr_sched, 3, 0, XXX, TO|LEFT}, - {"cls", "CLS", pr_class, sr_sched, 3, 0, HPU, TO|RIGHT}, /*says HPUX or RT*/ - {"cmaj_flt", "-", pr_nop, sr_cmaj_flt, 1, 0, LNX, AN|RIGHT}, -diff --git a/ps/ps.1 b/ps/ps.1 -index 64953d5..0a5f6f3 100644 ---- a/ps/ps.1 -+++ b/ps/ps.1 -@@ -904,6 +904,10 @@ width of the field, a 32 or 64 bits mask in hexadecimal format is - displayed. (alias\ \fBsig_catch\fR,\ \fBsigcatch\fR). - T} - -+cgroup CGROUP T{ -+display control groups to which the process belonges. -+t} -+ - class CLS T{ - scheduling class of the process. (alias\ \fBpolicy\fR,\ \fBcls\fR). - Field's possible values are: diff --git a/source/base/procps/procps-3.2.8-constructor-order.patch b/source/base/procps/procps-3.2.8-constructor-order.patch deleted file mode 100644 index 39e3a1f..0000000 --- a/source/base/procps/procps-3.2.8-constructor-order.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: Call libproc constructors in strict order - Having one constructor depend on another means if the order is reversed - you get a different result. Patched based on idea by Tom Evans. -Bug-Debian: http://bugs.debian.org/460331 -Author: Craig Small <[email protected]> -Further modifications from Fedora: Jan Görig <[email protected]> ---- a/proc/sysinfo.c -+++ b/proc/sysinfo.c -@@ -213,6 +213,7 @@ - static void init_libproc(void) __attribute__((constructor)); - static void init_libproc(void){ - have_privs = check_for_privs(); -+ init_Linux_version(); /* Must be called before we check code */ - // ought to count CPUs in /proc/stat instead of relying - // on glibc, which foolishly tries to parse /proc/cpuinfo - // ---- a/proc/version.c -+++ b/proc/version.c -@@ -33,8 +33,7 @@ - - int linux_version_code; - --static void init_Linux_version(void) __attribute__((constructor)); --static void init_Linux_version(void) { -+void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ - ---- a/proc/version.h -+++ b/proc/version.h -@@ -14,6 +14,7 @@ - - EXTERN_C_BEGIN - -+void init_Linux_version(void); /* Get Linux version */ - extern void display_version(void); /* display suite version */ - extern const char procps_version[]; /* global buf for suite version */ - extern const char procps_number_version[]; /* global buf for suite number version */ diff --git a/source/base/procps/procps-3.2.8-kernel3-uts.patch b/source/base/procps/procps-3.2.8-kernel3-uts.patch deleted file mode 100644 index a72ae59..0000000 --- a/source/base/procps/procps-3.2.8-kernel3-uts.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur procps-3.2.8-20110302git.orig/proc/version.c procps-3.2.8-20110302git/proc/version.c ---- procps-3.2.8-20110302git.orig/proc/version.c 2011-06-10 17:00:33.000000000 +0200 -+++ procps-3.2.8-20110302git/proc/version.c 2011-06-10 17:20:17.000000000 +0200 -@@ -38,10 +38,15 @@ - void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ -+ int version_string_depth; - - if (uname(&uts) == -1) /* failure implies impending death */ - exit(1); -- if (sscanf(uts.release, "%d.%d.%d", &x, &y, &z) < 3) -+ -+ version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z); -+ -+ if ((version_string_depth < 2) || /* Non-standard for all known kernels */ -+ ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */ - fprintf(stderr, /* *very* unlikely to happen by accident */ - "Non-standard uts for running kernel:\n" - "release %s=%d.%d.%d gives version code %d\n", diff --git a/source/base/procps/procps-3.2.8-make.patch b/source/base/procps/procps-3.2.8-make.patch deleted file mode 100644 index 9e81546..0000000 --- a/source/base/procps/procps-3.2.8-make.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up procps-3.2.8/Makefile.make procps-3.2.8/Makefile ---- procps-3.2.8/Makefile.make 2010-09-08 18:16:34.000000000 +0200 -+++ procps-3.2.8/Makefile 2010-09-08 18:54:41.668727996 +0200 -@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES) - # want this rule first, use := on ALL, and ALL not filled in yet - all: do_all - ---include */module.mk -+-include proc/module.mk -+-include ps/module.mk - - do_all: $(ALL) - diff --git a/source/base/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch b/source/base/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch deleted file mode 100644 index 4b192c1..0000000 --- a/source/base/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- procps-3.2.8/ps/output.c 2010-05-18 06:00:18.000000000 +0200 -+++ procps-3.2.8.lennart/ps/output.c 2010-05-18 05:59:46.000000000 +0200 -@@ -1109,7 +1109,7 @@ - static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){ - char filename[48]; - FILE *fd; -- int counter = 0; -+ int counter = 0, last_begin = 0, slash = 0; - int c; - int is_cgroup = 0; - -@@ -1121,15 +1121,22 @@ - if (is_cgroup == 0) { - if (c == ':') { - is_cgroup = 1; -+ slash = 0; - if (counter>0) - outbuf[counter++]=';'; - } - }else -- if ((c == '\n') || (c == '\0')) -- is_cgroup = 0; -+ if ((c == '\n') || (c == '\0')){ -+ if (slash) /* if the last char was a / this process is in the root cgroup which we should suppress */ -+ counter = last_begin; - else -+ last_begin = counter; -+ is_cgroup = 0; -+ } else { -+ slash = c == '/'; - outbuf[counter++]=c; - } -+ } - outbuf[counter]='\0'; - close(fd); - if (counter>0)
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
