Attachment #66354 for bug #98085

View | Details | Raw Unified | Return to bug 98085
Collapse All | Expand All

Lines 15-22 Link Here

(-)Makefile (-2 / +1 lines)
15	# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP	15	# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP
16		16
17	PORTNAME= apr	17	PORTNAME= apr
18	PORTVERSION= 1.2.2	18	PORTVERSION= 1.2.7
19	PORTREVISION= 3
20	CATEGORIES= devel	19	CATEGORIES= devel
21	MASTER_SITES= ${MASTER_SITE_APACHE}	20	MASTER_SITES= ${MASTER_SITE_APACHE}
22	MASTER_SITE_SUBDIR= apr	21	MASTER_SITE_SUBDIR= apr

Lines 1-6 Link Here

(-)distinfo (-6 / +6 lines)
1	MD5 (apr-1.2.2.tar.gz) = f96e3b04ccf86ed28a0734d7efc5bb65	1	MD5 (apr-1.2.7.tar.gz) = aea926cbe588f844ad9e317157d60175
2	SHA256 (apr-1.2.2.tar.gz) = 23826f62b305efef3f6c6e7e6b8ddad05ec48a2f36410ff508b3fc4714a33dfc	2	SHA256 (apr-1.2.7.tar.gz) = 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa
3	SIZE (apr-1.2.2.tar.gz) = 1096029	3	SIZE (apr-1.2.7.tar.gz) = 1102370
4	MD5 (apr-util-1.2.2.tar.gz) = 8b3f04dde7048946c3c94f85b4debb94	4	MD5 (apr-util-1.2.7.tar.gz) = c3702668a640be1695956115857ec22e
5	SHA256 (apr-util-1.2.2.tar.gz) = b7170fe39edff9ef044464a321194bbee382065dacd0720abc823adbe47731e1	5	SHA256 (apr-util-1.2.7.tar.gz) = 8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3
6	SIZE (apr-util-1.2.2.tar.gz) = 645311	6	SIZE (apr-util-1.2.7.tar.gz) = 641600

Lines 1-5 Link Here

(-)files/patch-apr-util_build_dbm.m4 (-2 / +2 lines)
1	--- apr-util-1.2.2/build/dbm.m4-orig Wed Dec 7 09:02:23 2005	1	--- apr-util-1.2.7/build/dbm.m4-orig Wed Dec 7 09:02:23 2005
2	+++ apr-util-1.2.2/build/dbm.m4 Wed Dec 23 09:07:34 2005	2	+++ apr-util-1.2.7/build/dbm.m4 Wed Dec 23 09:07:34 2005
3	@@ -588,6 +588,8 @@	3	@@ -588,6 +588,8 @@
4	elif test "$withval" = "no"; then	4	elif test "$withval" = "no"; then
5	apu_have_gdbm=0	5	apu_have_gdbm=0

Lines 1-5 Link Here

(-)files/patch-apr-util_configure (-2 / +2 lines)
1	--- apr-util-1.2.2/configure.orig Mon Sep 26 18:28:49 2005	1	--- apr-util-1.2.7/configure.orig Mon Sep 26 18:28:49 2005
2	+++ apr-util-1.2.2/configure Fri Dec 23 15:06:09 2005	2	+++ apr-util-1.2.7/configure Fri Dec 23 15:06:09 2005
3	@@ -13806,6 +13806,8 @@	3	@@ -13806,6 +13806,8 @@
4	elif test "$withval" = "no"; then	4	elif test "$withval" = "no"; then
5	apu_have_gdbm=0	5	apu_have_gdbm=0

Lines 1-5 Link Here

