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: 14-Dec-2008 11:07:08
Branch: HEAD Handle: 2008121410070800
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 2.2.10 -> 2.2.11
Summary:
Revision Changes Path
1.39 +25 -25 openpkg-src/apache/apache.patch
1.442 +2 -2 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.38 -r1.39 apache.patch
--- openpkg-src/apache/apache.patch 26 Jul 2008 18:38:54 -0000 1.38
+++ openpkg-src/apache/apache.patch 14 Dec 2008 10:07:08 -0000 1.39
@@ -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 2008-07-26 20:35:59 +0200
++++ build/config_vars.sh.in 2008-12-14 11:00:41 +0100
@@ -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 2008-07-26 20:35:59 +0200
++++ config.layout 2008-12-14 11:00:41 +0100
@@ -50,7 +50,7 @@
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/htdocs
@@ -23,9 +23,9 @@
localstatedir: ${prefix}/var+
runtimedir: ${localstatedir}/run
Index: configure
---- configure.orig 2008-06-10 21:18:00 +0200
-+++ configure 2008-07-26 20:35:59 +0200
-@@ -3591,6 +3591,11 @@
+--- configure.orig 2008-12-06 16:17:59 +0100
++++ configure 2008-12-14 11:00:41 +0100
+@@ -3597,6 +3597,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -37,7 +37,7 @@
if test "$apr_found" = "reconfig"; then
# save our work to this point; this allows the sub-package to use it
-@@ -3950,6 +3955,11 @@
+@@ -3957,6 +3962,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -50,25 +50,25 @@
case ${apr_found}.${apu_found} in
reconfig.yes)
Index: docs/conf/mime.types
---- docs/conf/mime.types.orig 2008-01-02 23:10:01 +0100
-+++ docs/conf/mime.types 2008-07-26 20:36:56 +0200
-@@ -81,6 +81,7 @@
- application/mbms-user-service-description+xml
+--- docs/conf/mime.types.orig 2008-12-01 06:54:25 +0100
++++ docs/conf/mime.types 2008-12-14 11:01:41 +0100
+@@ -83,6 +83,7 @@
application/mbox mbox
+ application/media_control+xml
application/mediaservercontrol+xml mscml
+application/metalink+xml metalink
application/mikey
application/moss-keys
application/moss-signature
-@@ -102,6 +103,7 @@
+@@ -103,6 +104,7 @@
application/oda oda
application/oebps-package+xml
- application/ogg ogg
-+application/onenote onetoc onetoc2 onetmp onepkg
+ application/ogg ogx
++application/onenote onetoc onetoc2 onetmp onepkg
application/parityfec
+ application/patch-ops-error+xml xer
application/pdf pdf
- application/pgp-encrypted pgp
-@@ -389,14 +391,25 @@
+@@ -409,14 +411,25 @@
application/vnd.ms-asf asf
application/vnd.ms-cab-compressed cab
application/vnd.ms-excel xls xlm xla xlc xlt xlw
@@ -94,7 +94,7 @@
application/vnd.ms-wmdrm.lic-chlg-req
application/vnd.ms-wmdrm.lic-resp
application/vnd.ms-wmdrm.meter-chlg-req
-@@ -455,6 +468,14 @@
+@@ -475,6 +488,14 @@
application/vnd.oasis.opendocument.text-template ott
application/vnd.oasis.opendocument.text-web oth
application/vnd.obn
@@ -109,7 +109,7 @@
application/vnd.olpc-sugar xo
application/vnd.oma-scws-config
application/vnd.oma-scws-http-request
-@@ -674,6 +695,7 @@
+@@ -705,6 +726,7 @@
application/x-ustar ustar
application/x-wais-source src
application/x-x509-ca-cert der crt
@@ -119,7 +119,7 @@
application/xcap-caps+xml
Index: docs/docroot/index.html
--- docs/docroot/index.html.orig 2004-11-20 21:16:24 +0100
-+++ docs/docroot/index.html 2008-07-26 20:35:59 +0200
++++ docs/docroot/index.html 2008-12-14 11:00:41 +0100
@@ -1 +1,7 @@
-<html><body><h1>It works!</h1></body></html>
\ No newline at end of file
@@ -131,9 +131,9 @@
+ </body>
+</html>
Index: modules/generators/mod_autoindex.c
---- modules/generators/mod_autoindex.c.orig 2007-12-09 15:46:56 +0100
-+++ modules/generators/mod_autoindex.c 2008-07-26 20:35:59 +0200
-@@ -1564,17 +1564,17 @@
+--- modules/generators/mod_autoindex.c.orig 2008-11-29 22:47:13 +0100
++++ modules/generators/mod_autoindex.c 2008-12-14 11:00:41 +0100
+@@ -1573,17 +1573,17 @@
++cols;
}
@@ -156,7 +156,7 @@
++cols;
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2008-07-26 20:35:59 +0200
++++ server/Makefile.in 2008-12-14 11:00:41 +0100
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -169,7 +169,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 2008-07-26 20:35:59 +0200
++++ support/Makefile.in 2008-12-14 11:00:41 +0100
@@ -22,12 +22,6 @@
chmod 755 $(DESTDIR)$(sbindir)/$$i; \
fi ; \
@@ -185,7 +185,7 @@
htpasswd: $(htpasswd_OBJECTS)
Index: support/apachectl.in
--- support/apachectl.in.orig 2006-07-12 05:38:44 +0200
-+++ support/apachectl.in 2008-07-26 20:35:59 +0200
++++ support/apachectl.in 2008-12-14 11:00:41 +0100
@@ -43,11 +43,6 @@
# the path to your httpd binary, including options if necessary
HTTPD='@exp_sbindir@/@progname@'
@@ -200,7 +200,7 @@
# programs may work.
Index: support/apxs.in
--- support/apxs.in.orig 2006-07-12 05:38:44 +0200
-+++ support/apxs.in 2008-07-26 20:35:59 +0200
++++ support/apxs.in 2008-12-14 11:00:41 +0100
@@ -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.441 -r1.442 apache.spec
--- openpkg-src/apache/apache.spec 11 Nov 2008 07:52:43 -0000 1.441
+++ openpkg-src/apache/apache.spec 14 Dec 2008 10:07:08 -0000 1.442
@@ -31,8 +31,8 @@
Class: BASE
Group: Web
License: ASF
-Version: 2.2.10
-Release: 20081111
+Version: 2.2.11
+Release: 20081214
# package options
%option with_mpm_prefork yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
