From ed8cb30556429410204053bba62194fbed3d12ce Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Jun 06 2018 15:14:33 +0000
Subject: Rebase to 3.3.15 (contains a LOT of CVE fixes)

Manpage translations temporarily unavailable

---

diff --git a/.gitignore b/.gitignore
index e6e6306..89b593a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /procps-ng-3.3.12.tar.xz
 /procps-ng-3.3.13.tar.xz
 /procps-ng-3.3.14.tar.xz
+/procps-ng-3.3.15.tar.xz
diff --git a/procps-ng.spec b/procps-ng.spec
index 7c8b9f1..462d9df 100644
--- a/procps-ng.spec
+++ b/procps-ng.spec
@@ -1,10 +1,11 @@
 # The testsuite is unsuitable for running on buildsystems
 %global tests_enabled 0
+%global manpo_available 0
 
 Summary: System and process monitoring utilities
 Name: procps-ng
-Version: 3.3.14
-Release: 2%{?dist}
+Version: 3.3.15
+Release: 1%{?dist}
 License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
 Group: Applications/System
 URL: https://sourceforge.net/projects/procps-ng/
@@ -16,9 +17,6 @@ Source1: README.md
 # wget https://gitlab.com/procps-ng/procps/raw/e0784ddaed30d095bb1d9a8ad6b5a23d10a212c4/top/README.top
 Source2: README.top
 
-# fix integer overflows leading to heap overflow (CVE-2018-1124 CVE-2018-1126)
-Patch1: procps-ng-3.3.14-CVE-2018-1124.patch
-
 BuildRequires: ncurses-devel
 BuildRequires: libtool
 BuildRequires: autoconf
@@ -42,10 +40,12 @@ Provides: /bin/ps
 Obsoletes: sysvinit-tools < 0:2.89
 Provides: /sbin/pidof
 
+%if %{manpo_available}
 # fortunately the same release number for f21 and f22
 Conflicts: man-pages-de < 1.7-3
 Conflicts: man-pages-fr < 3.66-3
 Conflicts: man-pages-pl < 0.7-5
+%endif
 
 
 %description
@@ -92,7 +92,6 @@ Internationalization pack for procps-ng
 %setup -q -n %{name}-%{version}
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} top/
-%patch1 -p1
 
 %build
 # The following stuff is needed for git archives only
@@ -147,9 +146,11 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
 %{_mandir}/man8/*
 %{_mandir}/man5/*
 
+%if %{manpo_available}
 %{_mandir}/*/man1/*
 %{_mandir}/*/man5/*
 %{_mandir}/*/man8/*
+%endif
 
 %exclude %{_libdir}/libprocps.la
 %exclude /unwanted/*
@@ -165,6 +166,10 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
 %files i18n -f %{name}.lang
 
 %changelog
+* Wed Jun 06 2018 Jan Rybar <jrybar@redhat.com> - 3.3.15-1
+- Rebase to 3.3.15 (contains a LOT of CVE fixes)
+- Manpage translations temporarily unavailable
+
 * Fri May 18 2018 Kamil Dudka <kdudka@redhat.com> - 3.3.14-2
 - fix integer overflows leading to heap overflow (CVE-2018-1124 CVE-2018-1126)
 
diff --git a/sources b/sources
index f8f6abd..ff09c8a 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (procps-ng-3.3.14.tar.xz) = 45617924ae1520765c15d71b76278dc80cac04f5985f83c9b65a8ba379d9a80a2ff0dc14c5a6edee7d6cfa66ce50ec019e8b5203704175ff94547ae6ff2b18c5
+SHA512 (procps-ng-3.3.15.tar.xz) = bc83ccc1941e7be8266588fdfbba17e2424b30163a215873ee6dee96215d66249f5d5e46fec2278d030b42bd7599861c4878360042dacec4c221ce411453747c