commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2014-10-06 22:05:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpm" Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2014-09-28 19:53:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-10-06 22:05:10.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 6 15:08:17 CEST 2014 - mls@suse.de + +- fix size and payloadsize generation for big endian platforms + new patch: fixsizeforbigendian.diff + +------------------------------------------------------------------- New: ---- fixsizeforbigendian.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.p3iouf/_old 2014-10-06 22:05:12.000000000 +0200 +++ /var/tmp/diff_new_pack.p3iouf/_new 2014-10-06 22:05:12.000000000 +0200 @@ -128,6 +128,7 @@ Patch92: find-lang-python.patch Patch93: weakdepscompat.diff Patch94: checksepwarn.diff +Patch95: fixsizeforbigendian.diff Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -215,7 +216,7 @@ %patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 85 -%patch -P 92 -P 93 -P 94 +%patch -P 92 -P 93 -P 94 -P 95 %ifarch aarch64 ppc64le %patch6464 ++++++ fixsizeforbigendian.diff ++++++ --- ./build/pack.c.orig 2014-10-06 13:05:52.801204141 +0000 +++ ./build/pack.c 2014-10-06 13:06:19.815077722 +0000 @@ -290,6 +290,8 @@ static rpmRC generateSignature(char *SHA rpmRC rc = RPMRC_OK; char *reservedSpace; int spaceSize = 0; + uint32_t size32 = (uint32_t)size; + uint32_t payloadSize32 = (uint32_t)payloadSize; /* Prepare signature */ sig = rpmNewSignature(); @@ -322,14 +324,14 @@ static rpmRC generateSignature(char *SHA td.tag = payloadtag; td.count = 1; td.type = typetag; - td.data = &payloadSize; + td.data = typetag == RPM_INT32_TYPE ? &payloadSize32 : &payloadSize; headerPut(sig, &td, HEADERPUT_DEFAULT); rpmtdReset(&td); td.tag = sizetag; td.count = 1; td.type = typetag; - td.data = &size; + td.data = typetag == RPM_INT32_TYPE ? &size32 : &size; headerPut(sig, &td, HEADERPUT_DEFAULT); spaceSize = rpmExpandNumeric("%{__gpg_reserved_space}"); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de