rpms/gpgme/FC-5 gpgme-1.1.2-config_extras.patch, 1.2, 1.3 gpgme-1.1.3-multiple-message.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 gpgme.spec, 1.18, 1.19 sources, 1.7, 1.8 gpgme-1.1.3-config_extras.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gpgme/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12569

Modified Files:
	.cvsignore gpgme.spec sources 
Added Files:
	gpgme-1.1.2-config_extras.patch 
	gpgme-1.1.3-multiple-message.patch 
Removed Files:
	gpgme-1.1.3-config_extras.patch 
Log Message:
* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.2-8
- gpgme-1.1.3-multiple-message.patch 


gpgme-1.1.2-config_extras.patch:

Index: gpgme-1.1.2-config_extras.patch
===================================================================
RCS file: gpgme-1.1.2-config_extras.patch
diff -N gpgme-1.1.2-config_extras.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gpgme-1.1.2-config_extras.patch	5 Mar 2007 21:28:08 -0000	1.3
@@ -0,0 +1,24 @@
+--- gpgme-1.1.2/gpgme/gpgme-config.in.config_extras	2005-11-18 17:03:28.000000000 -0600
++++ gpgme-1.1.2/gpgme/gpgme-config.in	2006-03-06 08:50:57.000000000 -0600
+@@ -16,15 +16,19 @@
+ 
+ # Configure libgpg-error.
+ gpg_error_cflags="@GPG_ERROR_CFLAGS@"
+-gpg_error_libs="@GPG_ERROR_LIBS@"
++#gpg_error_libs="@GPG_ERROR_LIBS@"
+ 
+ # Configure thread packages.
+ thread_modules=""
+ 
+ @HAVE_PTH_TRUE at thread_modules="$thread_modules pth"
+-libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
++#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
+ cflags_pth="@PTH_CFLAGS@"
+ 
++ at HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
++#libs_pthread="@PTHREAD_LDFLAGS@ @PTHREAD_LIBS@"
++cflags_pthread="@PTHREAD_CFLAGS@"
++
+ # Configure glib.
+ libs_glib="@GLIB_LIBS@"
+ cflags_glib="@GLIB_CFLAGS@"

gpgme-1.1.3-multiple-message.patch:

--- NEW FILE gpgme-1.1.3-multiple-message.patch ---
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
NotDashEscaped: You need GnuPG to verify this message

Patch against gpgme 1.1.3 (might work also for 1.1.2) to detect and
bail out on double plaintext messages.  This does not require a gpg
update.


2007-02-26  Werner Koch  <wk at g10code.com>

	* verify.c (op_data_t): New element PLAINTEXT_SEEN.
	(_gpgme_verify_status_handler): Return an error if more than one
	plaintext has been seen.
	(parse_error): New arg SET_STATUS. Also detect it based on an
	ERROR status (gpg > 1.4.6).


Index: gpgme/verify.c
===================================================================
--- gpgme/verify.c	(revision 1208)
+++ gpgme/verify.c	(working copy)
@@ -40,6 +40,7 @@
   gpgme_signature_t current_sig;
   int did_prepare_new_sig;
   int only_newsig_seen;
+  int plaintext_seen;
 } *op_data_t;
 
 
@@ -549,8 +550,11 @@
 }
 
 
+/* Parse an error status line and if SET_STATUS is true update the
+   result status as appropriate.  With SET_STATUS being false, only
+   check for an error.  */
 static gpgme_error_t
