rpms/archivemail/devel archivemail-0.7.0-imap.patch, NONE, 1.1 archivemail.spec, 1.1, 1.2

[Jon Ciesla (limb)]

Author: limb

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

Modified Files:
	archivemail.spec 
Added Files:
	archivemail-0.7.0-imap.patch 
Log Message:
BZ 243846 fix.


archivemail-0.7.0-imap.patch:

--- NEW FILE archivemail-0.7.0-imap.patch ---
--- archivemail	2007-02-17 10:32:39.000000000 +1000
+++ archivemail	2007-02-17 10:34:51.000000000 +1000
@@ -1299,7 +1299,8 @@
     imap_filter = build_imap_filter()
     vprint("imap filter: '%s'" % imap_filter)
     try:
-        imap_username, imap_str = imap_str.split('@', 1)
+	imap_username, imap_str = re.split(r"(?<!\\)@", imap_str, 1)
+	imap_username = imap_username.replace('\\@', '@')
         imap_server, imap_folder = imap_str.split('/', 1)
     except ValueError:
         unexpected_error("you must provide a properly formatted "


Index: archivemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/archivemail/devel/archivemail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- archivemail.spec	25 May 2007 12:41:27 -0000	1.1
+++ archivemail.spec	12 Jun 2007 12:26:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		archivemail
 Version:	0.7.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A tool for archiving and compressing old email in mailboxes
 
 Group:		Applications/Internet
@@ -14,6 +14,7 @@
 Patch1:		archivemail-test-noshebang.patch
 Patch2:		archivemail-main-noshebang.patch
 Patch3:		archivemail-0.7.0-fpname.patch
+Patch4:		archivemail-0.7.0-imap.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -40,6 +41,7 @@
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
 
 %build
 
@@ -63,6 +65,9 @@
 %{_mandir}/man1/archivemail.1.gz
 
 %changelog
+* Tue Jun 12 2007 Jon Ciesla <limb at jcomserv.net> 0.7.0-6
+- Patch to fix imap handling, BZ 243846.
+
 * Thu May 24 2007 Jon Ciesla <limb at jcomserv.net> 0.7.0-5
 - Applied upstream patch to fix issues with python 2.5.