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: 28-Jul-2009 19:44:09
Branch: HEAD Handle: 2009072818440800
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 2.2.11 -> 2.2.12
Summary:
Revision Changes Path
1.41 +14 -56 openpkg-src/apache/apache.patch
1.449 +2 -2 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.40 -r1.41 apache.patch
--- openpkg-src/apache/apache.patch 1 Feb 2009 19:17:27 -0000 1.40
+++ openpkg-src/apache/apache.patch 28 Jul 2009 17:44:08 -0000 1.41
@@ -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-02-01 17:53:32 +0100
++++ build/config_vars.sh.in 2009-07-28 19:37:48 +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-02-01 17:53:32 +0100
++++ config.layout 2009-07-28 19:37:48 +0200
@@ -50,7 +50,7 @@
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/htdocs
@@ -23,8 +23,8 @@
localstatedir: ${prefix}/var+
runtimedir: ${localstatedir}/run
Index: configure
---- configure.orig 2008-12-06 16:17:59 +0100
-+++ configure 2009-02-01 17:53:32 +0100
+--- 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; }; }
fi
@@ -50,9 +50,9 @@
case ${apr_found}.${apu_found} in
reconfig.yes)
Index: docs/conf/mime.types
---- docs/conf/mime.types.orig 2008-12-01 06:54:25 +0100
-+++ docs/conf/mime.types 2009-02-01 17:53:32 +0100
-@@ -83,6 +83,7 @@
+--- docs/conf/mime.types.orig 2009-07-10 14:30:17 +0200
++++ docs/conf/mime.types 2009-07-28 19:37:49 +0200
+@@ -98,6 +98,7 @@
application/mbox mbox
application/media_control+xml
application/mediaservercontrol+xml mscml
@@ -60,41 +60,7 @@
application/mikey
application/moss-keys
application/moss-signature
-@@ -103,6 +104,7 @@
- application/oda oda
- application/oebps-package+xml
- application/ogg ogx
-+application/onenote onetoc onetoc2 onetmp onepkg
- application/parityfec
- application/patch-ops-error+xml xer
- application/pdf pdf
-@@ -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
-+application/vnd.ms-excel.addin.macroEnabled.12 xlam
-+application/vnd.ms-excel.sheet.binary.macroEnabled.12 xlsb
-+application/vnd.ms-excel.sheet.macroEnabled.12 xlsm
-+application/vnd.ms-excel.template.macroEnabled.12 xltm
- application/vnd.ms-fontobject eot
- application/vnd.ms-htmlhelp chm
- application/vnd.ms-ims ims
- application/vnd.ms-lrm lrm
- application/vnd.ms-playready.initiator+xml
- application/vnd.ms-powerpoint ppt pps pot
-+application/vnd.ms-powerpoint.addin.macroEnabled.12 ppam
-+application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptm
-+application/vnd.ms-powerpoint.slide.macroEnabled.12i sldm
-+application/vnd.ms-powerpoint.slideshow.macroEnabled.12 ppsm
-+application/vnd.ms-powerpoint.template.macroEnabled.12 potm
- application/vnd.ms-project mpp mpt
- application/vnd.ms-tnef
-+application/vnd.ms-word.document.macroEnabled.12 docm
-+application/vnd.ms-word.template.macroEnabled.12 dotm
- application/vnd.ms-wmdrm.lic-chlg-req
- application/vnd.ms-wmdrm.lic-resp
- application/vnd.ms-wmdrm.meter-chlg-req
-@@ -475,6 +488,14 @@
+@@ -547,6 +548,14 @@
application/vnd.oasis.opendocument.text-template ott
application/vnd.oasis.opendocument.text-web oth
application/vnd.obn
@@ -109,17 +75,9 @@
application/vnd.olpc-sugar xo
application/vnd.oma-scws-config
application/vnd.oma-scws-http-request
-@@ -705,6 +726,7 @@
- application/x-ustar ustar
- application/x-wais-source src
- application/x-x509-ca-cert der crt
-+application/x-xpinstall xpi
- application/x400-bp
- application/xcap-att+xml
- 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 2009-02-01 17:53:32 +0100
++++ docs/docroot/index.html 2009-07-28 19:37:49 +0200
@@ -1 +1,7 @@
-<html><body><h1>It works!</h1></body></html>
\ No newline at end of file
@@ -132,7 +90,7 @@
+</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-02-01 18:06:21 +0100
++++ modules/generators/mod_autoindex.c 2009-07-28 19:37:49 +0200
@@ -1573,17 +1573,17 @@
++cols;
@@ -182,7 +140,7 @@
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-02-01 17:53:32 +0100
++++ server/Makefile.in 2009-07-28 19:37:49 +0200
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -195,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-02-01 17:53:32 +0100
++++ support/Makefile.in 2009-07-28 19:37:49 +0200
@@ -22,12 +22,6 @@
chmod 755 $(DESTDIR)$(sbindir)/$$i; \
fi ; \
@@ -211,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-02-01 17:53:32 +0100
++++ support/apachectl.in 2009-07-28 19:37:49 +0200
@@ -43,11 +43,6 @@
# the path to your httpd binary, including options if necessary
HTTPD='@exp_sbindir@/@progname@'
@@ -226,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-02-01 17:53:32 +0100
++++ support/apxs.in 2009-07-28 19:37:49 +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.448 -r1.449 apache.spec
--- openpkg-src/apache/apache.spec 18 Apr 2009 13:08:36 -0000 1.448
+++ openpkg-src/apache/apache.spec 28 Jul 2009 17:44:08 -0000 1.449
@@ -31,8 +31,8 @@
Class: BASE
Group: Web
License: ASF
-Version: 2.2.11
-Release: 20090201
+Version: 2.2.12
+Release: 20090728
# package options
%option with_mpm_prefork yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
