apr, apr-utils: update to 1.6.2 resp. 1.6.0

4 files changed, 22 insertions, 16 deletions

diff --git a/apr/.footprint b/apr/.footprint
index 388071659..3fa4a7dbb 100644
--- a/apr/.footprint
+++ b/apr/.footprint
@@ -11,6 +11,7 @@ drwxr-xr-x	root/root	usr/include/apr-1/
 -rw-r--r--	root/root	usr/include/apr-1/apr_base64.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_buckets.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_crypto.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_cstr.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_date.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_dbd.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_dbm.h
@@ -40,12 +41,14 @@ drwxr-xr-x	root/root	usr/include/apr-1/
 -rw-r--r--	root/root	usr/include/apr-1/apr_network_io.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_optional.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_optional_hooks.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_perms_set.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_poll.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_pools.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_portable.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_proc_mutex.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_queue.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_random.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_redis.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_reslist.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_ring.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_rmm.h
@@ -53,6 +56,7 @@ drwxr-xr-x	root/root	usr/include/apr-1/
 -rw-r--r--	root/root	usr/include/apr-1/apr_sha1.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_shm.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_signal.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_siphash.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_skiplist.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_strings.h
 -rw-r--r--	root/root	usr/include/apr-1/apr_strmatch.h
@@ -78,20 +82,22 @@ drwxr-xr-x	root/root	usr/include/apr-1/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libapr-1.a
 -rwxr-xr-x	root/root	usr/lib/libapr-1.la
-lrwxrwxrwx	root/root	usr/lib/libapr-1.so -> libapr-1.so.0.5.2
-lrwxrwxrwx	root/root	usr/lib/libapr-1.so.0 -> libapr-1.so.0.5.2
--rwxr-xr-x	root/root	usr/lib/libapr-1.so.0.5.2
+lrwxrwxrwx	root/root	usr/lib/libapr-1.so -> libapr-1.so.0.6.2
+lrwxrwxrwx	root/root	usr/lib/libapr-1.so.0 -> libapr-1.so.0.6.2
+-rwxr-xr-x	root/root	usr/lib/libapr-1.so.0.6.2
 -rw-r--r--	root/root	usr/lib/libaprutil-1.a
 -rwxr-xr-x	root/root	usr/lib/libaprutil-1.la
-lrwxrwxrwx	root/root	usr/lib/libaprutil-1.so -> libaprutil-1.so.0.5.4
-lrwxrwxrwx	root/root	usr/lib/libaprutil-1.so.0 -> libaprutil-1.so.0.5.4
--rwxr-xr-x	root/root	usr/lib/libaprutil-1.so.0.5.4
+lrwxrwxrwx	root/root	usr/lib/libaprutil-1.so -> libaprutil-1.so.0.6.0
+lrwxrwxrwx	root/root	usr/lib/libaprutil-1.so.0 -> libaprutil-1.so.0.6.0
+-rwxr-xr-x	root/root	usr/lib/libaprutil-1.so.0.6.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/apr-1.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/apr-util-1.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/apr-1/
+-rw-r--r--	root/root	usr/share/apr-1/apr_common.m4
 -rw-r--r--	root/root	usr/share/apr-1/apr_rules.mk
+-rw-r--r--	root/root	usr/share/apr-1/find_apr.m4
 -rwxr-xr-x	root/root	usr/share/apr-1/libtool
 -rw-r--r--	root/root	usr/share/apr-1/make_exports.awk
 -rw-r--r--	root/root	usr/share/apr-1/make_var_export.awk
diff --git a/apr/.md5sum b/apr/.md5sum
index 32417f4c0..a9e0383f4 100644
--- a/apr/.md5sum
+++ b/apr/.md5sum
@@ -1,2 +1,2 @@
-4e9769f3349fe11fc0a5e1b224c236aa  apr-1.5.2.tar.bz2
-2202b18f269ad606d70e1864857ed93c  apr-util-1.5.4.tar.bz2
+e81a851967c79b5ce9bfbc909e4bf735  apr-1.6.2.tar.bz2
+069a9a980776acab05212c5f37ef8368  apr-util-1.6.0.tar.bz2
diff --git a/apr/.signature b/apr/.signature
index 5613826a8..6925e2667 100644
--- a/apr/.signature
+++ b/apr/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/YnUJzkGFA56+mpUKBlPu/mV22zqz7OmNWi0DrXZm+JdFSXi4Rg5QPcdhT0EIdgnmSZTuq1Mf9S1yHlViYQ96gk=
-SHA256 (Pkgfile) = b632b07c8176d8c725932c7491cb4fa6016bf99966dc1271a6464c00a979aa4c
-SHA256 (.footprint) = 8b517f942027903e26e8d2f911147a4c68ea82d1c44915385d91f59dc0e5a382
-SHA256 (apr-1.5.2.tar.bz2) = 7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a
-SHA256 (apr-util-1.5.4.tar.bz2) = a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e
+RWSE3ohX2g5d/dGAQc7Da5mk6j8ez1NibupT+2miYqyhDBxi5b4SNm4xkd4Wi+7z+AKVOUFz/FqeaOPQEpXFxCkKWmzSZa2Y1w8=
+SHA256 (Pkgfile) = 797a2dcf35284c94646af692d9c2e8f187e3fb291bf143e0b276a25b036333da
+SHA256 (.footprint) = 3d652941e446deb5dee1924846d9aab4847fa3b6000012b23dcfc6d8a97eb360
+SHA256 (apr-1.6.2.tar.bz2) = 09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd
+SHA256 (apr-util-1.6.0.tar.bz2) = 8474c93fa74b56ac6ca87449abe3e155723d5f534727f3f33283f6631a48ca4c
diff --git a/apr/Pkgfile b/apr/Pkgfile
index 837972c59..1637d1dcb 100644
--- a/apr/Pkgfile
+++ b/apr/Pkgfile
@@ -4,10 +4,10 @@
 # Depends on:  util-linux, expat, db, gdbm
 
 name=apr
-version=1.5.2
+version=1.6.2
 release=1
 source=(http://www.apache.org/dist/$name/$name-$version.tar.bz2 \
-        http://www.apache.org/dist/$name/$name-util-1.5.4.tar.bz2)
+        http://www.apache.org/dist/$name/$name-util-1.6.0.tar.bz2)
 
 build(){
     cd $name-$version
@@ -16,7 +16,7 @@ build(){
     make 
     make -j1 DESTDIR=$PKG install
 
-    cd $SRC/$name-util-1.5.4
+    cd $SRC/$name-util-1.6.0
     ./configure --prefix=/usr \
                 --with-apr=$SRC/$name-$version \
                 --with-expat=/usr \