gnu: procps: Update to 3.3.12.

* gnu/packages/linux.scm (procps): Update to 3.3.12.
[source]: Remove patch.
* gnu/packages/patches/procps-non-linux.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
Efraim Flashner 2016-08-14 11:03:50 +03:00
parent da931eee60
commit 74a3c4bb6c
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
3 changed files with 2 additions and 45 deletions

View File

@ -723,7 +723,6 @@ dist_patch_DATA = \
%D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/portmidi-modular-build.patch \
%D%/packages/patches/procmail-ambiguous-getline-debian.patch \ %D%/packages/patches/procmail-ambiguous-getline-debian.patch \
%D%/packages/patches/procmail-CVE-2014-3618.patch \ %D%/packages/patches/procmail-CVE-2014-3618.patch \
%D%/packages/patches/procps-non-linux.patch \
%D%/packages/patches/pt-scotch-build-parallelism.patch \ %D%/packages/patches/pt-scotch-build-parallelism.patch \
%D%/packages/patches/pulseaudio-fix-mult-test.patch \ %D%/packages/patches/pulseaudio-fix-mult-test.patch \
%D%/packages/patches/pulseaudio-longer-test-timeout.patch \ %D%/packages/patches/pulseaudio-longer-test-timeout.patch \

View File

@ -532,16 +532,14 @@ block devices, UUIDs, TTYs, and many other tools.")
(define-public procps (define-public procps
(package (package
(name "procps") (name "procps")
(version "3.3.11") (version "3.3.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/procps-ng/Production/" (uri (string-append "mirror://sourceforge/procps-ng/Production/"
"procps-ng-" version ".tar.xz")) "procps-ng-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9")) "1m57w6jmry84njd5sgk5afycbglql0al80grx027kwqqcfw5mmkf"))))
(patches
(list (search-patch "procps-non-linux.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)

View File

@ -1,40 +0,0 @@
From aa9bd38d0a6fe53aff7f78fb2d9f61e55677c7b5 Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@enc.com.au>
Date: Sun, 17 Apr 2016 09:09:41 +1000
Subject: [PATCH] tests: Conditionally add prctl to test process
prctl was already bypassed on Cygwin systems. This extends to
non-Linux systems such as kFreeBSD and Hurd.
---
lib/test_process.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/test_process.c b/lib/test_process.c
index 6e652ed..6a4776c 100644
--- a/lib/test_process.c
+++ b/lib/test_process.c
@@ -21,7 +21,9 @@
#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
+#ifdef __linux__
#include <sys/prctl.h>
+#endif
#include "c.h"
#define DEFAULT_SLEEPTIME 300
@@ -78,8 +80,10 @@
sigaction(SIGUSR1, &signal_action, NULL);
sigaction(SIGUSR2, &signal_action, NULL);
+#ifdef __linux__
/* set process name */
prctl(PR_SET_NAME, MY_NAME, NULL, NULL, NULL);
+#endif
while (sleep_time > 0) {
sleep_time = sleep(sleep_time);
--
2.8.2