From 77f9b1ed06d494d112701a5abd75364d87cb3648 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Nov 15 2007 13:14:38 +0000 Subject: - Unbreak debugedit (missing crypto initialization) --- diff --git a/rpm-4.4.2.2-cryptoinit.patch b/rpm-4.4.2.2-cryptoinit.patch index 6cfea60..6de7c25 100644 --- a/rpm-4.4.2.2-cryptoinit.patch +++ b/rpm-4.4.2.2-cryptoinit.patch @@ -1,6 +1,6 @@ diff -up rpm-4.4.2.2/rpmio/digest.c.nss-init rpm-4.4.2.2/rpmio/digest.c ---- rpm-4.4.2.2/rpmio/digest.c.nss-init 2007-11-15 10:57:04.000000000 +0200 -+++ rpm-4.4.2.2/rpmio/digest.c 2007-11-15 10:57:04.000000000 +0200 +--- rpm-4.4.2.2/rpmio/digest.c.nss-init 2007-11-15 15:00:41.000000000 +0200 ++++ rpm-4.4.2.2/rpmio/digest.c 2007-11-15 15:00:41.000000000 +0200 @@ -78,9 +78,6 @@ rpmDigestInit(pgpHashAlgo hashalgo, rpmD HASH_HashType type; DIGEST_CTX ctx = xcalloc(1, sizeof(*ctx)); @@ -12,8 +12,8 @@ diff -up rpm-4.4.2.2/rpmio/digest.c.nss-init rpm-4.4.2.2/rpmio/digest.c type = getHashType(hashalgo); diff -up rpm-4.4.2.2/rpmio/rpmpgp.h.nss-init rpm-4.4.2.2/rpmio/rpmpgp.h ---- rpm-4.4.2.2/rpmio/rpmpgp.h.nss-init 2007-11-15 10:57:04.000000000 +0200 -+++ rpm-4.4.2.2/rpmio/rpmpgp.h 2007-11-15 10:57:04.000000000 +0200 +--- rpm-4.4.2.2/rpmio/rpmpgp.h.nss-init 2007-11-15 15:00:41.000000000 +0200 ++++ rpm-4.4.2.2/rpmio/rpmpgp.h 2007-11-15 15:00:41.000000000 +0200 @@ -1380,6 +1380,15 @@ unsigned int pgpCRC(const byte *octets, } @@ -31,8 +31,8 @@ diff -up rpm-4.4.2.2/rpmio/rpmpgp.h.nss-init rpm-4.4.2.2/rpmio/rpmpgp.h * @param octx existing digest context * @return duplicated digest context diff -up rpm-4.4.2.2/rpmio/rpmpgp.c.nss-init rpm-4.4.2.2/rpmio/rpmpgp.c ---- rpm-4.4.2.2/rpmio/rpmpgp.c.nss-init 2007-11-15 10:57:04.000000000 +0200 -+++ rpm-4.4.2.2/rpmio/rpmpgp.c 2007-11-15 10:58:07.000000000 +0200 +--- rpm-4.4.2.2/rpmio/rpmpgp.c.nss-init 2007-11-15 15:00:41.000000000 +0200 ++++ rpm-4.4.2.2/rpmio/rpmpgp.c 2007-11-15 15:00:41.000000000 +0200 @@ -17,6 +17,8 @@ static int _debug = 0; /*@unchecked@*/ static int _print = 0; @@ -70,9 +70,21 @@ diff -up rpm-4.4.2.2/rpmio/rpmpgp.c.nss-init rpm-4.4.2.2/rpmio/rpmpgp.c +} + + +diff -up rpm-4.4.2.2/tools/debugedit.c.nss-init rpm-4.4.2.2/tools/debugedit.c +--- rpm-4.4.2.2/tools/debugedit.c.nss-init 2007-11-15 15:01:42.000000000 +0200 ++++ rpm-4.4.2.2/tools/debugedit.c 2007-11-15 15:02:23.000000000 +0200 +@@ -1318,6 +1318,8 @@ handle_build_id (DSO *dso, Elf_Data *bui + void *digest = NULL; + size_t len; + ++ rpmInitCrypto(); ++ + while (i-- > 0) + { + algorithm = algorithms[i]; diff -up rpm-4.4.2.2/lib/rpmrc.c.nss-init rpm-4.4.2.2/lib/rpmrc.c --- rpm-4.4.2.2/lib/rpmrc.c.nss-init 2007-09-11 09:28:15.000000000 +0300 -+++ rpm-4.4.2.2/lib/rpmrc.c 2007-11-15 10:57:04.000000000 +0200 ++++ rpm-4.4.2.2/lib/rpmrc.c 2007-11-15 15:00:41.000000000 +0200 @@ -1850,6 +1850,10 @@ static int rpmReadRC(/*@null@*/ const ch int rpmReadConfigFiles(const char * file, const char * target) diff --git a/rpm.spec b/rpm.spec index 7e86869..e2e9c0d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -6,7 +6,7 @@ Summary: The RPM package management system Name: rpm Version: 4.4.2.2 -Release: 10%{?dist} +Release: 11%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source: http://rpm.org/releases/rpm-4.4.x/%{name}-%{version}.tar.gz @@ -417,6 +417,9 @@ exit 0 %endif %changelog +* Thu Nov 15 2007 Panu Matilainen 4.4.2.2-11 +- Unbreak debugedit (missing crypto initialization) + * Thu Nov 15 2007 Panu Matilainen 4.4.2.2-10 - Initialize NSS as early as possible (#382091)