rpms/rpm/devel rpm-4.5.90-digestlen.patch, NONE, 1.1 rpm.spec, 1.284, 1.285

Panu Matilainen (pmatilai) fedora-extras-commits at redhat.com
Sat Jul 12 15:03:13 UTC 2008


Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9387

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.5.90-digestlen.patch 
Log Message:
Fix type mismatch causing "interesting" effects on ppc64
- patch already upstreamed, not worth pushing entire new snapshot tarball..


rpm-4.5.90-digestlen.patch:

--- NEW FILE rpm-4.5.90-digestlen.patch ---
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;


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- rpm.spec	11 Jul 2008 15:54:19 -0000	1.284
+++ rpm.spec	12 Jul 2008 15:02:42 -0000	1.285
@@ -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 @@
 # 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 @@
 %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 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Sat Jul 12 2008 Panu Matilainen <pmatilai at redhat.com>
+- 4.5.90-0.git8426.6
+- fix type mismatch causing funky breakage on ppc64
+
 * Fri Jul 11 2008 Panu Matilainen <pmatilai at redhat.com>
 - 4.5.90-0.git8426.5
 - flip back to external bdb




More information about the fedora-extras-commits mailing list