+++ /dev/null
-diff -ur apr-1.4.4-orig/strings/apr_fnmatch.c apr-1.4.4/strings/apr_fnmatch.c
---- apr-1.4.4-orig/strings/apr_fnmatch.c 2011-05-03 06:51:24.000000000 +0200
-+++ apr-1.4.4/strings/apr_fnmatch.c 2011-05-19 20:50:52.042450131 +0200
-@@ -196,8 +196,11 @@
- const char *mismatch = NULL;
- int matchlen = 0;
-
-- while (*pattern)
-- {
-+ if (*pattern == '*')
-+ goto firstsegment;
-+
-+ while (*pattern && *string)
-+ {
- /* Match balanced slashes, starting a new segment pattern
- */
- if (slash && escape && (*pattern == '\\') && (pattern[1] == '/'))
-@@ -207,6 +210,7 @@
- ++string;
- }
-
-+firstsegment:
- /* At the beginning of each segment, validate leading period behavior.
- */
- if ((flags & APR_FNM_PERIOD) && (*string == '.'))
-@@ -361,9 +365,9 @@
- return APR_FNM_NOMATCH;
- }
-
-- /* pattern is at EOS; if string is also, declare success
-+ /* Where both pattern and string are at EOS, declare success
- */
-- if (!*string)
-+ if (!*string && !*pattern)
- return 0;
-
- /* pattern didn't match to the end of string */
-Tylko w apr-1.4.4/strings: apr_fnmatch.c~
Summary: Apache Portable Runtime
Summary(pl.UTF-8): Apache Portable Runtime - przenośna biblioteka uruchomieniowa
Name: apr
-Version: 1.4.4
-Release: 3
+Version: 1.4.5
+Release: 1
Epoch: 1
License: Apache v2.0
Group: Libraries
Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5: daf5487c82dd7bec9c005c96f8cb01b1
+# Source0-md5: 8b53f5a5669d0597f2da889a2f576eb6
Patch0: %{name}-link.patch
Patch1: %{name}-libtool.patch
# disable some things that require recent kernel
Patch2: %{name}-disable-features.patch
-Patch3: %{name}-1.4.4-fnmatch.patch
URL: http://apr.apache.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
cat >> config.layout <<'EOF'
<Layout PLD>