summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch')
-rw-r--r--meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
new file mode 100644
index 0000000000..8268a2d51d
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
@@ -0,0 +1,28 @@
1commit 6c47ad415246cc3a3edac2e1637106d330574c85
2Author: Mark Hatle <mark.hatle@windriver.com>
3Date: Fri May 11 19:05:09 2012 -0500
4
5 RpmHeader.cc: RPM 5.4.9 integration
6
7 _RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD
8 are now obsolete and no longer supported.
9
10 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11
12diff --git a/zypp/target/rpm/RpmHeader.cc b/zypp/target/rpm/RpmHeader.cc
13index 1224ecd..c96dae6 100644
14--- a/zypp/target/rpm/RpmHeader.cc
15+++ b/zypp/target/rpm/RpmHeader.cc
16@@ -230,10 +230,12 @@ RpmHeader::constPtr RpmHeader::readPackage( const Pathname & path_r,
17 librpmDb::globalInit();
18 rpmts ts = ::rpmtsCreate();
19 unsigned vsflag = RPMVSF_DEFAULT;
20+#if !defined(_RPM_5)
21 if ( verification_r & NODIGEST )
22 vsflag |= _RPMVSF_NODIGESTS;
23 if ( verification_r & NOSIGNATURE )
24 vsflag |= _RPMVSF_NOSIGNATURES;
25+#endif
26 ::rpmtsSetVSFlags( ts, rpmVSFlags(vsflag) );
27
28 Header nh = 0;