7 files changed, 26 insertions, 42 deletions

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index f8badb63961b..7c9517cf27c1 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -15,8 +15,8 @@
 # APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP
 
 PORTNAME=	apr
-PORTVERSION=	1.2.2
-PORTREVISION=	3
+PORTVERSION=	1.2.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index 090ace3b4d3c..847dbdc2dd2b 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,6 +1,6 @@
-MD5 (apr-1.2.2.tar.gz) = f96e3b04ccf86ed28a0734d7efc5bb65
-SHA256 (apr-1.2.2.tar.gz) = 23826f62b305efef3f6c6e7e6b8ddad05ec48a2f36410ff508b3fc4714a33dfc
-SIZE (apr-1.2.2.tar.gz) = 1096029
-MD5 (apr-util-1.2.2.tar.gz) = 8b3f04dde7048946c3c94f85b4debb94
-SHA256 (apr-util-1.2.2.tar.gz) = b7170fe39edff9ef044464a321194bbee382065dacd0720abc823adbe47731e1
-SIZE (apr-util-1.2.2.tar.gz) = 645311
+MD5 (apr-1.2.7.tar.gz) = aea926cbe588f844ad9e317157d60175
+SHA256 (apr-1.2.7.tar.gz) = 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa
+SIZE (apr-1.2.7.tar.gz) = 1102370
+MD5 (apr-util-1.2.7.tar.gz) = c3702668a640be1695956115857ec22e
+SHA256 (apr-util-1.2.7.tar.gz) = 8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3
+SIZE (apr-util-1.2.7.tar.gz) = 641600
diff --git a/devel/apr/files/patch-apr-util_build_dbm.m4 b/devel/apr/files/patch-apr-util_build_dbm.m4
index cb7dd1128ba4..68dd6cb2f837 100644
--- a/devel/apr/files/patch-apr-util_build_dbm.m4
+++ b/devel/apr/files/patch-apr-util_build_dbm.m4
@@ -1,5 +1,5 @@
---- apr-util-1.2.2/build/dbm.m4-orig	Wed Dec  7 09:02:23 2005
-+++ apr-util-1.2.2/build/dbm.m4	Wed Dec 23 09:07:34 2005
+--- apr-util-1.2.7/build/dbm.m4-orig	Wed Dec  7 09:02:23 2005
++++ apr-util-1.2.7/build/dbm.m4	Wed Dec 23 09:07:34 2005
 @@ -588,6 +588,8 @@
      elif test "$withval" = "no"; then
        apu_have_gdbm=0
diff --git a/devel/apr/files/patch-apr-util_configure b/devel/apr/files/patch-apr-util_configure
index c1571922898b..9bfd536bc5aa 100644
--- a/devel/apr/files/patch-apr-util_configure
+++ b/devel/apr/files/patch-apr-util_configure
@@ -1,5 +1,5 @@
---- apr-util-1.2.2/configure.orig	Mon Sep 26 18:28:49 2005
-+++ apr-util-1.2.2/configure	Fri Dec 23 15:06:09 2005
+--- apr-util-1.2.7/configure.orig	Mon Sep 26 18:28:49 2005
++++ apr-util-1.2.7/configure	Fri Dec 23 15:06:09 2005
 @@ -13806,6 +13806,8 @@
      elif test "$withval" = "no"; then
        apu_have_gdbm=0
diff --git a/devel/apr/files/patch-apr_dbd_sqlite3.c b/devel/apr/files/patch-apr_dbd_sqlite3.c
index 66a62831f3a5..bedbfb6c1474 100644
--- a/devel/apr/files/patch-apr_dbd_sqlite3.c
+++ b/devel/apr/files/patch-apr_dbd_sqlite3.c
@@ -1,5 +1,5 @@
---- apr-util-1.2.2/dbd/apr_dbd_sqlite3.c.orig	Wed Nov  2 20:47:48 2005
-+++ apr-util-1.2.2/dbd/apr_dbd_sqlite3.c	Wed Nov  2 20:55:50 2005
+--- apr-util-1.2.7/dbd/apr_dbd_sqlite3.c.orig	Wed Mar 15 01:04:54 2006
++++ apr-util-1.2.7/dbd/apr_dbd_sqlite3.c	Mon May 29 09:08:08 2006
 @@ -24,6 +24,7 @@
  #include <sqlite3.h>
  
