Fix type mismatch causing "interesting" effects on ppc64
- patch already upstreamed, not worth pushing entire new snapshot tarball..
This commit is contained in:
parent
cbac7f35a8
commit
ac1dcaabc3
13
rpm-4.5.90-digestlen.patch
Normal file
13
rpm-4.5.90-digestlen.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/rpmio/digest.c b/rpmio/digest.c
|
||||||
|
index c360919..64b678b 100644
|
||||||
|
--- a/rpmio/digest.c
|
||||||
|
+++ b/rpmio/digest.c
|
||||||
|
@@ -123,7 +123,7 @@ int
|
||||||
|
rpmDigestFinal(DIGEST_CTX ctx, void ** datap, size_t *lenp, int asAscii)
|
||||||
|
{
|
||||||
|
unsigned char * digest;
|
||||||
|
- size_t digestlen;
|
||||||
|
+ unsigned int digestlen;
|
||||||
|
|
||||||
|
if (ctx == NULL)
|
||||||
|
return -1;
|
9
rpm.spec
9
rpm.spec
@ -18,7 +18,7 @@
|
|||||||
Summary: The RPM package management system
|
Summary: The RPM package management system
|
||||||
Name: rpm
|
Name: rpm
|
||||||
Version: %{rpmver}
|
Version: %{rpmver}
|
||||||
Release: 0.%{snapver}.5
|
Release: 0.%{snapver}.6
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Url: http://www.rpm.org/
|
Url: http://www.rpm.org/
|
||||||
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
|
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
|
||||||
@ -31,6 +31,8 @@ Patch1: rpm-4.5.90-pkgconfig-path.patch
|
|||||||
# XXX only create provides for pkgconfig and libtool initially
|
# XXX only create provides for pkgconfig and libtool initially
|
||||||
Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
|
Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
|
||||||
|
|
||||||
|
Patch200: rpm-4.5.90-digestlen.patch
|
||||||
|
|
||||||
# Partially GPL/LGPL dual-licensed and some bits with BSD
|
# Partially GPL/LGPL dual-licensed and some bits with BSD
|
||||||
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
|
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -156,6 +158,7 @@ that will manipulate RPM packages and databases.
|
|||||||
%patch0 -p1 -b .devel-autodep
|
%patch0 -p1 -b .devel-autodep
|
||||||
%patch1 -p1 -b .pkgconfig-path
|
%patch1 -p1 -b .pkgconfig-path
|
||||||
%patch100 -p1 -b .pkgconfig-deps
|
%patch100 -p1 -b .pkgconfig-deps
|
||||||
|
%patch200 -p1 -b .diglen
|
||||||
|
|
||||||
%if %{with int_bdb}
|
%if %{with int_bdb}
|
||||||
ln -s db-%{bdbver} db
|
ln -s db-%{bdbver} db
|
||||||
@ -331,6 +334,10 @@ exit 0
|
|||||||
%doc doc/librpm/html/*
|
%doc doc/librpm/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jul 12 2008 Panu Matilainen <pmatilai@redhat.com>
|
||||||
|
- 4.5.90-0.git8426.6
|
||||||
|
- fix type mismatch causing funky breakage on ppc64
|
||||||
|
|
||||||
* Fri Jul 11 2008 Panu Matilainen <pmatilai@redhat.com>
|
* Fri Jul 11 2008 Panu Matilainen <pmatilai@redhat.com>
|
||||||
- 4.5.90-0.git8426.5
|
- 4.5.90-0.git8426.5
|
||||||
- flip back to external bdb
|
- flip back to external bdb
|
||||||
|
Loading…
Reference in New Issue
Block a user