rpms/apr-util/F-9 apr-util-1.2.12-strmatch.patch, 1.1, 1.2 apr-util.spec, 1.50, 1.51

[Bojan Smojver]

Author: bojan

Update of /cvs/pkgs/rpms/apr-util/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14669

Modified Files:
	apr-util-1.2.12-strmatch.patch apr-util.spec 
Log Message:
Include missing bit of the apr_strmatch.c patch.

apr-util-1.2.12-strmatch.patch:

Index: apr-util-1.2.12-strmatch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/F-9/apr-util-1.2.12-strmatch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- apr-util-1.2.12-strmatch.patch	8 Jun 2009 07:37:57 -0000	1.1
+++ apr-util-1.2.12-strmatch.patch	8 Jun 2009 21:55:33 -0000	1.2
@@ -1,5 +1,14 @@
---- apr/apr-util/branches/1.3.x/strmatch/apr_strmatch.c	2009/05/29 07:48:33	779879
-+++ apr/apr-util/branches/1.3.x/strmatch/apr_strmatch.c	2009/05/29 07:48:45	779880
+--- apr/apr/trunk/strmatch/apr_strmatch.c	2009/03/24 11:12:27	757729
++++ apr/apr/trunk/strmatch/apr_strmatch.c	2009/06/02 15:34:46	781063
+@@ -74,7 +74,7 @@
+             }
+             s_tmp--;
+         }
+-        s_next += shift[apr_tolower(*s_next)];
++        s_next += shift[(unsigned char)apr_tolower(*s_next)];
+     }
+     return NULL;
+ }
 @@ -103,13 +103,13 @@
      if (case_sensitive) {
          pattern->compare = match_boyer_moore_horspool;


Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/F-9/apr-util.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- apr-util.spec	8 Jun 2009 07:37:57 -0000	1.50
+++ apr-util.spec	8 Jun 2009 21:55:33 -0000	1.51
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Jun  8 2009 Bojan Smojver <bojan at rexursive.com> - 1.2.12-7
+- include missing bit of the apr_strmatch.c patch
+
 * Mon Jun  8 2009 Bojan Smojver <bojan at rexursive.com> - 1.2.12-6
 - CVE-2009-0023
 - "billion laughs" fix of apr_xml_* interface