From f8de97529b199cac3649df8c71297f76539ca965 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 2 Nov 2017 09:33:51 +0200
Subject: [PATCH] Oops, remove upstreamed patches

---
 rpm-4.13.0-python-rpmsign.patch  | 22 ----------------------
 rpm-4.13.0-testsuite-nss.patch   | 21 ---------------------
 rpm-4.13.0-unknown-sigtags.patch | 25 -------------------------
 rpm.spec                         |  3 ---
 4 files changed, 71 deletions(-)
 delete mode 100644 rpm-4.13.0-python-rpmsign.patch
 delete mode 100644 rpm-4.13.0-testsuite-nss.patch
 delete mode 100644 rpm-4.13.0-unknown-sigtags.patch

diff --git a/rpm-4.13.0-python-rpmsign.patch b/rpm-4.13.0-python-rpmsign.patch
deleted file mode 100644
index 3e535b6..0000000
--- a/rpm-4.13.0-python-rpmsign.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From eb632e5158fa4ef993b0e5df2a354f0be7a7a71d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
-Date: Wed, 20 Apr 2016 15:39:36 +0200
-Subject: [PATCH] Use correct source file for rpmsign module
-
----
- python/setup.py.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python/setup.py.in b/python/setup.py.in
-index b2c394136..f94873fe5 100644
---- a/python/setup.py.in
-+++ b/python/setup.py.in
-@@ -48,7 +48,7 @@ rpmbuild_mod = Extension('rpm._rpmb',
-                   )
- 
- rpmsign_mod = Extension('rpm._rpms',
--                   sources = ['rpmbmodule.c'],
-+                   sources = ['rpmsmodule.c'],
-                    include_dirs = pkgconfig('--cflags'),
-                    libraries = pkgconfig('--libs') + ['rpmsign'],
-                    extra_compile_args = cflags,
diff --git a/rpm-4.13.0-testsuite-nss.patch b/rpm-4.13.0-testsuite-nss.patch
deleted file mode 100644
index d5725d0..0000000
--- a/rpm-4.13.0-testsuite-nss.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 36db47bf59213befbb0afb37032b82e634c7ba78
-Author: Panu Matilainen <pmatilai@redhat.com>
-Date:   Wed May 10 09:17:20 2017 +0300
-
-    Fix testsuite with newer NSS versions which require /dev/urandom
-    
-    (cherry picked from commit 9e3256d2e8fa1bed042f7c4ded7e40e232342539)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 7a5cc6544..1e71d685f 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -109,7 +109,7 @@ testing$(bindir)/rpmbuild: ../rpmbuild
- 	          $(MAKE) DESTDIR=`pwd`/${subdir}/testing install)
- 	cp -r ${srcdir}/data/ testing/
- 	for d in dev etc magic tmp var; do if [ ! -d testing/$${d} ]; then mkdir testing/$${d}; fi; done
--	for node in stdin stderr stdout null; do ln -s /dev/$${node} testing/dev/$${node}; done
-+	for node in urandom stdin stderr stdout null; do ln -s /dev/$${node} testing/dev/$${node}; done
- 	for cf in hosts resolv.conf passwd shadow group gshadow mtab fstab; do [ -f /etc/$${cf} ] && ln -s /etc/$${cf} testing/etc/$${cf}; done
- 	ln -s ../$(bindir) testing/usr/bin
- 	for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file ionice mktemp nice cut sort diff touch; do p=`which $${prog}`; ln -s $${p} testing/$${p}; done
diff --git a/rpm-4.13.0-unknown-sigtags.patch b/rpm-4.13.0-unknown-sigtags.patch
deleted file mode 100644
index f2355eb..0000000
--- a/rpm-4.13.0-unknown-sigtags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 5e311d32e4079bf7f2db001d4f08db3ac0d93af9
-Author: Panu Matilainen <pmatilai@redhat.com>
-Date:   Fri Aug 11 12:48:23 2017 +0300
-
-    Really ignore unknown signature tags (RhBug:1480407)
-    
-    Rather embarrassingly, rpm 4.13 fails rpmkeys -K signature verification
-    of rpm 4.14 packages because it doesn't really ignore unknown
-    signature tags like it claims to, and should. And so it reports a
-    bogus failure on the new SHA256 header-only digest. This bug as it is
-    only exists in 4.13.x, older versions are fine and >= 4.14 only
-    ever looks for tags it knows about.
-
-diff --git a/lib/signature.c b/lib/signature.c
-index 1b9fe345f..41bf85893 100644
---- a/lib/signature.c
-+++ b/lib/signature.c
-@@ -71,6 +71,7 @@ rpmRC rpmSigInfoParse(rpmtd td, const char *origin,
- 	break;
-     default:
- 	/* anything unknown just falls through for now */
-+	sinfo->type = RPMSIG_OTHER_TYPE;
- 	break;
-     }
- 
diff --git a/rpm.spec b/rpm.spec
index 50a058f..29f78f2 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -52,9 +52,6 @@ Patch4: rpm-4.8.1-use-gpg2.patch
 Patch5: rpm-4.12.0-rpm2cpio-hack.patch
 
 # Patches already upstream:
-Patch100: rpm-4.13.0-python-rpmsign.patch
-Patch101: rpm-4.13.0-unknown-sigtags.patch
-Patch102: rpm-4.13.0-testsuite-nss.patch
 Patch103: rpm-4.13.x-writable-tmp-dir.patch
 
 Patch133: rpm-4.13.x-pythondistdeps.patch