summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-06-11 18:18:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-12 10:10:36 (GMT)
commitf182f53cc399a1d4a7b53ad5d3a0c16a51c50876 (patch)
treeb19a9395809e7355e6232072880e1e0848e47375
parent43dd3512aa54dec946f619f4c18e5dc0a4162301 (diff)
downloadpoky-f182f53cc399a1d4a7b53ad5d3a0c16a51c50876.tar.gz
createrepo: For compatibility w/ RPM 5.4.9 remove RPMVSF_NOSIGNATURES flag
The RPMVSF_NOSIGNATURES flag was removed from RPM5 - 5.4.9 as a result of additional -requires- package validation to help protect from malicious packages. The createrepo "dump" script has been updated to no longer use this flag. This remains compatible with prior versions of RPM. (From OE-Core rev: 24786ccbbdd1188aad4d8508e1757d38798b6f81) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch19
-rw-r--r--meta/recipes-support/createrepo/createrepo_0.4.11.bb3
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch b/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
new file mode 100644
index 0000000..3423c44
--- /dev/null
+++ b/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
@@ -0,0 +1,19 @@
1dumpMetadata.py: Fix for RPM5 - 5.4.9 integration
2
3RPM5 no longer has a switch to disable signature validation. (Due to security
4validation concerns.)
5
6Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
7
8diff -u createrepo-0.4.11.orig/dumpMetadata.py createrepo-0.4.11/dumpMetadata.py
9--- createrepo-0.4.11.orig/dumpMetadata.py 2012-06-05 10:12:55.687964222 -0500
10+++ createrepo-0.4.11/dumpMetadata.py 2012-06-05 10:40:08.154060600 -0500
11@@ -92,7 +92,7 @@
12 fdno = package # let's assume this is an fdno and go with it :)
13 except OSError:
14 raise MDError, "Error opening file"
15- ts.setVSFlags((rpm._RPMVSF_NOSIGNATURES|rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD))
16+ ts.setVSFlags((rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD))
17 try:
18 hdr = ts.hdrFromFdno(fdno)
19 except rpm.error:
diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
index 989a745..060ed59 100644
--- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb
+++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
@@ -4,11 +4,12 @@ HOMEPAGE = "http://createrepo.baseurl.org/"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" 5LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
6 6
7PR = "r2" 7PR = "r3"
8 8
9SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ 9SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \
10 file://fix-native-install.patch \ 10 file://fix-native-install.patch \
11 file://python-scripts-should-use-interpreter-from-env.patch \ 11 file://python-scripts-should-use-interpreter-from-env.patch \
12 file://createrepo-rpm549.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2" 15SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2"