rpms/rpm/devel rpm-4.4.2.2-cryptoinit.patch, 1.1, 1.2 rpm.spec, 1.271, 1.272

[Panu Matilainen (pmatilai)]

Author: pmatilai

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

Modified Files:
	rpm-4.4.2.2-cryptoinit.patch rpm.spec 
Log Message:
- Unbreak debugedit (missing crypto initialization)


rpm-4.4.2.2-cryptoinit.patch:

Index: rpm-4.4.2.2-cryptoinit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm-4.4.2.2-cryptoinit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.4.2.2-cryptoinit.patch	15 Nov 2007 09:09:45 -0000	1.1
+++ rpm-4.4.2.2-cryptoinit.patch	15 Nov 2007 13:14:38 -0000	1.2
@@ -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 @@
  
      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 @@
   * @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/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)


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- rpm.spec	15 Nov 2007 09:09:45 -0000	1.271
+++ rpm.spec	15 Nov 2007 13:14:38 -0000	1.272
@@ -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 @@
 %endif
 
 %changelog
+* Thu Nov 15 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-11
+- Unbreak debugedit (missing crypto initialization)
+
 * Thu Nov 15 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-10
 - Initialize NSS as early as possible (#382091)