Oops, remove upstreamed patches

- Really ignore unknown tags in the signature header (#1480492)
- Fix rpmsign python module import failing (#1462671)
- Fix rpmbuild world writable empty (tmp) dirs in debuginfo (#641022)
- Fix testsuite with recent NSS-versions

.gitignore

@@ -22,3 +22,5 @@
 /rpm-4.13.0-rc1.tar.bz2
 /rpm-4.13.0-rc2.tar.bz2
 /rpm-4.13.0.tar.bz2
+/rpm-4.13.0.1.tar.bz2
+/rpm-4.13.0.2.tar.bz2

rpm-4.13.x-pythondistdeps.py-fix-processing-wheels.patch

@@ -0,0 +1,43 @@
+From ff395f4a820497a443baa6cd0198c49b06207c3f Mon Sep 17 00:00:00 2001
+From: Tomas Orsava <torsava@redhat.com>
+Date: Thu, 16 Feb 2017 11:36:29 +0100
+Subject: [PATCH] Fix pythondistdeps.py --provides for Python wheels
+
+As Python wheels do not contain targetted Python version in the directory/file
+name of their metadata like Python eggs do, and since the Python version is not
+contained in the metadata either, it is necessary to get it from elsewhere.
+
+Here it is parsed from the path the metadata resides at
+(e.g. /usr/lib/pythonX.Y/site-packages/...)
+---
+ scripts/pythondistdeps.py | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py
+index e4b99e2..d44210c 100644
+--- a/scripts/pythondistdeps.py
++++ b/scripts/pythondistdeps.py
+@@ -107,10 +107,17 @@ for f in files:
+             path_item = f
+             metadata = FileMetadata(f)
+         dist = Distribution.from_location(path_item, dist_name, metadata)
+-        # Check if py_version is defined in the file
++        # Check if py_version is defined in the metadata file/directory name
+         if not dist.py_version:
+-            warn("Version for {!r} has not been found".format(dist), RuntimeWarning)
+-            continue
++            # Try to parse the Python version from the path the metadata
++            # resides at (e.g. /usr/lib/pythonX.Y/site-packages/...)
++            import re
++            res = re.search(r"/python(?P<pyver>\d+\.\d)/", path_item)
++            if res:
++                dist.py_version = res.group('pyver')
++            else:
++                warn("Version for {!r} has not been found".format(dist), RuntimeWarning)
++                continue
+         if (Provides_PyMajorVer_Variant or legacy_Provides or legacy) and Provides:
+             # Get the Python major version
+             pyver_major = dist.py_version.split('.')[0]
+-- 
+2.11.0
+

rpm-4.13.x-transfiletriggerpostun-invalid-read.patch

@@ -1,40 +0,0 @@
-From f6521c50f6836374a0f7995f8f393aaf36e178ea Mon Sep 17 00:00:00 2001
-Message-Id: <f6521c50f6836374a0f7995f8f393aaf36e178ea.1478522529.git.pmatilai@redhat.com>
-From: Panu Matilainen <pmatilai@redhat.com>
-Date: Mon, 7 Nov 2016 13:38:39 +0200
-Subject: [PATCH] Fix %transfiletriggerpostun undeterministic behavior
- (RhBug:1284645)
-
-Keys from rpmdbIndexIteratorNext() are not necessarily \0-terminated,
-buyer beware.
-
-Sometimes you get lucky, but in particular when built as PIE (such as
-by default in Fedora) this falls over consistently.
-In Fedora this has been hidden by the fact that test suite has been
-disabled because its been so broken with fakechroot until recently,
-and without PIE the testsuite regularly passes. Valgrind does
-complain though.
----
- lib/rpmtriggers.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/rpmtriggers.c b/lib/rpmtriggers.c
-index a8612c0..ca22a6b 100644
---- a/lib/rpmtriggers.c
-+++ b/lib/rpmtriggers.c
-@@ -114,8 +114,11 @@ void rpmtriggersPrepPostUnTransFileTrigs(rpmts ts, rpmte te)
- 
-     /* Iterate over file triggers in rpmdb */
-     while ((rpmdbIndexIteratorNext(ii, &key, &keylen)) == 0) {
-+	char pfx[keylen + 1];
-+	memcpy(pfx, key, keylen);
-+	pfx[keylen] = '\0';
- 	/* Check if file trigger matches any file in this te */
--	rpmfi fi = rpmfilesFindPrefix(files, key);
-+	rpmfi fi = rpmfilesFindPrefix(files, pfx);
- 	if (rpmfiFC(fi) > 0) {
- 	    /* If yes then store it */
- 	    rpmdbAppendIterator(mi, rpmdbIndexIteratorPkgOffsets(ii),
--- 
-2.7.4
-

rpm-4.13.x-writable-tmp-dir.patch

@@ -0,0 +1,106 @@
+commit c707ab26362e795d3f9dba4eb87dc7ed99a28bcb
+Author: Robin Lee <cheeselee@fedoraproject.org>
+Date:   Sat Apr 8 21:21:39 2017 +0800
+
+    Fix non-standard inherented modes of directories in debuginfo
+    
+    In case that binary compiled from source generated in /tmp, a
+    /usr/src/debug/tmp directory will be created with the same mode as
+    /tmp, a.k.a 777, which should be avoided.
+    
+    Fixes: rhbz#641022
+
+diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
+old mode 100644
+new mode 100755
+index 547dbd9..6f38e19
+--- a/scripts/find-debuginfo.sh
++++ b/scripts/find-debuginfo.sh
+@@ -396,9 +396,10 @@
+   mkdir -p "${RPM_BUILD_ROOT}/usr/src/debug"
+   LC_ALL=C sort -z -u "$SOURCEFILE" | grep -E -v -z '(<internal>|<built-in>)$' |
+   (cd "$RPM_BUILD_DIR"; cpio -pd0mL "${RPM_BUILD_ROOT}/usr/src/debug")
+-  # stupid cpio creates new directories in mode 0700, fixup
++  # stupid cpio creates new directories in mode 0700,
++  # and non-standard modes may be inherented from original directories, fixup
+   find "${RPM_BUILD_ROOT}/usr/src/debug" -type d -print0 |
+-  xargs --no-run-if-empty -0 chmod a+rx
++  xargs --no-run-if-empty -0 chmod 0755
+ fi
+ 
+ if [ -d "${RPM_BUILD_ROOT}/usr/lib" -o -d "${RPM_BUILD_ROOT}/usr/src" ]; then
+
+commit e795899780337dea751d85db8f381eff3fe75275
+Author: Mark Wielaard <mark@klomp.org>
+Date:   Fri Apr 21 17:33:26 2017 +0200
+
+    debugedit: Only output comp_dir under build dir (once).
+    
+    The fix for rhbz#444310 (commit c1a5eb - Include empty CU current dirs)
+    was a little greedy. It would also include comp_dirs outside the build
+    root. Those are unnecessary and we don't have a good way to store them.
+    Such dirs (e.g. /tmp) would then show up at the root of /usr/src/debug.
+    
+    Fix this by including only comp_dirs under base_dir. Also only output
+    all dirs once (during phase zero) and don't output empty dirs (which
+    was harmless but would produce a warning from cpio).
+    
+    This still includes all empty dirs from the original rhbz#444310
+    nodir testcase and it is an alternative fix for rhbz#641022
+    (commit c707ab).
+    
+    Both fixes are necessary in case of an unexpected mode for a directory
+    actually in the build root that we want to include in the source list.
+    
+    Signed-off-by: Mark Wielaard <mark@klomp.org>
+
+diff --git a/tools/debugedit.c b/tools/debugedit.c
+index 8444e03..bf11513 100644
+--- a/tools/debugedit.c
++++ b/tools/debugedit.c
+@@ -926,27 +926,29 @@
+   /* Ensure the CU current directory will exist even if only empty.  Source
+      filenames possibly located in its parent directories refer relatively to
+      it and the debugger (GDB) cannot safely optimize out the missing
+-     CU current dir subdirectories.  */
+-  if (comp_dir && list_file_fd != -1)
++     CU current dir subdirectories.  Only do this once in phase one. And
++     only do this for dirs under our build/base_dir.  Don't output the
++     empty string (in case the comp_dir == base_dir).  */
++  if (phase == 0 && base_dir && comp_dir && list_file_fd != -1)
+     {
+       char *p;
+       size_t size;
+ 
+-      if (base_dir && has_prefix (comp_dir, base_dir))
+-	p = comp_dir + strlen (base_dir);
+-      else if (dest_dir && has_prefix (comp_dir, dest_dir))
+-	p = comp_dir + strlen (dest_dir);
+-      else
+-	p = comp_dir;
+-
+-      size = strlen (p) + 1;
+-      while (size > 0)
++      if (has_prefix (comp_dir, base_dir))
+ 	{
+-	  ssize_t ret = write (list_file_fd, p, size);
+-	  if (ret == -1)
+-	    break;
+-	  size -= ret;
+-	  p += ret;
++	  char *p = comp_dir + strlen (base_dir);
++	  if (p[0] != '\0')
++	    {
++	      size_t size = strlen (p) + 1;
++	      while (size > 0)
++		{
++		  ssize_t ret = write (list_file_fd, p, size);
++		  if (ret == -1)
++		    break;
++		  size -= ret;
++		  p += ret;
++		}
++	    }
+ 	}
+     }
+ 

rpm.spec

@@ -17,7 +17,7 @@
 
 %define rpmhome /usr/lib/rpm
 
-%global rpmver 4.13.0
+%global rpmver 4.13.0.2
 #global snapver rc2
 %global srcver %{version}%{?snapver:-%{snapver}}
 %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(v=%{version}; echo ${v%.*}.x)}
@@ -29,7 +29,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}6%{?dist}
+Release: %{?snapver:0.%{snapver}.}1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
@@ -52,7 +52,7 @@ Patch4: rpm-4.8.1-use-gpg2.patch
 Patch5: rpm-4.12.0-rpm2cpio-hack.patch
 
 # Patches already upstream:
-Patch100: rpm-4.13.x-transfiletriggerpostun-invalid-read.patch
+Patch103: rpm-4.13.x-writable-tmp-dir.patch
 
 Patch133: rpm-4.13.x-pythondistdeps.patch
 Patch134: rpm-4.13.x-pythondistdeps-Makefile.patch
@@ -61,6 +61,9 @@ Patch136: rpm-4.13.x-pythondistdeps.py-skip-distribution-metadata-if-ther.patch
 Patch137: rpm-4.13.x-pythondistdeps.py-show-warning-if-version-is-not-fou.patch
 Patch138: rpm-4.13.x-pythondistdeps.py-skip-.egg-link-files.patch
 Patch139: rpm-4.13.x-pythondistdeps.py-add-forgotten-import.patch
+# Upstream PR: https://github.com/rpm-software-management/rpm/pull/154
+# rhbz#1421776
+Patch141: rpm-4.13.x-pythondistdeps.py-fix-processing-wheels.patch
 
 # These are not yet upstream
 Patch302: rpm-4.7.1-geode-i686.patch
@@ -558,6 +561,22 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Nov 02 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.0.2-1
+- Update to rpm 4.13.02 (http://rpm.org/wiki/Releases/4.13.0.2)
+
+* Wed Aug 16 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.0.1-2
+- Really ignore unknown tags in the signature header (#1480492)
+- Fix rpmsign python module import failing (#1462671)
+- Fix rpmbuild world writable empty (tmp) dirs in debuginfo (#641022)
+- Fix testsuite with recent NSS-versions
+
+* Fri Feb 24 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.0.1-1
+- Rebase to rpm 4.13.0.1 (http://rpm.org/wiki/Releases/4.13.0.1)
+- Fixes #1410907, #1405570, #1399798, #1410907 etc
+
+* Thu Feb 16 2017 Tomas Orsava <torsava@redhat.com> - 4.13.0-7
+- Fix handling of Python wheels by pythondistdeps.py --provides (#1421776)
+
 * Sat Dec 03 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 4.13.0-6
 - Fix arch-dependent requires in subpackages (RHBZ #1398591)
 

sources

@@ -1 +1 @@
-f64e70c7548911da51a11651a789e30e  rpm-4.13.0.tar.bz2
+SHA512 (rpm-4.13.0.2.tar.bz2) = 9b15acb2684bc963f7164763568615b2484478eaec0cea8b3bd4ddb94b862a70b2f4b4ab432d896e5885c9a191c4d7d2ede573a5feabc8ec290108956a8a4917