(-)files/patch-apr_dbd_sqlite3.c (-13 / +17 lines)
1	--- apr-util-1.2.2/dbd/apr_dbd_sqlite3.c.orig Wed Nov 2 20:47:48 2005	1	--- apr-util-1.2.7/dbd/apr_dbd_sqlite3.c.orig Wed Mar 15 09:04:54 2006
2	+++ apr-util-1.2.2/dbd/apr_dbd_sqlite3.c Wed Nov 2 20:55:50 2005	2	+++ apr-util-1.2.7/dbd/apr_dbd_sqlite3.c Mon May 29 15:57:03 2006
3	@@ -24,6 +24,7 @@	3	@@ -24,6 +24,7 @@
4	#include <sqlite3.h>	4	#include <sqlite3.h>
5		5
Lines 18-24 Link Here
18	apr_pool_t *pool;	18	apr_pool_t *pool;
19	};	19	};
20		20
21	@@ -92,11 +95,15 @@	21	@@ -93,11 +96,15 @@
22	return sql->trans->errnum;	22	return sql->trans->errnum;
23	}	23	}
24		24
Lines 34-40 Link Here
34	return ret;	34	return ret;
35	} else {	35	} else {
36	int column_count;	36	int column_count;
37	@@ -115,7 +122,9 @@	37	@@ -118,9 +125,13 @@
38	if (retry_count++ > MAX_RETRY_COUNT) {	38	if (retry_count++ > MAX_RETRY_COUNT) {
39	ret = SQLITE_ERROR;	39	ret = SQLITE_ERROR;
40	} else {	40	} else {
Lines 42-50 Link Here
42	apr_thread_mutex_unlock(sql->mutex);	42	apr_thread_mutex_unlock(sql->mutex);
43	+#endif	43	+#endif
44	apr_sleep(MAX_RETRY_SLEEP);	44	apr_sleep(MAX_RETRY_SLEEP);
		45	+#if APR_HAS_THREADS
		46	apr_thread_mutex_lock(sql->mutex);
		47	+#endif
45	}	48	}
46	} else if (ret == SQLITE_ROW) {	49	} else if (ret == SQLITE_ROW) {
47	@@ -170,7 +179,9 @@	50	int length;
		51	@@ -179,7 +190,9 @@
48	} while (ret == SQLITE_ROW \|\| ret == SQLITE_BUSY);	52	} while (ret == SQLITE_ROW \|\| ret == SQLITE_BUSY);
49	}	53	}
50	ret = sqlite3_finalize(stmt);	54	ret = sqlite3_finalize(stmt);
Lines 54-62 Link Here
54		58
55	if (sql->trans) {	59	if (sql->trans) {
56	sql->trans->errnum = ret;	60	sql->trans->errnum = ret;
57	@@ -240,7 +251,9 @@	61	@@ -242,7 +255,9 @@
58	return SQLITE_ERROR;
59	}	62	}
		63
60	length = strlen(query);	64	length = strlen(query);
61	+#if APR_HAS_THREADS	65	+#if APR_HAS_THREADS
62	apr_thread_mutex_lock(sql->mutex);	66	apr_thread_mutex_lock(sql->mutex);
Lines 64-80 Link Here
64		68
65	do {	69	do {
66	ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);	70	ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
67	@@ -259,7 +272,9 @@	71	@@ -260,7 +275,9 @@
68	if (dbd_sqlite3_is_success(ret)) {	72	if (dbd_sqlite3_is_success(ret)) {
69	res = 0;	73	ret = 0;
70	}	74	}
71	+#if APR_HAS_THREADS	75	+#if APR_HAS_THREADS
72	apr_thread_mutex_unlock(sql->mutex);	76	apr_thread_mutex_unlock(sql->mutex);
73	+#endif	77	+#endif
74	apr_pool_destroy(pool);
75	if (sql->trans) {	78	if (sql->trans) {
76	sql->trans->errnum = res;	79	sql->trans->errnum = ret;
77	@@ -366,12 +381,14 @@	80	}
		81	@@ -366,12 +383,14 @@
78	sql->conn = conn;	82	sql->conn = conn;
79	sql->pool = pool;	83	sql->pool = pool;
80	sql->trans = NULL;	84	sql->trans = NULL;
Lines 89-95 Link Here
89		93
90	return sql;	94	return sql;
91	}	95	}
92	@@ -379,7 +396,9 @@	96	@@ -379,7 +398,9 @@
93	static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)	97	static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)
94	{	98	{
95	sqlite3_close(handle->conn);	99	sqlite3_close(handle->conn);

Lines 1-5 Link Here

(-)files/patch-apr_hints.m4 (-2 / +2 lines)
1	--- apr-1.2.2/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004	1	--- apr-1.2.7/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004
2	+++ apr-1.2.2/build/apr_hints.m4 Wed Oct 27 11:25:32 2004	2	+++ apr-1.2.7/build/apr_hints.m4 Wed Oct 27 11:25:32 2004
3	@@ -137,11 +137,7 @@	3	@@ -137,11 +137,7 @@
4	;;	4	;;
5	-freebsd)	5	-freebsd)




--- 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

Return to bug 98085

Removed Link Here

(-)files/patch-rand.c (-16 lines)
1	--- apr-1.2.2/misc/unix/rand.c.orig Wed Nov 2 20:17:10 2005
2	+++ apr-1.2.2/misc/unix/rand.c Wed Nov 2 20:17:43 2005
3	@@ -35,11 +35,10 @@
4	#if APR_HAVE_SYS_UN_H
5	#include <sys/un.h>
6	#endif
7	-#ifdef HAVE_UUID_UUID_H
8	-#include <uuid/uuid.h>
9	-#endif
10	#ifdef HAVE_UUID_H
11	#include <uuid.h>
12	+#elif defined(HAVE_UUID_UUID_H)
13	+#include <uuid/uuid.h>
14	#endif
15
16	#ifndef SHUT_RDWR