-parse_error (gpgme_signature_t sig, char *args)
+parse_error (gpgme_signature_t sig, char *args, int set_status)
 {
   gpgme_error_t err;
   char *where = strchr (args, ' ');
@@ -572,7 +576,16 @@
 
   err = _gpgme_map_gnupg_error (which);
 
-  if (!strcmp (where, "verify.findkey"))
+  if (!strcmp (where, "proc_pkt.plaintext")
+      && gpg_err_code (err) == GPG_ERR_BAD_DATA)
+    {
+      /* This indicates a double plaintext.  The only solid way to
+         handle this is by failing the oepration.  */
+      return gpg_error (GPG_ERR_BAD_DATA);
+    }
+  else if (!set_status)
+    ;
+  else if (!strcmp (where, "verify.findkey"))
     sig->status = err;
   else if (!strcmp (where, "verify.keyusage")
 	   && gpg_err_code (err) == GPG_ERR_WRONG_KEY_USAGE)
@@ -670,9 +683,9 @@
 
     case GPGME_STATUS_ERROR:
       opd->only_newsig_seen = 0;
-      /* The error status is informational, so we don't return an
-         error code if we are not ready to process this status. */
-      return sig ? parse_error (sig, args) : 0;
+      /* Some  error stati are informational, so we don't return an
+         error code if we are not ready to process this status.  */
+      return parse_error (sig, args, !!sig );
 
     case GPGME_STATUS_EOF:
       if (sig && !opd->did_prepare_new_sig)
@@ -703,6 +716,8 @@
       break;
 
     case GPGME_STATUS_PLAINTEXT:
+      if (++opd->plaintext_seen > 1)
+        return gpg_error (GPG_ERR_BAD_DATA);
       err = _gpgme_parse_plaintext (args, &opd->result.file_name);
       if (err)
 	return err;





-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.2 (GNU/Linux)

iEYEARECAAYFAkXkB7AACgkQYHhOlAEKV+2V5wCfavHmwJvFIeFRhApklzNW+s2Z
4aQAnjLImN392ZvwPAR0LWryufeufXRW
=9KIJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Mar 2007 20:46:46 -0000	1.7
+++ .cvsignore	5 Mar 2007 21:28:08 -0000	1.8
@@ -1,4 +1,6 @@
 clog
+gpgme-1.1.2.tar.bz2
+gpgme-1.1.2.tar.bz2.sig
 gpgme-1.1.3.tar.bz2
 gpgme-1.1.3.tar.bz2.sig
 gpgme-1.1.4.tar.bz2


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-5/gpgme.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gpgme.spec	5 Mar 2007 20:46:46 -0000	1.18
+++ gpgme.spec	5 Mar 2007 21:28:08 -0000	1.19
@@ -1,8 +1,8 @@
 
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
-Version: 1.1.4
-Release: 1%{?dist}
+Version: 1.1.2
+Release: 8%{?dist}
 
 License: LGPL
 Group:   Applications/System
@@ -11,7 +11,9 @@
 Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gpgme-1.1.3-config_extras.patch
+Patch1: gpgme-1.1.2-config_extras.patch
+# From ftp://ftp.gnupg.org/gcrypt/gpgme/patches/gpgme-1.1.3-multiple-message.patch
+Patch2: gpgme-1.1.3-multiple-message.patch
 
 BuildRequires: gnupg
 BuildRequires: gnupg2
@@ -47,6 +49,7 @@
 %setup -q
 
 %patch1 -p1 -b .config_extras
+%patch2 -p0 -b .multiple_message
 
 
 %build
@@ -107,21 +110,12 @@
 
 
 %changelog
-* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.4-1
-- gpgme-1.1.4
-
-* Sat Feb 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.3-1
-- gpgme-1.1.3
-
-* Tue Oct 03 2006 Rex Dieter <rexdieter[AT]users.sf.net>
-- respin
+* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.2-8
+- gpgme-1.1.3-multiple-message.patch 
 
 * Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-6
 - fix gpgme-config --thread=pthread --cflags
 
-* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-5
-- fc6 respin
-
 * Mon Mar 6 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-4
 - add back support for gpgme-config --thread=pthread
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Mar 2007 20:46:46 -0000	1.7
+++ sources	5 Mar 2007 21:28:08 -0000	1.8
@@ -1,2 +1,2 @@
-3b133a3703f16835e55d1a2f8cfdfa70  gpgme-1.1.4.tar.bz2
-4faf6a954723e7960487c741596e4f12  gpgme-1.1.4.tar.bz2.sig
+7c2333679035a5f37e99630a156a40ca  gpgme-1.1.2.tar.bz2
+5b786d78d322ea0778eea5ae67c087b4  gpgme-1.1.2.tar.bz2.sig


--- gpgme-1.1.3-config_extras.patch DELETED ---