- Update to 3.3.7

- Reverting upstream commit for testsuite/unix.exp
This commit is contained in:
Jaromir Capik 2013-03-26 18:01:51 +01:00
parent 4cbb703663
commit e7ff27305a
5 changed files with 22 additions and 47 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/procps-ng-3.3.3-20120807git.tar.xz
/procps-ng-3.3.4.tar.xz
/procps-ng-3.3.6.tar.xz
/procps-ng-3.3.7.tar.xz

View File

@ -0,0 +1,12 @@
diff -Naur procps-ng-3.3.7.orig/testsuite/config/unix.exp procps-ng-3.3.7/testsuite/config/unix.exp
--- procps-ng-3.3.7.orig/testsuite/config/unix.exp 2013-03-25 11:50:21.000000000 +0100
+++ procps-ng-3.3.7/testsuite/config/unix.exp 2013-03-26 17:50:54.860228114 +0100
@@ -80,7 +80,7 @@
}
set do_loop 1
- set last_value &9
+ set last_value 99999999
set found_item 0
while { $do_loop ==1 } {
expect {

View File

@ -1,42 +0,0 @@
From 0d476355aafa4377fac05cf01ac9284d6fe7cad0 Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Mon, 4 Feb 2013 18:21:39 +0100
Subject: [PATCH] pmap: empty output or crashes on ppc/s390 caused by wrong
pidlist type
Previously the pidlist variable was defined as unsigned long *
whilst the openproc function accepts pid_t *.
Both target types differ in size (8 != 4) and therefore the issue
mainly affects big endian architectures.
This commit changes the pidlist type to pid_t * so that it's
compatible with openproc.
---
pmap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pmap.c b/pmap.c
index 7862eac..edabdcf 100644
--- a/pmap.c
+++ b/pmap.c
@@ -621,7 +621,7 @@ static void range_arguments(char *optarg)
int main(int argc, char **argv)
{
- unsigned long *pidlist;
+ pid_t *pidlist;
unsigned count = 0;
PROCTAB *PT;
proc_t p;
@@ -689,7 +689,7 @@ int main(int argc, char **argv)
x_option && (d_option || X_option))
xerrx(EXIT_FAILURE, _("options -d, -x, -X are mutually exclusive"));
- pidlist = xmalloc(sizeof(unsigned long) * argc);
+ pidlist = xmalloc(sizeof(pid_t) * argc);
while (*argv) {
char *walk = *argv++;
--
1.7.11.7

View File

@ -1,16 +1,16 @@
%global tests_enabled 0
%global tests_enabled 1
Summary: System and process monitoring utilities
Name: procps-ng
Version: 3.3.6
Release: 4%{?dist}
Version: 3.3.7
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
Group: Applications/System
URL: https://sourceforge.net/projects/procps-ng/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
Patch0: procps-ng-pmap-pidlist-type.patch
Patch0: procps-ng-3.3.7-testsuite-reverting-bogus-commit-unix-exp.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@ -129,6 +129,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d
%{_includedir}/proc
%changelog
* Tue Mar 26 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.7-1
- Update to 3.3.7
- Reverting upstream commit for testsuite/unix.exp
* Tue Feb 05 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.6-4
- Fixing empty pmap output on ppc/s390 (#906457)

View File

@ -1 +1 @@
0a050d9be531921db3cd38f1371e73e3 procps-ng-3.3.6.tar.xz
57d2bad8c8fac3d09ee9f5f964e3da9c procps-ng-3.3.7.tar.xz