apr: update to 1.2.7

3 files changed, 94 insertions, 91 deletions

diff --git a/apr/.footprint b/apr/.footprint
index 21bd385d7..1a3543f15 100644
--- a/apr/.footprint
+++ b/apr/.footprint
@@ -1,86 +1,91 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/apr-config
--rwxr-xr-x	root/root	usr/bin/apu-config
+-rwxr-xr-x	root/root	usr/bin/apr-1-config
+-rwxr-xr-x	root/root	usr/bin/apu-1-config
 drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/apr-0/
--rw-r--r--	root/root	usr/include/apr-0/apr.h
--rw-r--r--	root/root	usr/include/apr-0/apr_allocator.h
--rw-r--r--	root/root	usr/include/apr-0/apr_anylock.h
--rw-r--r--	root/root	usr/include/apr-0/apr_atomic.h
--rw-r--r--	root/root	usr/include/apr-0/apr_base64.h
--rw-r--r--	root/root	usr/include/apr-0/apr_buckets.h
--rw-r--r--	root/root	usr/include/apr-0/apr_compat.h
--rw-r--r--	root/root	usr/include/apr-0/apr_date.h
--rw-r--r--	root/root	usr/include/apr-0/apr_dbm.h
--rw-r--r--	root/root	usr/include/apr-0/apr_dso.h
--rw-r--r--	root/root	usr/include/apr-0/apr_env.h
--rw-r--r--	root/root	usr/include/apr-0/apr_errno.h
--rw-r--r--	root/root	usr/include/apr-0/apr_file_info.h
--rw-r--r--	root/root	usr/include/apr-0/apr_file_io.h
--rw-r--r--	root/root	usr/include/apr-0/apr_fnmatch.h
--rw-r--r--	root/root	usr/include/apr-0/apr_general.h
--rw-r--r--	root/root	usr/include/apr-0/apr_getopt.h
--rw-r--r--	root/root	usr/include/apr-0/apr_global_mutex.h
--rw-r--r--	root/root	usr/include/apr-0/apr_hash.h
--rw-r--r--	root/root	usr/include/apr-0/apr_hooks.h
--rw-r--r--	root/root	usr/include/apr-0/apr_inherit.h
--rw-r--r--	root/root	usr/include/apr-0/apr_ldap.h
--rw-r--r--	root/root	usr/include/apr-0/apr_ldap_url.h
--rw-r--r--	root/root	usr/include/apr-0/apr_lib.h
--rw-r--r--	root/root	usr/include/apr-0/apr_md4.h
--rw-r--r--	root/root	usr/include/apr-0/apr_md5.h
--rw-r--r--	root/root	usr/include/apr-0/apr_mmap.h
--rw-r--r--	root/root	usr/include/apr-0/apr_network_io.h
--rw-r--r--	root/root	usr/include/apr-0/apr_optional.h
--rw-r--r--	root/root	usr/include/apr-0/apr_optional_hooks.h
--rw-r--r--	root/root	usr/include/apr-0/apr_poll.h
--rw-r--r--	root/root	usr/include/apr-0/apr_pools.h
--rw-r--r--	root/root	usr/include/apr-0/apr_portable.h
--rw-r--r--	root/root	usr/include/apr-0/apr_proc_mutex.h
--rw-r--r--	root/root	usr/include/apr-0/apr_queue.h
--rw-r--r--	root/root	usr/include/apr-0/apr_reslist.h
--rw-r--r--	root/root	usr/include/apr-0/apr_ring.h
--rw-r--r--	root/root	usr/include/apr-0/apr_rmm.h
--rw-r--r--	root/root	usr/include/apr-0/apr_sdbm.h
--rw-r--r--	root/root	usr/include/apr-0/apr_sha1.h
--rw-r--r--	root/root	usr/include/apr-0/apr_shm.h
--rw-r--r--	root/root	usr/include/apr-0/apr_signal.h
--rw-r--r--	root/root	usr/include/apr-0/apr_strings.h
--rw-r--r--	root/root	usr/include/apr-0/apr_strmatch.h
--rw-r--r--	root/root	usr/include/apr-0/apr_support.h
--rw-r--r--	root/root	usr/include/apr-0/apr_tables.h
--rw-r--r--	root/root	usr/include/apr-0/apr_thread_cond.h
--rw-r--r--	root/root	usr/include/apr-0/apr_thread_mutex.h
--rw-r--r--	root/root	usr/include/apr-0/apr_thread_proc.h
--rw-r--r--	root/root	usr/include/apr-0/apr_thread_rwlock.h
--rw-r--r--	root/root	usr/include/apr-0/apr_time.h
--rw-r--r--	root/root	usr/include/apr-0/apr_uri.h
--rw-r--r--	root/root	usr/include/apr-0/apr_user.h
--rw-r--r--	root/root	usr/include/apr-0/apr_uuid.h
--rw-r--r--	root/root	usr/include/apr-0/apr_version.h
--rw-r--r--	root/root	usr/include/apr-0/apr_want.h
--rw-r--r--	root/root	usr/include/apr-0/apr_xlate.h
--rw-r--r--	root/root	usr/include/apr-0/apr_xml.h
--rw-r--r--	root/root	usr/include/apr-0/apu.h
--rw-r--r--	root/root	usr/include/apr-0/apu_compat.h
--rw-r--r--	root/root	usr/include/apr-0/apu_version.h
--rw-r--r--	root/root	usr/include/apr-0/apu_want.h
+drwxr-xr-x	root/root	usr/include/apr-1/
+-rw-r--r--	root/root	usr/include/apr-1/apr.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_allocator.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_anylock.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_atomic.h
+-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_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
+-rw-r--r--	root/root	usr/include/apr-1/apr_dso.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_env.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_errno.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_file_info.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_file_io.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_fnmatch.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_general.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_getopt.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_global_mutex.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_hash.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_hooks.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_inherit.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_ldap.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_ldap_init.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_ldap_option.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_ldap_url.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_lib.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_md4.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_md5.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_mmap.h
+-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_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_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
+-rw-r--r--	root/root	usr/include/apr-1/apr_sdbm.h
+-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_strings.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_strmatch.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_support.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_tables.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_thread_cond.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_thread_mutex.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_thread_proc.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_thread_rwlock.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_time.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_uri.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_user.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_uuid.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_version.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_want.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_xlate.h
+-rw-r--r--	root/root	usr/include/apr-1/apr_xml.h
+-rw-r--r--	root/root	usr/include/apr-1/apu.h
+-rw-r--r--	root/root	usr/include/apr-1/apu_version.h
+-rw-r--r--	root/root	usr/include/apr-1/apu_want.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libapr-0.a
--rw-r--r--	root/root	usr/lib/libapr-0.la
-lrwxrwxrwx	root/root	usr/lib/libapr-0.so -> libapr-0.so.0.9.12
-lrwxrwxrwx	root/root	usr/lib/libapr-0.so.0 -> libapr-0.so.0.9.12
--rwxr-xr-x	root/root	usr/lib/libapr-0.so.0.9.12
--rw-r--r--	root/root	usr/lib/libaprutil-0.a
--rw-r--r--	root/root	usr/lib/libaprutil-0.la
-lrwxrwxrwx	root/root	usr/lib/libaprutil-0.so -> libaprutil-0.so.0.9.12
-lrwxrwxrwx	root/root	usr/lib/libaprutil-0.so.0 -> libaprutil-0.so.0.9.12
--rwxr-xr-x	root/root	usr/lib/libaprutil-0.so.0.9.12
+-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.2.7
+lrwxrwxrwx	root/root	usr/lib/libapr-1.so.0 -> libapr-1.so.0.2.7
+-rwxr-xr-x	root/root	usr/lib/libapr-1.so.0.2.7
+-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.2.7
+lrwxrwxrwx	root/root	usr/lib/libaprutil-1.so.0 -> libaprutil-1.so.0.2.7
+-rwxr-xr-x	root/root	usr/lib/libaprutil-1.so.0.2.7
+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-0/
--rw-r--r--	root/root	usr/share/apr-0/apr_rules.mk
--rwxr-xr-x	root/root	usr/share/apr-0/libtool
--rw-r--r--	root/root	usr/share/apr-0/make_exports.awk
--rw-r--r--	root/root	usr/share/apr-0/make_var_export.awk
--rwxr-xr-x	root/root	usr/share/apr-0/mkdir.sh
+drwxr-xr-x	root/root	usr/share/apr-1/
+-rw-r--r--	root/root	usr/share/apr-1/apr_rules.mk
+-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
+-rwxr-xr-x	root/root	usr/share/apr-1/mkdir.sh
diff --git a/apr/.md5sum b/apr/.md5sum
index 9c868db84..1451e324e 100644
--- a/apr/.md5sum
+++ b/apr/.md5sum
@@ -1,2 +1,2 @@
-63fef787c263bd8025c6ab6a6cecdd01  apr-0.9.12.tar.bz2
-f65a7114b4e638d4c3949214dfde7b59  apr-util-0.9.12.tar.bz2
+e77887dbafc515c63feac84686bcb3bc  apr-1.2.7.tar.bz2
+a4c527f08ae2298e62a88472291bf066  apr-util-1.2.7.tar.bz2
diff --git a/apr/Pkgfile b/apr/Pkgfile
index a17324c34..8fe2e3e8e 100644
--- a/apr/Pkgfile
+++ b/apr/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  expat, db, gdbm
 
 name=apr
