From 9833c0365324cd2a68256ab48eb018fdffbc240a Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Jul 27 2005 20:42:19 +0000
Subject: update to 1.4.2


---

diff --git a/.cvsignore b/.cvsignore
index f48e38a..743e1df 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,5 @@ gnupg-1.4.0.tar.bz2
 gnupg-1.4.0.tar.bz2.sig
 gnupg-1.4.1.tar.bz2
 gnupg-1.4.1.tar.bz2.sig
+gnupg-1.4.2.tar.bz2
+gnupg-1.4.2.tar.bz2.sig
diff --git a/gnupg-1.4.2-curl.patch b/gnupg-1.4.2-curl.patch
new file mode 100644
index 0000000..1bd4bac
--- /dev/null
+++ b/gnupg-1.4.2-curl.patch
@@ -0,0 +1,17 @@
+We don't use the libcurl support, but in case that changes before the next
+release, apply it.
+
+diff -u -p -r1.90 -r1.91
+--- g10/keyserver.c	22 Jul 2005 16:28:40 -0000	1.90
++++ g10/keyserver.c	27 Jul 2005 01:24:57 -0000	1.91
+@@ -860,7 +860,9 @@ curl_can_handle(const char *scheme)
+ static const char *
+ keyserver_typemap(const char *type)
+ {
+-  if(strcmp(type,"ldaps")==0)
++  if(strcmp(type,"ldap")==0)
++    return "ldap";
++  else if(strcmp(type,"ldaps")==0)
+     return "ldap";
+   else if(curl_can_handle(type))
+     return "curl";
diff --git a/gnupg.spec b/gnupg.spec
index bbd9fb3..54819bd 100644
--- a/gnupg.spec
+++ b/gnupg.spec
@@ -1,7 +1,7 @@
 Summary: A GNU utility for secure communication and data storage.
 Name: gnupg
-Version: 1.4.1
-Release: 3
+Version: 1.4.2
+Release: 1
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -9,6 +9,7 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 Source2: gnupg-shm-coprocessing.expect
 Source3: 57548DCD.gpg
 Patch0: gnupg-1.4.1-gcc.patch
+Patch1: gnupg-1.4.2-curl.patch
 URL: http://www.gnupg.org/
 BuildPrereq: autoconf, automake, bzip2-devel, expect, ncurses-devel
 BuildPrereq: openldap-devel, readline-devel, zlib-devel
@@ -29,7 +30,8 @@ only IDEA for symmetric-key encryption, which is patented worldwide).
 
 %prep
 %setup -q
-%patch -p1 -b .gcc
+%patch0 -p1 -b .gcc
+%patch1 -p0 -b .curl
 autoreconf
 
 %build
@@ -86,6 +88,9 @@ fi
 %{_mandir}/man7/*
 
 %changelog
+* Wed Jul 27 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4.2-1
+- update to 1.4.2
+
 * Thu May  5 2005 Nalin Dahyabhai <nalin@redhat.com> 1.4.1-3
 - fix the execstack problem correctly this time (arjanv)
 
diff --git a/sources b/sources
index efe2385..b7550fe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fdfc5553d0904cd65011e47a42a9532c  gnupg-1.4.1.tar.bz2
-440038771606d59e9cbc153cccdbac55  gnupg-1.4.1.tar.bz2.sig
+c7afd50c7d01fcfada229326b3958404  gnupg-1.4.2.tar.bz2
+9b2fba5c49d094b1f1b8219d354e61f5  gnupg-1.4.2.tar.bz2.sig