rpms/isync/devel isync-1.0.3-args.patch, NONE, 1.1 isync.spec, 1.2, 1.3

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

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

Modified Files:
	isync.spec 
Added Files:
	isync-1.0.3-args.patch 
Log Message:
Fix for #425838 incorrect option parsing


isync-1.0.3-args.patch:

--- NEW FILE isync-1.0.3-args.patch ---
Make mbsync not eat letters from last argument of one-line options.
A fix for #425838. -- Lubomir Kundrak <lkundrak at redhat.com>

diff -urp isync-1.0.3/src/main.c isync-1.0.3.args/src/main.c
--- isync-1.0.3/src/main.c	2006-11-01 07:54:31.000000000 +0100
+++ isync-1.0.3.args/src/main.c	2007-12-16 19:55:13.000000000 +0100
@@ -178,7 +178,7 @@ main( int argc, char **argv )
 	}
 	arc4_init();
 
-	for (oind = 1, ochar = 0; oind < argc; ) {
+	for (oind = 1, ochar = 0; oind < argc || (ochar && *ochar); ) {
 		if (!ochar || !*ochar) {
 			if (argv[oind][0] != '-')
 				break;


Index: isync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/isync/devel/isync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- isync.spec	5 Dec 2007 21:51:45 -0000	1.2
+++ isync.spec	16 Dec 2007 19:04:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           isync
 Version:        1.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tool to synchronize IMAP4 and Maildir mailboxes
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@
 URL:            http://isync.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         isync-1.0.3-open.patch
+Patch1:         isync-1.0.3-args.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  db4-devel openssl-devel
@@ -20,7 +21,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .open
+%patch1 -p1 -b .args
 
 %build
 %configure
@@ -47,8 +49,8 @@
 %doc AUTHORS COPYING NEWS README TODO ChangeLog src/mbsyncrc.sample src/compat/isyncrc.sample
 
 %changelog
-* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.0.3-4
- - Rebuild for deps
+* Sun Dec 16 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-5
+- mbsync was ignoring option letters from last argument (#425838)
 
 * Sun Sep 09 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.3-3
 - Fix code for the case where open() is a macro. (thanks to Marek Mahut)