update to rpm-4.9.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=93
2011-05-16 16:07:44 +00:00
parent 5d8f14209e
commit cebe6dd1a8
87 changed files with 1633 additions and 2481 deletions
--- a/nosignature.diff
+++ b/nosignature.diff
@@ -1,23 +0,0 @@
-Do not load keyring if signature checking is disabled.
-
--- ./lib/package.c.orig	2010-04-09 09:56:42.000000000 +0000
-+++ ./lib/package.c	2010-04-09 09:57:50.000000000 +0000
-@@ -760,12 +760,16 @@ exit:
- rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
- {
-     rpmRC rc;
-    rpmKeyring keyring = rpmtsGetKeyring(ts, 1);
-     rpmVSFlags vsflags = rpmtsVSFlags(ts);
-+    rpmKeyring keyring = 0;
-+
-+    if ((vsflags & _RPMVSF_NOSIGNATURES) != _RPMVSF_NOSIGNATURES)
-+	keyring = rpmtsGetKeyring(ts, 1);
- 
-     rc = rpmpkgRead(keyring, vsflags, fd, fn, hdrp);
- 
-    rpmKeyringFree(keyring);
-+    if (keyring)
-+	rpmKeyringFree(keyring);
-     return rc;
- }
-