Bug#779962: unblock: procps/2:3.3.9-9
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package procps
This is to fix #775624 which FTBFS depending on the kernel version used.
The fix is a four line diff which moves some output lines before the
check that passes/fails depending on the kernel response.
Either look in the source of procps for the patch
bts775624-pmap-xoutput or on the BTS at
https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=42;filename=procps-pmap-xoutput.diff;att=1;bug=775624
debdiff:
File lists identical (after any substitutions)
Control files: lines which differ (wdiff format)
------------------------------------------------
Version: [-2:3.3.9-8-] {+2:3.3.9-9+}
dsc debdiff attached.
unblock procps/2:3.3.9-9
-- System Information:
Debian Release: 8.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/6 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru procps-3.3.9/debian/changelog procps-3.3.9/debian/changelog
--- procps-3.3.9/debian/changelog 2014-09-28 09:45:14.000000000 +1000
+++ procps-3.3.9/debian/changelog 2015-03-07 08:12:02.000000000 +1100
@@ -1,3 +1,9 @@
+procps (2:3.3.9-9) unstable; urgency=medium
+
+ * pmap: output with unreadale /proc/1/smaps Closes: #775624
+
+ -- Craig Small <csmall@debian.org> Sat, 07 Mar 2015 08:11:15 +1100
+
procps (2:3.3.9-8) unstable; urgency=medium
* Revert to 3.3.9 upstream for Jessie freeze
diff -Nru procps-3.3.9/debian/patches/bts775624-pmap-xoutput procps-3.3.9/debian/patches/bts775624-pmap-xoutput
--- procps-3.3.9/debian/patches/bts775624-pmap-xoutput 1970-01-01 10:00:00.000000000 +1000
+++ procps-3.3.9/debian/patches/bts775624-pmap-xoutput 2015-03-07 08:12:02.000000000 +1100
@@ -0,0 +1,29 @@
+Description: pmap: output when smaps unreadable
+ If smaps can be opened but not readable, the output
+ is now the same as if the file cannot be opened
+Bug-Debian: https://bugs.debian.org/775624
+Last-Update: 2015-03-07
+--- a/pmap.c
++++ b/pmap.c
+@@ -532,6 +532,10 @@
+ */
+ int maxcmd = 0xfffff;
+
++ escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd,
++ ESC_ARGS | ESC_BRACKETS);
++ printf("%u: %s\n", p->tgid, cmdbuf);
++
+ if (x_option || X_option || c_option) {
+ sprintf(buf, "/proc/%u/smaps", p->tgid);
+ if ((fp = fopen(buf, "r")) == NULL)
+@@ -542,10 +546,6 @@
+ return 1;
+ }
+
+- escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd,
+- ESC_ARGS | ESC_BRACKETS);
+- printf("%u: %s\n", p->tgid, cmdbuf);
+-
+ if (X_option || c_option) {
+ print_extended_maps(fp);
+ return 0;
diff -Nru procps-3.3.9/debian/patches/series procps-3.3.9/debian/patches/series
--- procps-3.3.9/debian/patches/series 2014-09-28 09:45:14.000000000 +1000
+++ procps-3.3.9/debian/patches/series 2015-03-07 08:12:02.000000000 +1100
@@ -1,3 +1,4 @@
+bts775624-pmap-xoutput
bts743758_vmstat_test
top_defines
uptime_test
Reply to: