ports/98085: Update port: devel/apr to 1.2.7
skv at FreeBSD.org
skv at FreeBSD.org
Mon May 29 12:20:29 UTC 2006
>Number: 98085
>Category: ports
>Synopsis: Update port: devel/apr to 1.2.7
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon May 29 12:20:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Sergey Skvortsov
>Release: FreeBSD 6.1-STABLE i386
>Organization:
<Organization of PR author (multiple lines)>
>Environment:
<Relevant environment information (multiple lines)>
>Description:
Update port: devel/apr to 1.2.7
>How-To-Repeat:
<Code/input/activities to reproduce the problem (multiple lines)>
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/apr/Makefile,v
retrieving revision 1.64
diff -u -r1.64 Makefile
--- Makefile 6 Apr 2006 10:37:17 -0000 1.64
+++ Makefile 29 May 2006 10:02:20 -0000
@@ -15,8 +15,7 @@
# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP
PORTNAME= apr
-PORTVERSION= 1.2.2
-PORTREVISION= 3
+PORTVERSION= 1.2.7
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/apr/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo 22 Jan 2006 08:27:48 -0000 1.14
+++ distinfo 29 May 2006 10:02:29 -0000
@@ -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
Index: files/patch-apr-util_build_dbm.m4
===================================================================
RCS file: /home/ncvs/ports/devel/apr/files/patch-apr-util_build_dbm.m4,v
retrieving revision 1.1
diff -u -r1.1 patch-apr-util_build_dbm.m4
--- files/patch-apr-util_build_dbm.m4 6 Apr 2006 10:37:17 -0000 1.1
+++ files/patch-apr-util_build_dbm.m4 29 May 2006 10:04:56 -0000
@@ -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
Index: files/patch-apr-util_configure
===================================================================
RCS file: /home/ncvs/ports/devel/apr/files/patch-apr-util_configure,v
retrieving revision 1.1
diff -u -r1.1 patch-apr-util_configure
--- files/patch-apr-util_configure 6 Apr 2006 10:37:17 -0000 1.1
+++ files/patch-apr-util_configure 29 May 2006 10:05:12 -0000
@@ -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
Index: files/patch-apr_dbd_sqlite3.c
===================================================================
RCS file: /home/ncvs/ports/devel/apr/files/patch-apr_dbd_sqlite3.c,v
retrieving revision 1.1
diff -u -r1.1 patch-apr_dbd_sqlite3.c
--- files/patch-apr_dbd_sqlite3.c 3 Nov 2005 02:36:35 -0000 1.1
+++ files/patch-apr_dbd_sqlite3.c 29 May 2006 11:57:23 -0000
@@ -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 09:04:54 2006
++++ apr-util-1.2.7/dbd/apr_dbd_sqlite3.c Mon May 29 15:57:03 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,9 +125,13 @@
if (retry_count++ > MAX_RETRY_COUNT) {
ret = SQLITE_ERROR;
} else {
@@ -42,9 +42,13 @@
apr_thread_mutex_unlock(sql->mutex);
+#endif
apr_sleep(MAX_RETRY_SLEEP);
++#if APR_HAS_THREADS
+ apr_thread_mutex_lock(sql->mutex);
++#endif
}
} else if (ret == SQLITE_ROW) {
-@@ -170,7 +179,9 @@
+ int length;
+@@ -179,7 +190,9 @@
} while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
}
ret = sqlite3_finalize(stmt);
@@ -54,9 +58,9 @@
if (sql->trans) {
sql->trans->errnum = ret;
-@@ -240,7 +251,9 @@
- return SQLITE_ERROR;
+@@ -242,7 +255,9 @@
}
+
length = strlen(query);
+#if APR_HAS_THREADS
apr_thread_mutex_lock(sql->mutex);
@@ -64,17 +68,17 @@
do {
ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
-@@ -259,7 +272,9 @@
+@@ -260,7 +275,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;
-@@ -366,12 +381,14 @@
+ sql->trans->errnum = ret;
+ }
+@@ -366,12 +383,14 @@
sql->conn = conn;
sql->pool = pool;
sql->trans = NULL;
@@ -89,7 +93,7 @@
return sql;
}
-@@ -379,7 +396,9 @@
+@@ -379,7 +398,9 @@
static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)
{
sqlite3_close(handle->conn);
Index: files/patch-apr_hints.m4
===================================================================
RCS file: /home/ncvs/ports/devel/apr/files/patch-apr_hints.m4,v
retrieving revision 1.9
diff -u -r1.9 patch-apr_hints.m4
--- files/patch-apr_hints.m4 29 Oct 2005 05:19:51 -0000 1.9
+++ files/patch-apr_hints.m4 29 May 2006 10:05:37 -0000
@@ -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*)
Index: files/patch-rand.c
===================================================================
RCS file: files/patch-rand.c
diff -N files/patch-rand.c
--- files/patch-rand.c 3 Nov 2005 01:36:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list