rpms/dirmngr/devel dirmngr-1.0.2-libgcrypt12.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 dirmngr.spec, 1.14, 1.15 sources, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore dirmngr.spec sources 
Added Files:
	dirmngr-1.0.2-libgcrypt12.patch 
Log Message:
* Fri Aug 01 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.2-1
- dirmngr-1.0.2


dirmngr-1.0.2-libgcrypt12.patch:

--- NEW FILE dirmngr-1.0.2-libgcrypt12.patch ---
diff -up dirmngr-1.0.2/src/crlcache.c.libgcrypt12 dirmngr-1.0.2/src/crlcache.c
--- dirmngr-1.0.2/src/crlcache.c.libgcrypt12	2008-02-21 12:04:57.000000000 -0600
+++ dirmngr-1.0.2/src/crlcache.c	2008-08-01 23:10:41.000000000 -0500
@@ -1445,7 +1445,13 @@ start_sig_check (ksba_crl_t crl, gcry_md
       return err;
     }
   if (DBG_HASHING)
-    gcry_md_debug (*md, "crl");
+    {
+#ifdef HAVE_GCRY_MD_DEBUG
+      gcry_md_debug (*md, "hash.cert");
+#else
+      gcry_md_start_debug (*md, "crl");
+#endif
+    }
 
   ksba_crl_set_hash_function (crl, HASH_FNC, *md);  
   return 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dirmngr/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Jan 2008 14:47:53 -0000	1.6
+++ .cvsignore	2 Aug 2008 04:18:45 -0000	1.7
@@ -1,7 +1,2 @@
-dirmngr-0.9.4.tar.bz2
-dirmngr-0.9.4.tar.bz2.sig
-dirmngr-0.9.6.tar.bz2
-dirmngr-0.9.6.tar.bz2.sig
-dirmngr-1.0.0.tar.bz2.sig
-dirmngr-1.0.1.tar.bz2
-dirmngr-1.0.1.tar.bz2.sig
+dirmngr-1.0.2.tar.bz2
+dirmngr-1.0.2.tar.bz2.sig


Index: dirmngr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dirmngr/devel/dirmngr.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dirmngr.spec	11 Feb 2008 13:19:06 -0000	1.14
+++ dirmngr.spec	2 Aug 2008 04:18:45 -0000	1.15
@@ -3,8 +3,8 @@
 
 Name:	 dirmngr 
 Summary: Client for Managing/Downloading CRLs
-Version: 1.0.1
-Release: 2%{?dist} 
+Version: 1.0.2
+Release: 1%{?dist} 
 
 License: GPLv2+
 Group:	 System Environment/Libraries
@@ -17,6 +17,9 @@
 Source11: ldapservers.conf
 Source12: dirmngr.logrotate
 
+## upstream patches
+Patch100: dirmngr-1.0.2-libgcrypt12.patch
+
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libassuan-devel
@@ -41,6 +44,8 @@
 %prep
 %setup -q
 
+%patch100 -p1 -b .libgcrypt12
+
 pushd doc
 iconv -f iso-8859-1 -t utf-8 dirmngr.texi -o dirmngr.texi.NEW && mv dirmngr.texi.NEW dirmngr.texi
 iconv -f iso-8859-1 -t utf-8 dirmngr.info -o dirmngr.info.NEW && mv dirmngr.info.NEW dirmngr.info
@@ -77,6 +82,7 @@
 
 ## unpackaged files
 rm -f %{buildroot}%{_infodir}/dir
+rm -rf %{buildroot}%{_docdir}/dirmngr/examples
 
 
 %check
@@ -99,6 +105,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README ChangeLog NEWS
+%doc doc/examples
 %{_bindir}/dirmngr*
 %{_libexecdir}/dirmngr_ldap
 %{_infodir}/dirmngr.info*
@@ -116,6 +123,9 @@
 
 
 %changelog
+* Fri Aug 01 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.2-1
+- dirmngr-1.0.2
+
 * Mon Feb 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.1-2
 - respin (gcc43)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dirmngr/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Jan 2008 14:47:53 -0000	1.6
+++ sources	2 Aug 2008 04:18:45 -0000	1.7
@@ -1,2 +1,2 @@
-3b969ee763fa9160319abe3f24b5959d  dirmngr-1.0.1.tar.bz2
-5dfe41b5c1f2ce0d64ddf5298961fdfe  dirmngr-1.0.1.tar.bz2.sig
+88d62a348903009cbc96212e4684c89c  dirmngr-1.0.2.tar.bz2
+c3e8a5df97399b6891b06123b770e597  dirmngr-1.0.2.tar.bz2.sig