OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 04-Oct-2009 19:09:20
Branch: HEAD Handle: 2009100418091900
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 2.2.13 -> 2.2.14
Summary:
Revision Changes Path
1.42 +22 -22 openpkg-src/apache/apache.patch
1.451 +2 -2 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.41 -r1.42 apache.patch
--- openpkg-src/apache/apache.patch 28 Jul 2009 17:44:08 -0000 1.41
+++ openpkg-src/apache/apache.patch 4 Oct 2009 17:09:19 -0000 1.42
@@ -1,6 +1,6 @@
Index: build/config_vars.sh.in
--- build/config_vars.sh.in.orig 2008-02-05 00:00:07 +0100
-+++ build/config_vars.sh.in 2009-07-28 19:37:48 +0200
++++ build/config_vars.sh.in 2009-10-04 19:02:09 +0200
@@ -35,7 +35,7 @@
apu_conf...@apu_config@
fi
@@ -12,7 +12,7 @@
Index: config.layout
--- config.layout.orig 2004-11-21 19:50:36 +0100
-+++ config.layout 2009-07-28 19:37:48 +0200
++++ config.layout 2009-10-04 19:02:09 +0200
@@ -50,7 +50,7 @@
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/htdocs
@@ -23,10 +23,10 @@
localstatedir: ${prefix}/var+
runtimedir: ${localstatedir}/run
Index: configure
---- configure.orig 2009-07-20 22:24:36 +0200
-+++ configure 2009-07-28 19:37:49 +0200
-@@ -3597,6 +3597,11 @@
- { (exit 1); exit 1; }; }
+--- configure.orig 2009-09-24 01:29:56 +0200
++++ configure 2009-10-04 19:02:09 +0200
+@@ -3849,6 +3849,11 @@
+ as_fn_error "APR not found. Please read the documentation." "$LINENO" 5
fi
+if test "x${USE_BUNDLED_APR}" != "x" ; then
@@ -37,8 +37,8 @@
if test "$apr_found" = "reconfig"; then
# save our work to this point; this allows the sub-package to use it
-@@ -3957,6 +3962,11 @@
- { (exit 1); exit 1; }; }
+@@ -4201,6 +4206,11 @@
+ as_fn_error "APR-util not found. Please read the documentation."
"$LINENO" 5
fi
+if test "x${USE_BUNDLED_APR}" != "x" ; then
@@ -50,8 +50,8 @@
case ${apr_found}.${apu_found} in
reconfig.yes)
Index: docs/conf/mime.types
---- docs/conf/mime.types.orig 2009-07-10 14:30:17 +0200
-+++ docs/conf/mime.types 2009-07-28 19:37:49 +0200
+--- docs/conf/mime.types.orig 2009-08-28 16:37:37 +0200
++++ docs/conf/mime.types 2009-10-04 19:02:09 +0200
@@ -98,6 +98,7 @@
application/mbox mbox
application/media_control+xml
@@ -77,7 +77,7 @@
application/vnd.oma-scws-http-request
Index: docs/docroot/index.html
--- docs/docroot/index.html.orig 2004-11-20 21:16:24 +0100
-+++ docs/docroot/index.html 2009-07-28 19:37:49 +0200
++++ docs/docroot/index.html 2009-10-04 19:02:09 +0200
@@ -1 +1,7 @@
-<html><body><h1>It works!</h1></body></html>
\ No newline at end of file
@@ -89,8 +89,8 @@
+ </body>
+</html>
Index: modules/generators/mod_autoindex.c
---- modules/generators/mod_autoindex.c.orig 2008-11-29 22:47:13 +0100
-+++ modules/generators/mod_autoindex.c 2009-07-28 19:37:49 +0200
+--- modules/generators/mod_autoindex.c.orig 2009-08-28 16:37:37 +0200
++++ modules/generators/mod_autoindex.c 2009-10-04 19:03:01 +0200
@@ -1573,17 +1573,17 @@
++cols;
@@ -128,19 +128,19 @@
if (!(autoindex_opts & SUPPRESS_ICON)) {
ap_rputs("<td valign=\"top\">", r);
if (autoindex_opts & ICONS_ARE_LINKS) {
-@@ -1763,9 +1770,6 @@
+@@ -1762,9 +1769,6 @@
+ desc_width), NULL);
}
}
+- else {
+- ap_rputs("</td><td> ", r);
+- }
}
-- else {
-- ap_rputs("</td><td> ", r);
-- }
ap_rputs("</td></tr>\n", r);
}
- else if (autoindex_opts & FANCY_INDEXING) {
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2009-07-28 19:37:49 +0200
++++ server/Makefile.in 2009-10-04 19:02:09 +0200
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -153,7 +153,7 @@
(ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
Index: support/Makefile.in
--- support/Makefile.in.orig 2005-07-07 01:15:34 +0200
-+++ support/Makefile.in 2009-07-28 19:37:49 +0200
++++ support/Makefile.in 2009-10-04 19:02:09 +0200
@@ -22,12 +22,6 @@
chmod 755 $(DESTDIR)$(sbindir)/$$i; \
fi ; \
@@ -169,7 +169,7 @@
htpasswd: $(htpasswd_OBJECTS)
Index: support/apachectl.in
--- support/apachectl.in.orig 2006-07-12 05:38:44 +0200
-+++ support/apachectl.in 2009-07-28 19:37:49 +0200
++++ support/apachectl.in 2009-10-04 19:02:09 +0200
@@ -43,11 +43,6 @@
# the path to your httpd binary, including options if necessary
HTTPD='@exp_sbindir@/@progname@'
@@ -184,7 +184,7 @@
# programs may work.
Index: support/apxs.in
--- support/apxs.in.orig 2006-07-12 05:38:44 +0200
-+++ support/apxs.in 2009-07-28 19:37:49 +0200
++++ support/apxs.in 2009-10-04 19:02:09 +0200
@@ -190,9 +190,6 @@
my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
$httpd = eval qq("$httpd");
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.450 -r1.451 apache.spec
--- openpkg-src/apache/apache.spec 9 Aug 2009 07:35:41 -0000 1.450
+++ openpkg-src/apache/apache.spec 4 Oct 2009 17:09:19 -0000 1.451
@@ -31,8 +31,8 @@
Class: BASE
Group: Web
License: ASF
-Version: 2.2.13
-Release: 20090809
+Version: 2.2.14
+Release: 20091004
# package options
%option with_mpm_prefork yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
