From c1673d431690ceaef122e9c8021245c502208d0a Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Apr 09 2013 15:02:12 +0000
Subject: update to 1.5.2


---

diff --git a/.gitignore b/.gitignore
index fefae21..1cfd70d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ apr-util-1.3.9.tar.bz2
 /apr-util-1.3.11.tar.bz2
 /apr-util-1.3.12.tar.bz2
 /apr-util-1.4.1.tar.bz2
+/apr-util-1.5.2.tar.bz2
diff --git a/apr-util-1.4.1-r1346875.patch b/apr-util-1.4.1-r1346875.patch
deleted file mode 100644
index 3a2743c..0000000
--- a/apr-util-1.4.1-r1346875.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-https://bugzilla.redhat.com/show_bug.cgi?id=819650
-
-http://svn.apache.org/viewvc?view=revision&revision=1346875
-
---- apr-util-1.4.1/crypto/apr_md5.c.r1346875
-+++ apr-util-1.4.1/crypto/apr_md5.c
-@@ -721,6 +721,9 @@ APU_DECLARE(apr_status_t) apr_password_v
-         CRYPTD buffer;
- 
-         crypt_pw = crypt_r(passwd, hash, &buffer);
-+        if (!crypt_pw) {
-+            return APR_EMISMATCH;
-+        }
-         apr_cpystrn(sample, crypt_pw, sizeof(sample) - 1);
- #elif defined(CRYPT_R_STRUCT_CRYPT_DATA)
-         struct crypt_data buffer;
-@@ -732,6 +735,9 @@ APU_DECLARE(apr_status_t) apr_password_v
-          */
-         memset(&buffer, 0, sizeof(buffer));
-         crypt_pw = crypt_r(passwd, hash, &buffer);
-+        if (!crypt_pw) {
-+            return APR_EMISMATCH;
-+        }
-         apr_cpystrn(sample, crypt_pw, sizeof(sample) - 1);
- #else
-         /* Do a bit of sanity checking since we know that crypt_r()
-@@ -748,6 +754,10 @@ APU_DECLARE(apr_status_t) apr_password_v
-          */
-         crypt_mutex_lock();
-         crypt_pw = crypt(passwd, hash);
-+        if (!crypt_pw) {
-+            crypt_mutex_unlock();
-+            return APR_EMISMATCH;
-+        }
-         apr_cpystrn(sample, crypt_pw, sizeof(sample) - 1);
-         crypt_mutex_unlock();
- #endif
diff --git a/apr-util.spec b/apr-util.spec
index 09f05b9..6a155e7 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -9,15 +9,14 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.4.1
-Release: 8%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Patch1: apr-util-1.2.7-pkgconf.patch
 Patch2: apr-util-1.3.7-nodbmdso.patch
-Patch3: apr-util-1.4.1-r1346875.patch
 Patch4: apr-util-1.4.1-private.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, apr-devel >= 1.3.0
@@ -122,7 +121,6 @@ This package provides the NSS crypto support for the apr-util.
 %setup -q
 %patch1 -p1 -b .pkgconf
 %patch2 -p1 -b .nodbmdso
-%patch3 -p1 -b .r1346875
 %patch4 -p1 -b .private
 
 %build
@@ -228,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue Apr  9 2013 Joe Orton <jorton@redhat.com> - 1.5.2-1
+- update to 1.5.2
+
 * Thu Feb 07 2013 Jon Ciesla <limburgher@gmail.com> - 1.4.1-8
 - Apply private patch from Merge Review BZ 225254.
 
diff --git a/sources b/sources
index 59ab0d4..fcbd707 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52b31b33fb1aa16e65ddaefc76e41151  apr-util-1.4.1.tar.bz2
+89c1348aa79e898d7c34a6206311c9c2  apr-util-1.5.2.tar.bz2