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: 07-Sep-2007 10:18:21
Branch: HEAD Handle: 2007090709181801
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 2.2.4 -> 2.2.6
Summary:
Revision Changes Path
1.35 +43 -56 openpkg-src/apache/apache.patch
1.426 +2 -2 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.34 -r1.35 apache.patch
--- openpkg-src/apache/apache.patch 19 Jul 2007 17:47:01 -0000 1.34
+++ openpkg-src/apache/apache.patch 7 Sep 2007 08:18:18 -0000 1.35
@@ -1,6 +1,6 @@
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-28 22:12:16 +0200
++++ build/config_vars.sh.in 2007-09-07 10:12:40 +0200
@@ -35,7 +35,7 @@
[EMAIL PROTECTED]@
fi
@@ -12,7 +12,7 @@
Index: config.layout
--- config.layout.orig 2004-11-21 19:50:36 +0100
-+++ config.layout 2007-06-28 22:12:16 +0200
++++ config.layout 2007-09-07 10:12:40 +0200
@@ -50,7 +50,7 @@
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/htdocs
@@ -23,9 +23,9 @@
localstatedir: ${prefix}/var+
runtimedir: ${localstatedir}/run
Index: configure
---- configure.orig 2007-01-06 07:40:00 +0100
-+++ configure 2007-06-28 22:12:16 +0200
-@@ -2711,6 +2711,11 @@
+--- configure.orig 2007-09-04 22:09:24 +0200
++++ configure 2007-09-07 10:12:40 +0200
+@@ -3355,6 +3355,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
-@@ -3047,6 +3052,11 @@
+@@ -3710,6 +3715,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -50,58 +50,45 @@
case ${apr_found}.${apu_found} in
reconfig.yes)
Index: docs/conf/mime.types
---- docs/conf/mime.types.orig 2006-01-29 23:34:37.000000000 +0100
-+++ docs/conf/mime.types 2007-07-19 19:05:56.000000000 +0200
-@@ -54,6 +54,7 @@
- application/octet-stream bin dms lha lzh exe class so dll dmg
- application/oda oda
- application/ogg ogg
+--- docs/conf/mime.types.orig 2007-09-01 00:00:42 +0200
++++ docs/conf/mime.types 2007-09-07 10:14:33 +0200
+@@ -98,6 +98,7 @@
+ application/oda oda
+ application/oebps-package+xml
+ application/ogg ogg
+application/onenote onetoc onetoc2 onetmp onepkg
application/parityfec
- application/pdf pdf
- application/pgp-encrypted
-@@ -248,10 +249,21 @@
- application/vnd.ms-artgalry
- application/vnd.ms-asf
- application/vnd.ms-excel xls
+ application/pdf pdf
+ application/pgp-encrypted pgp
+@@ -376,14 +377,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-lrm
- application/vnd.ms-powerpoint ppt
+ 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
+ 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-works
- application/vnd.ms-wpl
- application/vnd.mseq
-@@ -265,7 +277,31 @@
- application/vnd.novadigm.edm
- application/vnd.novadigm.edx
- application/vnd.novadigm.ext
-+application/vnd.oasis.opendocument.text odt
-+application/vnd.oasis.opendocument.spreadsheet ods
-+application/vnd.oasis.opendocument.presentation odp
-+application/vnd.oasis.opendocument.graphics odg
-+application/vnd.oasis.opendocument.chart odc
-+application/vnd.oasis.opendocument.formula odf
-+application/vnd.oasis.opendocument.image odi
-+application/vnd.oasis.opendocument.text-template ott
-+application/vnd.oasis.opendocument.spreadsheet-template ots
-+application/vnd.oasis.opendocument.presentation-template otp
-+application/vnd.oasis.opendocument.graphics-template otg
-+application/vnd.oasis.opendocument.chart-template otc
-+application/vnd.oasis.opendocument.formula-template oft
-+application/vnd.oasis.opendocument.image-template oti
-+application/vnd.oasis.opendocument.text-master odm
-+application/vnd.oasis.opendocument.text-web oth
+ application/vnd.ms-wmdrm.lic-chlg-req
+ application/vnd.ms-wmdrm.lic-resp
+ application/vnd.ms-wmdrm.meter-chlg-req
+@@ -438,6 +450,14 @@
+ application/vnd.oasis.opendocument.text-template ott
+ application/vnd.oasis.opendocument.text-web oth
application/vnd.obn
+application/vnd.openxmlformats-officedocument.presentationml.presentation
pptx
+application/vnd.openxmlformats-officedocument.presentationml.slide
sldx
@@ -111,12 +98,12 @@
+application/vnd.openxmlformats-officedocument.spreadsheetml.template
xltx
+application/vnd.openxmlformats-officedocument.wordprocessingml.document
docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.template
dotx
- application/vnd.osa.netdeploy
- application/vnd.palm
- application/vnd.pg.format
+ application/vnd.olpc-sugar xo
+ application/vnd.oma-scws-config
+ 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 2007-06-28 22:12:16 +0200
++++ docs/docroot/index.html 2007-09-07 10:12:40 +0200
@@ -1 +1,7 @@
-<html><body><h1>It works!</h1></body></html>
\ No newline at end of file
@@ -128,9 +115,9 @@
+ </body>
+</html>
Index: modules/generators/mod_autoindex.c
---- modules/generators/mod_autoindex.c.orig 2006-07-12 05:38:44 +0200
-+++ modules/generators/mod_autoindex.c 2007-06-28 22:12:16 +0200
-@@ -1544,17 +1544,17 @@
+--- modules/generators/mod_autoindex.c.orig 2007-08-30 00:37:26 +0200
++++ modules/generators/mod_autoindex.c 2007-09-07 10:12:40 +0200
+@@ -1555,17 +1555,17 @@
++cols;
}
@@ -153,7 +140,7 @@
++cols;
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2007-06-28 22:12:16 +0200
++++ server/Makefile.in 2007-09-07 10:12:40 +0200
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -166,7 +153,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-06-28 22:12:16 +0200
++++ srclib/apr-util/crypto/getuuid.c 2007-09-07 10:12:40 +0200
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -178,7 +165,7 @@
return rand() & 0x0FFFF;
Index: support/Makefile.in
--- support/Makefile.in.orig 2005-07-07 01:15:34 +0200
-+++ support/Makefile.in 2007-06-28 22:16:54 +0200
++++ support/Makefile.in 2007-09-07 10:12:40 +0200
@@ -22,12 +22,6 @@
chmod 755 $(DESTDIR)$(sbindir)/$$i; \
fi ; \
@@ -194,7 +181,7 @@
htpasswd: $(htpasswd_OBJECTS)
Index: support/apachectl.in
--- support/apachectl.in.orig 2006-07-12 05:38:44 +0200
-+++ support/apachectl.in 2007-06-28 22:15:56 +0200
++++ support/apachectl.in 2007-09-07 10:12:40 +0200
@@ -43,11 +43,6 @@
# the path to your httpd binary, including options if necessary
HTTPD='@exp_sbindir@/@progname@'
@@ -209,7 +196,7 @@
# programs may work.
Index: support/apxs.in
--- support/apxs.in.orig 2006-07-12 05:38:44 +0200
-+++ support/apxs.in 2007-06-28 22:14:31 +0200
++++ support/apxs.in 2007-09-07 10:12:40 +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.425 -r1.426 apache.spec
--- openpkg-src/apache/apache.spec 1 Aug 2007 09:00:14 -0000 1.425
+++ openpkg-src/apache/apache.spec 7 Sep 2007 08:18:19 -0000 1.426
@@ -32,8 +32,8 @@
Class: BASE
Group: Web
License: ASF
-Version: 2.2.4
-Release: 20070801
+Version: 2.2.6
+Release: 20070907
# package options
%option with_mpm_prefork yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
