From 1699ac5970c54d8d7e140d3b99ce21438ed16b5a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 16 2016 10:10:09 +0000
Subject: import procps-ng-3.3.10-5.el7_2


---

diff --git a/SOURCES/procps-ng-3.3.10-free-uninitialized-errno.patch b/SOURCES/procps-ng-3.3.10-free-uninitialized-errno.patch
new file mode 100644
index 0000000..3975e42
--- /dev/null
+++ b/SOURCES/procps-ng-3.3.10-free-uninitialized-errno.patch
@@ -0,0 +1,11 @@
+diff -Naur procps-ng-3.3.10.orig/free.c procps-ng-3.3.10/free.c
+--- procps-ng-3.3.10.orig/free.c	2015-12-01 17:23:26.702968686 +0100
++++ procps-ng-3.3.10/free.c	2015-12-01 17:22:34.590529390 +0100
+@@ -262,6 +262,7 @@
+ 			break;
+ 		case 's':
+ 			flags |= FREE_REPEAT;
++			errno = 0;
+ 			args.repeat_interval = (1000000 * strtof(optarg, &endptr));
+ 			if (errno || optarg == endptr || (endptr && *endptr))
+ 				xerrx(EXIT_FAILURE, _("seconds argument `%s' failed"), optarg);
diff --git a/SOURCES/procps-ng-3.3.10-pmap-skip-vmflags.patch b/SOURCES/procps-ng-3.3.10-pmap-skip-vmflags.patch
new file mode 100644
index 0000000..bc949a8
--- /dev/null
+++ b/SOURCES/procps-ng-3.3.10-pmap-skip-vmflags.patch
@@ -0,0 +1,15 @@
+diff -Naur procps-ng-3.3.10.orig/pmap.c procps-ng-3.3.10/pmap.c
+--- procps-ng-3.3.10.orig/pmap.c	2014-09-23 13:40:36.000000000 +0200
++++ procps-ng-3.3.10/pmap.c	2015-11-24 10:47:24.764107976 +0100
+@@ -629,9 +629,9 @@
+ 					diff = 0;
+ 					continue;
+ 				}
+-				/* Other keys */
+-				continue;
+ 			}
++			/* Anything else starting with A-Z? -> skip it (rhbz#1262864) */
++			continue;
+ 		}
+ 		sscanf(mapbuf, "%" KLF "x-%" KLF "x %31s %llx %x:%x %llu", &start,
+ 		       &end, perms, &file_offset, &dev_major, &dev_minor,
diff --git a/SPECS/procps-ng.spec b/SPECS/procps-ng.spec
index b59e4b5..3ba597d 100644
--- a/SPECS/procps-ng.spec
+++ b/SPECS/procps-ng.spec
@@ -4,13 +4,16 @@
 Summary: System and process monitoring utilities
 Name: procps-ng
 Version: 3.3.10
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ 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-3.3.10-pmap-skip-vmflags.patch
+Patch1: procps-ng-3.3.10-free-uninitialized-errno.patch
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -75,6 +78,9 @@ Internationalization pack for procps-ng
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0 -p1
+%patch1 -p1
+
 
 %build
 # The following stuff is needed for git archives only
@@ -155,6 +161,14 @@ rmdir %{buildroot}/share
 %{_datadir}/locale/*
 
 %changelog
+* Tue Dec 01 2015 Jaromir Capik <jcapik@redhat.com> - 3.3.10-5
+- #1287038 - free - error while parsing arguments
+- Resolves: #1287038
+
+* Tue Nov 24 2015 Jaromir Capik <jcapik@redhat.com> - 3.3.10-4
+- #1262864 - Correctly skip vmflags (and other keys starting with A-Z)
+- Resolves: #1262864
+
 * Mon Oct 06 2014 Jaromir Capik <jcapik@redhat.com> - 3.3.10-3
 - Disabling translated man pages due to conflicts with man-pages-*
 - Removing /etc/sysctl.d (quietly stolen by systemd)