From: Elan Ruusamäe <glen@delfi.ee>
Date: Sat, 2 Mar 2013 19:26:03 +0000 (+0200)
Subject: rpm5 patch
X-Git-Tag: auto/th/yum-3.4.3-2~3
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=a4502cecbdc870a35d741bb776bc29412f0320a9;p=packages%2Fyum.git

rpm5 patch

_RPMVSF_NOSIGNATURES and _RPMVSF_NODIGESTS have been removed in rpm 5
---

diff --git a/rpm5.patch b/rpm5.patch
new file mode 100644
index 0000000..4946153
--- /dev/null
+++ b/rpm5.patch
@@ -0,0 +1,47 @@
+--- yum-3.4.3/./rpmUtils/transaction.py~	2011-06-28 23:27:22.000000000 +0300
++++ yum-3.4.3/./rpmUtils/transaction.py	2013-03-02 21:20:39.440848577 +0200
+@@ -188,6 +188,5 @@
+         
+ def initReadOnlyTransaction(root='/'):
+     read_ts =  TransactionWrapper(root=root)
+-    read_ts.pushVSFlags((rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
+     return read_ts
+ 
+--- yum-3.4.3/./rpmUtils/oldUtils.py~	2011-06-28 23:27:22.000000000 +0300
++++ yum-3.4.3/./rpmUtils/oldUtils.py	2013-03-02 21:21:04.748684625 +0200
+@@ -273,7 +273,6 @@
+ 
+ class RPM_Work(RPM_Base_Work):
+     def __init__(self, rpmfn):
+-        ts.setVSFlags(~(rpm._RPMVSF_NOSIGNATURES))
+         fd = os.open(rpmfn, os.O_RDONLY)
+         try:
+             self.hdr = ts.hdrFromFdno(fd)
+@@ -343,7 +342,6 @@
+             self.ts.setVSFlags(~(rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD))
+         elif sig == 'none':
+             # turn off everything - period
+-            self.ts.setVSFlags(~(rpm._RPMVSF_NOSIGNATURES))
+         elif sig == 'default':
+             # set it back to the default
+             self.ts.setVSFlags(rpm.RPMVSF_DEFAULT)
+--- yum-3.4.3/./yum/__init__.py~	2011-06-28 23:27:22.000000000 +0300
++++ yum-3.4.3/./yum/__init__.py	2013-03-02 21:21:20.632751902 +0200
+@@ -3087,7 +3087,6 @@
+             return 1
+             
+         myts = rpmUtils.transaction.initReadOnlyTransaction(root=self.conf.installroot)
+-        myts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
+         idx = myts.dbMatch('name', 'gpg-pubkey')
+         keys = idx.count()
+         del idx
+--- yum-3.4.3/./yum/config.py~	2013-03-02 21:19:35.000000000 +0200
++++ yum-3.4.3/./yum/config.py	2013-03-02 21:21:29.133144673 +0200
+@@ -1006,7 +1006,6 @@
+     @return: The release version as a string (eg. '4' for FC4)
+     '''
+     ts = rpmUtils.transaction.initReadOnlyTransaction(root=installroot)
+-    ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
+     try:
+         idx = ts.dbMatch('provides', distroverpkg)
+     except TypeError, e:
diff --git a/yum.spec b/yum.spec
index c6bff9c..6691821 100644
--- a/yum.spec
+++ b/yum.spec
@@ -28,6 +28,7 @@ Patch3:		%{name}-pld.patch
 Patch4:		%{name}-amd64.patch
 Patch5:		%{name}-config.patch
 Patch6:		nosetests.patch
+Patch7:		rpm5.patch
 # fc
 Patch10:	installonlyn-enable.patch
 Patch11:	%{name}-mirror-priority.patch
@@ -85,6 +86,7 @@ zapytaniu użytkownika w razie potrzeby.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{__make}