diff options
author | Craig Rodrigues <rodrigc@FreeBSD.org> | 2006-05-29 13:12:35 +0000 |
---|---|---|
committer | Craig Rodrigues <rodrigc@FreeBSD.org> | 2006-05-29 13:12:35 +0000 |
commit | b7f8cd48db347b0743e3dd17fdbb226174004263 (patch) | |
tree | 51d8f2bdb4f1bfca75710db0ac629891b978afaa /devel/apr1/files | |
parent | 2e60d7ca7e5f7730174d34dec15d81862dfc5c50 (diff) | |
download | ports-b7f8cd48db347b0743e3dd17fdbb226174004263.tar.gz ports-b7f8cd48db347b0743e3dd17fdbb226174004263.zip |
Upgrade to apr-1.2.7
PR: ports/98085
Submitted by: skv
Notes
Notes:
svn path=/head/; revision=163835
Diffstat (limited to 'devel/apr1/files')
-rw-r--r-- | devel/apr1/files/patch-apr-util_build_dbm.m4 | 4 | ||||
-rw-r--r-- | devel/apr1/files/patch-apr-util_configure | 4 | ||||
-rw-r--r-- | devel/apr1/files/patch-apr_dbd_sqlite3.c | 24 | ||||
-rw-r--r-- | devel/apr1/files/patch-apr_hints.m4 | 4 | ||||
-rw-r--r-- | devel/apr1/files/patch-rand.c | 16 |
5 files changed, 18 insertions, 34 deletions
diff --git a/devel/apr1/files/patch-apr-util_build_dbm.m4 b/devel/apr1/files/patch-apr-util_build_dbm.m4 index cb7dd1128ba4..68dd6cb2f837 100644 --- a/devel/apr1/files/patch-apr-util_build_dbm.m4 +++ b/devel/apr1/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/apr1/files/patch-apr-util_configure b/devel/apr1/files/patch-apr-util_configure index c1571922898b..9bfd536bc5aa 100644 --- a/devel/apr1/files/patch-apr-util_configure +++ b/devel/apr1/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/apr1/files/patch-apr_dbd_sqlite3.c b/devel/apr1/files/patch-apr_dbd_sqlite3.c index 66a62831f3a5..bedbfb6c1474 100644 --- a/devel/apr1/files/patch-apr_dbd_sqlite3.c +++ b/devel/apr1/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/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4 index aeb6778e9a22..3891ecae5176 100644 --- a/devel/apr1/files/patch-apr_hints.m4 +++ b/devel/apr1/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/apr1/files/patch-rand.c b/devel/apr1/files/patch-rand.c deleted file mode 100644 index 4d9c982c4c95..000000000000 --- a/devel/apr1/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 |