@@ -18,7 +18,7 @@
      apr_pool_t *pool;
  };
  
-@@ -92,11 +95,15 @@
+@@ -93,11 +96,15 @@
          return sql->trans->errnum;
      }
  
@@ -34,7 +34,7 @@
          return ret;
      } else {
          int column_count;
-@@ -115,7 +122,9 @@
+@@ -118,7 +125,9 @@
                  if (retry_count++ > MAX_RETRY_COUNT) {
                      ret = SQLITE_ERROR;
                  } else {
@@ -42,9 +42,9 @@
                      apr_thread_mutex_unlock(sql->mutex);
 +#endif
                      apr_sleep(MAX_RETRY_SLEEP);
+                     apr_thread_mutex_lock(sql->mutex);
                  }
-             } else if (ret == SQLITE_ROW) {
-@@ -170,7 +179,9 @@
+@@ -179,7 +188,9 @@
          } while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
      }
      ret = sqlite3_finalize(stmt);
@@ -54,9 +54,9 @@
  
      if (sql->trans) {
          sql->trans->errnum = ret;
-@@ -240,7 +251,9 @@
-         return SQLITE_ERROR;
+@@ -242,7 +253,9 @@
      }
+ 
      length = strlen(query);
 +#if APR_HAS_THREADS
      apr_thread_mutex_lock(sql->mutex);
@@ -64,16 +64,16 @@
  
      do {
          ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
-@@ -259,7 +272,9 @@
+@@ -260,7 +273,9 @@
      if (dbd_sqlite3_is_success(ret)) {
-         res = 0;
+         ret =  0;
      }
 +#if APR_HAS_THREADS
      apr_thread_mutex_unlock(sql->mutex);
 +#endif
-     apr_pool_destroy(pool);
      if (sql->trans) {
-         sql->trans->errnum = res;
+         sql->trans->errnum = ret;
+     }
 @@ -366,12 +381,14 @@
      sql->conn = conn;
      sql->pool = pool;
diff --git a/devel/apr/files/patch-apr_hints.m4 b/devel/apr/files/patch-apr_hints.m4
index aeb6778e9a22..3891ecae5176 100644
--- a/devel/apr/files/patch-apr_hints.m4
+++ b/devel/apr/files/patch-apr_hints.m4
@@ -1,5 +1,5 @@
---- apr-1.2.2/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.2.2/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+--- apr-1.2.7/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ apr-1.2.7/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
 @@ -137,11 +137,7 @@
  	;;
      *-freebsd*)
diff --git a/devel/apr/files/patch-rand.c b/devel/apr/files/patch-rand.c
deleted file mode 100644
index 4d9c982c4c95..000000000000
--- a/devel/apr/files/patch-rand.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- apr-1.2.2/misc/unix/rand.c.orig	Wed Nov  2 20:17:10 2005
-+++ apr-1.2.2/misc/unix/rand.c	Wed Nov  2 20:17:43 2005
-@@ -35,11 +35,10 @@
- #if APR_HAVE_SYS_UN_H
- #include <sys/un.h>
- #endif
--#ifdef HAVE_UUID_UUID_H
--#include <uuid/uuid.h>
--#endif
- #ifdef HAVE_UUID_H
- #include <uuid.h>
-+#elif defined(HAVE_UUID_UUID_H)
-+#include <uuid/uuid.h>
- #endif
- 
- #ifndef SHUT_RDWR