From ac1dcaabc3ff633223402d87874000254e0f1b6d Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Jul 12 2008 15:02:42 +0000 Subject: Fix type mismatch causing "interesting" effects on ppc64 - patch already upstreamed, not worth pushing entire new snapshot tarball.. --- diff --git a/rpm-4.5.90-digestlen.patch b/rpm-4.5.90-digestlen.patch new file mode 100644 index 0000000..5aa0fd8 --- /dev/null +++ b/rpm-4.5.90-digestlen.patch @@ -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; diff --git a/rpm.spec b/rpm.spec index bdd76ef..5141eaa 100644 --- a/rpm.spec +++ b/rpm.spec @@ -18,7 +18,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 0.%{snapver}.5 +Release: 0.%{snapver}.6 Group: System Environment/Base Url: http://www.rpm.org/ 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 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 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD License: GPLv2+ @@ -156,6 +158,7 @@ that will manipulate RPM packages and databases. %patch0 -p1 -b .devel-autodep %patch1 -p1 -b .pkgconfig-path %patch100 -p1 -b .pkgconfig-deps +%patch200 -p1 -b .diglen %if %{with int_bdb} ln -s db-%{bdbver} db @@ -331,6 +334,10 @@ exit 0 %doc doc/librpm/html/* %changelog +* Sat Jul 12 2008 Panu Matilainen +- 4.5.90-0.git8426.6 +- fix type mismatch causing funky breakage on ppc64 + * Fri Jul 11 2008 Panu Matilainen - 4.5.90-0.git8426.5 - flip back to external bdb