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: 16-Feb-2006 19:53:00
Branch: HEAD Handle: 2006021618525900
Modified files:
openpkg-src/apache2 apache2.patch apache2.spec
Log:
upgrading package: apache2 2.0.55 -> 2.2.0
Summary:
Revision Changes Path
1.9 +126 -6 openpkg-src/apache2/apache2.patch
1.69 +6 -2 openpkg-src/apache2/apache2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 apache2.patch
--- openpkg-src/apache2/apache2.patch 14 Oct 2005 06:14:35 -0000 1.8
+++ openpkg-src/apache2/apache2.patch 16 Feb 2006 18:52:59 -0000 1.9
@@ -1,7 +1,34 @@
-Index: server/Makefile.in.dist
---- server/Makefile.in.dist 2003-07-03 16:40:35.000000000 +0200
-+++ server/Makefile.in 2003-07-03 16:41:19.000000000 +0200
-@@ -55,7 +55,8 @@
+Index: configure
+--- configure.orig 2005-11-29 09:19:59 +0100
++++ configure 2006-02-15 20:52:55 +0100
+@@ -2674,6 +2674,11 @@
+ { (exit 1); exit 1; }; }
+ fi
+
++if test "x${USE_BUNDLED_APR}" != "x" ; then
++ apr_found=reconfig
++ apr_config=srclib/apr/apr-1-config
++fi
++
+ if test "$apr_found" = "reconfig"; then
+
+ # save our work to this point; this allows the sub-package to use it
+@@ -3002,6 +3007,11 @@
+ { (exit 1); exit 1; }; }
+ fi
+
++if test "x${USE_BUNDLED_APR}" != "x" ; then
++ apu_found=reconfig
++ apu_config=srclib/apr-util/apu-1-config
++fi
++
+ # Catch some misconfigurations:
+ case ${apr_found}.${apu_found} in
+ reconfig.yes)
+Index: server/Makefile.in
+--- server/Makefile.in.orig 2005-02-11 13:00:41 +0100
++++ server/Makefile.in 2006-02-15 20:52:55 +0100
+@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
for dir in $(EXPORT_DIRS); do \
@@ -9,5 +36,98 @@
+ abs_dir=`cd $$dir && exec pwd`; \
+ ls $$abs_dir/*.h >> $$tmp; \
done; \
- sort -u $$tmp > $@; \
- rm -f $$tmp
+ for dir in $(EXPORT_DIRS_APR); do \
+ ls $$dir/ap[ru].h >> $$tmp; \
+Index: srclib/apr-util/dbd/apr_dbd_sqlite3.c
+--- srclib/apr-util/dbd/apr_dbd_sqlite3.c.orig 2005-08-11 10:51:16
+0200
++++ srclib/apr-util/dbd/apr_dbd_sqlite3.c 2006-02-16 19:48:25 +0100
+@@ -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;
+ };
+
+@@ -92,11 +94,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;
+@@ -115,7 +121,9 @@
+ 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);
+ }
+ } else if (ret == SQLITE_ROW) {
+@@ -170,7 +178,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;
+@@ -240,7 +250,9 @@
+ return SQLITE_ERROR;
+ }
+ length = strlen(query);
++#if APR_HAS_THREADS
+ apr_thread_mutex_lock(sql->mutex);
++#endif
+
+ do {
+ ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
+@@ -259,7 +271,9 @@
+ if (dbd_sqlite3_is_success(ret)) {
+ res = 0;
+ }
++#if APR_HAS_THREADS
+ apr_thread_mutex_unlock(sql->mutex);
++#endif
+ apr_pool_destroy(pool);
+ if (sql->trans) {
+ sql->trans->errnum = res;
+@@ -367,11 +381,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 +395,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.68 -r1.69 apache2.spec
--- openpkg-src/apache2/apache2.spec 1 Jan 2006 13:11:57 -0000 1.68
+++ openpkg-src/apache2/apache2.spec 16 Feb 2006 18:52:59 -0000 1.69
@@ -25,7 +25,7 @@
# FIXME: with_mod_perl broken
# package version
-%define V_apache 2.0.55
+%define V_apache 2.2.0
%define V_mod_perl 2.0.2
# package information
@@ -39,7 +39,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20051021
+Release: 20060216
# package options (suexec related)
%option with_suexec yes
@@ -158,6 +158,8 @@
# configure package
( cd httpd-%{V_apache}
+ ( echo "ac_cv_func_uuid_create=no"
+ ) >config.cache
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
export CPPFLAGS="%{l_cppflags}"
@@ -169,7 +171,9 @@
%if "%{with_mod_ldap}" == "yes"
LIBS="$LIBS -lssl -lcrypto"
%endif
+ USE_BUNDLED_APR=YES \
./configure \
+ --cache-file=./config.cache \
--enable-layout=GNU \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/apache2 \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