-version=0.9.12
+version=1.2.7
 release=1
 source=(http://www.apache.org/dist/$name/$name-$version.tar.bz2 \
         http://www.apache.org/dist/$name/$name-util-$version.tar.bz2)
@@ -12,7 +12,7 @@ source=(http://www.apache.org/dist/$name/$name-$version.tar.bz2 \
 build(){
     cd $name-$version
     ./configure --prefix=/usr \
-                --with-installbuilddir=/usr/share/apr-0 
+                --with-installbuilddir=/usr/share/apr-1 
     make 
     make DESTDIR=$PKG install
 
@@ -20,14 +20,12 @@ build(){
     ./configure --prefix=/usr \
                 --with-apr=$SRC/$name-$version \
                 --with-expat=/usr \
-                --with-berkeley-db=/usr
+                --with-berkeley-db=/usr \
+                --with-gdbm=/usr
     make
     make DESTDIR=$PKG install
 
-    sed -i -r "/^APR_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apr-config
-    sed -i -r "/^APU_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apu-config
-    sed -i "/^apr_/s|$SRC|/usr/share/apr-0|"  $PKG/usr/share/apr-0/apr_rules.mk
-    
+    sed -i -r "/^APR_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apr-1-config
+    sed -i -r "/^APU_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apu-1-config
     rm -r $PKG/usr/lib/*.exp
-    chown -R root:root $PKG
 }