OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Jan-2007 19:55:01
Branch: HEAD Handle: 2007011018550100
Modified files:
openpkg-src/apache2 apache2.patch apache2.spec
Log:
upgrading package: apache2 2.2.3 -> 2.2.4
Summary:
Revision Changes Path
1.13 +8 -149 openpkg-src/apache2/apache2.patch
1.84 +2 -2 openpkg-src/apache2/apache2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 apache2.patch
--- openpkg-src/apache2/apache2.patch 12 Sep 2006 14:05:18 -0000 1.12
+++ openpkg-src/apache2/apache2.patch 10 Jan 2007 18:55:01 -0000 1.13
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2006-04-22 05:54:22 +0200
-+++ configure 2006-04-30 09:59:39 +0200
-@@ -2682,6 +2682,11 @@
+--- configure.orig 2007-01-06 07:40:00 +0100
++++ configure 2007-01-10 19:46:27 +0100
+@@ -2711,6 +2711,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -13,7 +13,7 @@
if test "$apr_found" = "reconfig"; then
# save our work to this point; this allows the sub-package to use it
-@@ -3010,6 +3015,11 @@
+@@ -3047,6 +3052,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -27,7 +27,7 @@
reconfig.yes)
Index: docs/conf/mime.types
--- docs/conf/mime.types.orig 2006-01-29 23:34:37 +0100
-+++ docs/conf/mime.types 2006-09-11 17:33:28 +0200
++++ docs/conf/mime.types 2007-01-10 19:46:27 +0100
@@ -265,6 +265,22 @@
application/vnd.novadigm.edm
application/vnd.novadigm.edx
@@ -53,7 +53,7 @@
application/vnd.palm
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2006-04-30 09:59:39 +0200
++++ server/Makefile.in 2007-01-10 19:46:27 +0100
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -65,8 +65,8 @@
for dir in $(EXPORT_DIRS_APR); do \
(ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
Index: srclib/apr-util/crypto/getuuid.c
---- srclib/apr-util/crypto/getuuid.c.orig 2005-02-04 21:45:35 +0100
-+++ srclib/apr-util/crypto/getuuid.c 2006-04-30 09:59:39 +0200
+--- srclib/apr-util/crypto/getuuid.c.orig 2006-04-14 20:01:58 +0200
++++ srclib/apr-util/crypto/getuuid.c 2007-01-10 19:46:27 +0100
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -76,144 +76,3 @@
srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
return rand() & 0x0FFFF;
-@@ -151,7 +151,7 @@
- static apr_interval_time_t time_last = 0;
- static apr_interval_time_t fudge = 0;
-
-- time_now = apr_time_now();
-+ get_system_time(&time_now);
-
- /* if clock reading changed since last UUID generated... */
- if (time_last != time_now) {
-@@ -188,17 +188,26 @@
-
- get_current_time(×tamp);
-
-- d[0] = (unsigned char)timestamp;
-- d[1] = (unsigned char)(timestamp >> 8);
-- d[2] = (unsigned char)(timestamp >> 16);
-- d[3] = (unsigned char)(timestamp >> 24);
-- d[4] = (unsigned char)(timestamp >> 32);
-- d[5] = (unsigned char)(timestamp >> 40);
-- d[6] = (unsigned char)(timestamp >> 48);
-- d[7] = (unsigned char)(((timestamp >> 56) & 0x0F) | 0x10);
-+ /* UUID field: time_low */
-+ d[0] = (unsigned char)(timestamp >> (8*3));
-+ d[1] = (unsigned char)(timestamp >> (8*2));
-+ d[2] = (unsigned char)(timestamp >> (8*1));
-+ d[3] = (unsigned char)(timestamp);
-+
-+ /* UUID field: time_mid */
-+ d[4] = (unsigned char)(timestamp >> (8*5));
-+ d[5] = (unsigned char)(timestamp >> (8*4));
-+
-+ /* UUID field: time_hi_and_version */
-+ d[6] = (unsigned char)(((timestamp >> (8*7)) & 0x0F) | 0x10);
-+ d[7] = (unsigned char)(timestamp >> (8*6));
-
-+ /* UUID field: clk_seq_hi_res */
- d[8] = (unsigned char)(((uuid_state_seqnum >> 8) & 0x3F) | 0x80);
-+
-+ /* UUID field: clk_seq_low */
- d[9] = (unsigned char)uuid_state_seqnum;
-
-+ /* UUID field: node */
- memcpy(&d[10], uuid_state_node, NODE_LENGTH);
- }
-Index: srclib/apr-util/dbd/apr_dbd_sqlite3.c
---- srclib/apr-util/dbd/apr_dbd_sqlite3.c.orig 2006-03-15 07:04:54
+0100
-+++ srclib/apr-util/dbd/apr_dbd_sqlite3.c 2006-04-30 10:02:32 +0200
-@@ -39,7 +39,9 @@
- struct apr_dbd_t {
- sqlite3 *conn;
- apr_dbd_transaction_t *trans;
-+#if APR_HAS_THREADS
- apr_thread_mutex_t *mutex;
-+#endif
- apr_pool_t *pool;
- };
-
-@@ -93,11 +95,15 @@
- return sql->trans->errnum;
- }
-
-+#if APR_HAS_THREADS
- apr_thread_mutex_lock(sql->mutex);
-+#endif
-
- ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail);
- if (!dbd_sqlite3_is_success(ret)) {
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- return ret;
- } else {
- int column_count;
-@@ -118,9 +124,13 @@
- if (retry_count++ > MAX_RETRY_COUNT) {
- ret = SQLITE_ERROR;
- } else {
-+#if APR_HAS_THREADS
- 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) {
- int length;
-@@ -179,7 +189,9 @@
- } while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
- }
- ret = sqlite3_finalize(stmt);
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
-
- if (sql->trans) {
- sql->trans->errnum = ret;
-@@ -242,7 +254,9 @@
- }
-
- length = strlen(query);
-+#if APR_HAS_THREADS
- apr_thread_mutex_lock(sql->mutex);
-+#endif
-
- do {
- ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
-@@ -260,7 +274,9 @@
- if (dbd_sqlite3_is_success(ret)) {
- ret = 0;
- }
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- if (sql->trans) {
- sql->trans->errnum = ret;
- }
-@@ -367,11 +383,13 @@
- sql->pool = pool;
- sql->trans = NULL;
- /* Create a mutex */
-+#if APR_HAS_THREADS
- res = apr_thread_mutex_create(&sql->mutex, APR_THREAD_MUTEX_DEFAULT,
- pool);
- if (res != APR_SUCCESS) {
- return NULL;
- }
-+#endif
-
- return sql;
- }
-@@ -379,7 +397,9 @@
- static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)
- {
- sqlite3_close(handle->conn);
-+#if APR_HAS_THREADS
- apr_thread_mutex_destroy(handle->mutex);
-+#endif
- return APR_SUCCESS;
- }
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.83 -r1.84 apache2.spec
--- openpkg-src/apache2/apache2.spec 1 Jan 2007 17:36:32 -0000 1.83
+++ openpkg-src/apache2/apache2.spec 10 Jan 2007 18:55:01 -0000 1.84
@@ -25,7 +25,7 @@
# FIXME: with_mod_perl broken
# package version
-%define V_apache 2.2.3
+%define V_apache 2.2.4
%define V_mod_perl 2.0.3
# package information
@@ -39,7 +39,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20061129
+Release: 20070110
# package options (generic)
%option with_mpm prefork
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
