apr-util: bump to version 1.5.2

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/apr-util/apr-util-01-remove-checkapr.patch b/package/apr-util/apr-util-01-remove-checkapr.patch
new file mode 100644 (file)
index 0000000..42ad12f
--- /dev/null
+++ b/package/apr-util/apr-util-01-remove-checkapr.patch
@@ -0,0 +1,21 @@
+remove check apr
+
+this patch removes the check of apr which fails the build
+
+Signed-off-by: Rico Bachmann <bachmann-ahF9wiJNQgNBDgjK7y7TUQ@public.gmane.org>
+---
+v1: disable the check for APU_FIND_APR because the check only looks into folders
+named apr, and our source-tree is called apr-versionnumber (e.g. apr-1.4.6)
+
+diff -rupN apr-util-1.4.1/configure.in apr-util-1.4.1-fix/configure.in
+--- apr-util-1.4.1/configure.in        2009-12-17 20:15:19.000000000 +0100
++++ apr-util-1.4.1-fix/configure.in    2012-04-24 10:10:32.000000000 +0200
+@@ -99,7 +99,7 @@ fi
+ dnl
+ dnl Find the APR includes directory and (possibly) the source (base) dir.
+ dnl
+-APU_FIND_APR
++dnl APU_FIND_APR
+ 
+ dnl
+ dnl even though we use apr_rules.mk for building apr-util, we need

diff --git a/package/apr-util/apr-util-1.4.1-remove-checkapr.patch b/package/apr-util/apr-util-1.4.1-remove-checkapr.patch
deleted file mode 100644 (file)
index 42ad12f..0000000
--- a/package/apr-util/apr-util-1.4.1-remove-checkapr.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-remove check apr
-
-this patch removes the check of apr which fails the build
-
-Signed-off-by: Rico Bachmann <bachmann-ahF9wiJNQgNBDgjK7y7TUQ@public.gmane.org>
----
-v1: disable the check for APU_FIND_APR because the check only looks into folders
-named apr, and our source-tree is called apr-versionnumber (e.g. apr-1.4.6)
-
-diff -rupN apr-util-1.4.1/configure.in apr-util-1.4.1-fix/configure.in
---- apr-util-1.4.1/configure.in        2009-12-17 20:15:19.000000000 +0100
-+++ apr-util-1.4.1-fix/configure.in    2012-04-24 10:10:32.000000000 +0200
-@@ -99,7 +99,7 @@ fi
- dnl
- dnl Find the APR includes directory and (possibly) the source (base) dir.
- dnl
--APU_FIND_APR
-+dnl APU_FIND_APR
- 
- dnl
- dnl even though we use apr_rules.mk for building apr-util, we need

diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
index 11551d693e07f6bab85afd5b6abeb444b48a4582..51852e4a430bf59f10a50fc3f284c1c5b70c27fe 100644 (file)
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-APR_UTIL_VERSION = 1.4.1
+APR_UTIL_VERSION = 1.5.2
 APR_UTIL_SITE = http://archive.apache.org/dist/apr
 APR_UTIL_LICENSE = Apache-2.0
 APR_UTIL_LICENSE_FILES = LICENSE