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: 22-Jun-2007 13:59:16
Branch: HEAD Handle: 2007062212591600
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
use a DSO-capable GNU libtool in Apache apxs instead of the
DSO-disabled one from APR
Summary:
Revision Changes Path
1.28 +29 -4 openpkg-src/apache/apache.patch
1.408 +2 -2 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.27 -r1.28 apache.patch
--- openpkg-src/apache/apache.patch 22 Jun 2007 10:54:02 -0000 1.27
+++ openpkg-src/apache/apache.patch 22 Jun 2007 11:59:16 -0000 1.28
@@ -1,6 +1,18 @@
+Index: build/config_vars.sh.in
+--- build/config_vars.sh.in.orig 2006-07-12 05:38:44 +0200
++++ build/config_vars.sh.in 2007-06-22 13:49:29 +0200
+@@ -35,7 +35,7 @@
+ [EMAIL PROTECTED]@
+ fi
+
+-APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`"
++APR_LIBTOOL="@prefix@/bin/libtool"
+ APR_INCLUDEDIR="`${APR_CONFIG} --includedir`"
+ APU_INCLUDEDIR="`${APU_CONFIG} --includedir`"
+
Index: configure
--- configure.orig 2007-01-06 07:40:00 +0100
-+++ configure 2007-01-10 19:46:27 +0100
++++ configure 2007-06-22 13:48:25 +0200
@@ -2711,6 +2711,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -27,7 +39,7 @@
reconfig.yes)
Index: docs/conf/mime.types
--- docs/conf/mime.types.orig 2006-01-29 23:34:37 +0100
-+++ docs/conf/mime.types 2007-01-10 19:46:27 +0100
++++ docs/conf/mime.types 2007-06-22 13:48:25 +0200
@@ -265,6 +265,22 @@
application/vnd.novadigm.edm
application/vnd.novadigm.edx
@@ -53,7 +65,7 @@
application/vnd.palm
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2007-01-10 19:46:27 +0100
++++ server/Makefile.in 2007-06-22 13:48:25 +0200
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -66,7 +78,7 @@
(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 2006-04-14 20:01:58 +0200
-+++ srclib/apr-util/crypto/getuuid.c 2007-01-10 19:46:27 +0100
++++ srclib/apr-util/crypto/getuuid.c 2007-06-22 13:48:25 +0200
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -76,3 +88,16 @@
srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
return rand() & 0x0FFFF;
+Index: support/apxs.in
+--- support/apxs.in.orig 2006-07-12 05:38:44 +0200
++++ support/apxs.in 2007-06-22 13:48:25 +0200
+@@ -338,8 +338,7 @@
+ exit(1);
+ }
+
+-my $libtool = `$apr_config --apr-libtool`;
+-chomp($libtool);
++my $libtool = "$prefix/bin/libtool";
+
+ my $apr_includedir = `$apr_config --includes`;
+ chomp($apr_includedir);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.407 -r1.408 apache.spec
--- openpkg-src/apache/apache.spec 22 Jun 2007 10:54:02 -0000 1.407
+++ openpkg-src/apache/apache.spec 22 Jun 2007 11:59:16 -0000 1.408
@@ -72,8 +72,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, perl, make
-PreReq: OpenPKG, openpkg >= 20060823, perl
+BuildPreReq: OpenPKG, openpkg >= 20060823, perl, libtool, make
+PreReq: OpenPKG, openpkg >= 20060823, perl, libtool
BuildPreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
PreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
%if "%{with_mod_ldap}" == "yes"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
