[quilt] Fix regression in email address checking

[Josh Boyer]

commit 87211256971b45710248e42f16d740830a63e4c7
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Wed Dec 7 14:48:25 2011 -0500

    Fix regression in email address checking

 quilt-mail-Fix-delivery-address-checking.patch |   41 ++++++++++++++++++++++++
 quilt.spec                                     |    7 +++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/quilt-mail-Fix-delivery-address-checking.patch b/quilt-mail-Fix-delivery-address-checking.patch
new file mode 100644
index 0000000..6878d6b
--- /dev/null
+++ b/quilt-mail-Fix-delivery-address-checking.patch
@@ -0,0 +1,41 @@
+From 00e551287a23749c7d1b0bc3e25741a5bd360bcd Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen at linbit.com>
+Date: Wed, 7 Dec 2011 18:52:39 +0100
+Subject: [PATCH] quilt mail: Fix delivery address checking
+
+Make sure to remove trailing whitespace (including the newline) when extracting
+recipient addresses from headers.
+---
+ quilt/scripts/edmail.in |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/quilt/scripts/edmail.in b/quilt/scripts/edmail.in
+index 10aa771..140355b 100644
+--- a/quilt/scripts/edmail.in
++++ b/quilt/scripts/edmail.in
+@@ -128,11 +128,12 @@ sub split_recipients($) {
+     while ($recipients !~ /^\s*$/) {
+ 	my $recipient;
+ 	if ($recipients =~ s/^\s*,?\s*((?:"(?:[^"]+)"|[^",])*)//) {
+-	    $recipient = $1; s/\s*$//;
++	    $recipient = $1;
+ 	} else {
+ 	    $recipient = $recipients;
+ 	    $recipients = "";
+ 	}
++	$recipient =~ s/\s*$//;
+ 	push @list, $recipient;
+     }
+     return @list;
+@@ -144,7 +145,7 @@ sub process_header($) {
+     my ($name, $value);
+ 
+     return unless defined $_;
+-    unless (($name, $value) = /^([\41-\176]+):\s*(.*)\s*/s) {
++    unless (($name, $value) = /^([\41-\176]+):\s*(.*)/s) {
+ 	print;
+ 	return
+     }
+-- 
+1.7.7.3
+
diff --git a/quilt.spec b/quilt.spec
index b568ab4..a98a193 100644
--- a/quilt.spec
+++ b/quilt.spec
@@ -7,7 +7,7 @@ Summary:	Scripts for working with series of patches
 License:	GPLv2
 Group:		Development/Tools
 Version:	0.50
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz
 URL:		http://savannah.nongnu.org/projects/quilt
 BuildRequires: gettext gawk util-linux-ng
@@ -22,6 +22,7 @@ Requires: %{_sbindir}/sendmail
 Requires: util-linux-ng
 Requires: tar
 Requires: rpm-build
+Patch1: quilt-mail-Fix-delivery-address-checking.patch
 
 %description
 These scripts allow one to manage a series of patches by keeping track of the
@@ -32,6 +33,7 @@ http://www.zip.com.au/~akpm/linux/patches/
 
 %prep
 %setup
+%patch1 -p1
 
 %build
 %configure --with-sendmail=%{_sbindir}/sendmail --with-diffstat=%{_bindir}/diffstat
@@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT/%{_docdir}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Dec 07 2011 Josh Boyer <jwboyer at redhat.com> - 0.50-2
+- Fix regression in email address checking
+
 * Tue Dec 06 2011 Josh Boyer <jwboyer at redhat.com> - 0.50-1
 - Update to latest upstream release