rpms/rpm/devel rpm-4.7.0-alpha-isa.patch, NONE, 1.1 rpm-4.7.0-rsa-v4.patch, NONE, 1.1 rpm.spec, 1.337, 1.338

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32515

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.0-alpha-isa.patch rpm-4.7.0-rsa-v4.patch 
Log Message:
- handle RSA V4 signatures (#436812)
- add alpha arch ISA-bits
- enable internal testsuite on build
- adjust sqlite backend comment - it works but nobody is missing it...


rpm-4.7.0-alpha-isa.patch:

--- NEW FILE rpm-4.7.0-alpha-isa.patch ---
commit 48c70edaa1ed3bab085cebea5749c812cee3109a
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Mar 3 08:48:12 2009 +0200

    Add ISA bits for alpha (Oliver Falk)
    (cherry picked from commit d39a6c7de51c0d01ce69ee1f464b94ca70309751)

diff --git a/installplatform b/installplatform
index fded6f6..96919b6 100755
--- a/installplatform
+++ b/installplatform
@@ -109,6 +109,10 @@ for SUBST in $SUBSTS ; do
 	ISANAME=`echo ${ARCH} | sed "s/^\([^-]*\)-.*/\1/"`
 	ISABITS=32
 	;;
+    alpha*)
+	ISANAME=alpha
+	ISABITS=64
+	;;
   esac
 
   case $VENDOR in

rpm-4.7.0-rsa-v4.patch:

--- NEW FILE rpm-4.7.0-rsa-v4.patch ---
commit 452f162ef51d4c6484e93c2b0bc5866c10c8b734
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Mar 4 13:08:30 2009 +0200

    Handle V4 signature trailer for RSA too (ticket #34)
    (cherry picked from commit d50db40ceed7083467f7b548da7b2fbe96aaec61)

diff --git a/lib/signature.c b/lib/signature.c
index feafc5e..9ca8da5 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -1194,17 +1194,16 @@ verifyRSASignature(rpmKeyring keyring, rpmtd sigtd, pgpDig dig, char ** msg,
 	if (sigp->hash != NULL)
 	    xx = rpmDigestUpdate(ctx, sigp->hash, sigp->hashlen);
 
-#ifdef	NOTYET	/* XXX not for binary/text signatures as in packages. */
-	if (!(sigp->sigtype == PGPSIGTYPE_BINARY || sigp->sigtype == PGP_SIGTYPE_TEXT)) {
-	    size_t nb = dig->nbytes + sigp->hashlen;
+	if (sigp->version == 4) {
+	    /* V4 trailer is six octets long (rfc4880) */
 	    uint8_t trailer[6];
+	    uint32_t nb = sigp->hashlen;
 	    nb = htonl(nb);
-	    trailer[0] = 0x4;
+	    trailer[0] = sigp->version;
 	    trailer[1] = 0xff;
-	    memcpy(trailer+2, &nb, sizeof(nb));
+	    memcpy(trailer+2, &nb, 4);
 	    xx = rpmDigestUpdate(ctx, trailer, sizeof(trailer));
 	}
-#endif
 
 	xx = rpmDigestFinal(ctx, (void **)&dig->md5, &dig->md5len, 0);
 


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- rpm.spec	9 Mar 2009 13:08:01 -0000	1.337
+++ rpm.spec	12 Mar 2009 06:27:20 -0000	1.338
@@ -4,8 +4,8 @@
 %bcond_with sqlite
 # just for giggles, option to build with internal Berkeley DB
 %bcond_with int_bdb
-# not yet, a missing test-data file in beta1 tarball causes two tests to fail
-%bcond_with check
+# run internal testsuite?
+%bcond_without check
 
 # switch rpm itself back to md5 file digests until the dust settles a bit
 %define _source_filedigest_algorithm 0
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.3%{?dist}
+Release: 0.%{snapver}.4%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -46,6 +46,8 @@
 Patch200: rpm-4.7.0-beta1-srcrpm-macros.patch
 Patch201: rpm-4.7.0-beta1-fstates.patch
 Patch202: rpm-4.7.0-beta1-installangs.patch
+Patch203: rpm-4.7.0-alpha-isa.patch
+Patch204: rpm-4.7.0-rsa-v4.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
@@ -189,6 +191,8 @@
 %patch200 -p1 -b .srcrpm-macros
 %patch201 -p1 -b .fstates
 %patch202 -p1 -b .installangs
+%patch203 -p1 -b .alpha-isa
+%patch204 -p1 -b .rsa-v4
 
 %patch300 -p1 -b .extra-prov
 
@@ -271,7 +275,8 @@
 
 %if %{with check}
 %check
-make check
+# missing file in beta1 tarball causes two failures, permit failure for now
+make check ||:
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -395,6 +400,11 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Mar 12 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.4
+- handle RSA V4 signatures (#436812)
+- add alpha arch ISA-bits
+- enable internal testsuite on build
+
 * Mon Mar 09 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.3
 - fix _install_langs behavior (#489235)
 - fix recording of file states into rpmdb on install