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: 14-Jun-2008 09:02:35
Branch: HEAD Handle: 2008061408023401
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 2.2.8 -> 2.2.9
Summary:
Revision Changes Path
1.37 +22 -34 openpkg-src/apache/apache.patch
1.435 +2 -2 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.36 -r1.37 apache.patch
--- openpkg-src/apache/apache.patch 10 Sep 2007 18:20:04 -0000 1.36
+++ openpkg-src/apache/apache.patch 14 Jun 2008 07:02:34 -0000 1.37
@@ -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-09-10 20:17:11 +0200
+--- build/config_vars.sh.in.orig 2008-02-05 00:00:07 +0100
++++ build/config_vars.sh.in 2008-06-13 23:59:56 +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-09-10 20:17:11 +0200
++++ config.layout 2008-06-13 23:59:56 +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-09-04 22:09:24 +0200
-+++ configure 2007-09-10 20:17:11 +0200
-@@ -3355,6 +3355,11 @@
+--- configure.orig 2008-06-10 21:18:00 +0200
++++ configure 2008-06-13 23:59:56 +0200
+@@ -3591,6 +3591,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
-@@ -3710,6 +3715,11 @@
+@@ -3950,6 +3955,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -50,17 +50,17 @@
case ${apr_found}.${apu_found} in
reconfig.yes)
Index: docs/conf/mime.types
---- docs/conf/mime.types.orig 2007-09-01 00:00:42 +0200
-+++ docs/conf/mime.types 2007-09-10 20:18:04 +0200
+--- docs/conf/mime.types.orig 2008-01-02 23:10:01 +0100
++++ docs/conf/mime.types 2008-06-13 23:59:56 +0200
@@ -81,6 +81,7 @@
application/mbms-user-service-description+xml
application/mbox mbox
application/mediaservercontrol+xml mscml
+application/metalink+xml metalink
application/mikey
- application/mp4 mp4s
- application/mpeg4-generic
-@@ -98,6 +99,7 @@
+ application/moss-keys
+ application/moss-signature
+@@ -102,6 +103,7 @@
application/oda oda
application/oebps-package+xml
application/ogg ogg
@@ -68,7 +68,7 @@
application/parityfec
application/pdf pdf
application/pgp-encrypted pgp
-@@ -376,14 +378,25 @@
+@@ -389,14 +391,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
-@@ -438,6 +451,14 @@
+@@ -455,6 +468,14 @@
application/vnd.oasis.opendocument.text-template ott
application/vnd.oasis.opendocument.text-web oth
application/vnd.obn
@@ -111,7 +111,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 2007-09-10 20:17:11 +0200
++++ docs/docroot/index.html 2008-06-13 23:59:56 +0200
@@ -1 +1,7 @@
-<html><body><h1>It works!</h1></body></html>
\ No newline at end of file
@@ -123,9 +123,9 @@
+ </body>
+</html>
Index: modules/generators/mod_autoindex.c
---- modules/generators/mod_autoindex.c.orig 2007-08-30 00:37:26 +0200
-+++ modules/generators/mod_autoindex.c 2007-09-10 20:17:11 +0200
-@@ -1555,17 +1555,17 @@
+--- modules/generators/mod_autoindex.c.orig 2007-12-09 15:46:56 +0100
++++ modules/generators/mod_autoindex.c 2008-06-13 23:59:56 +0200
+@@ -1564,17 +1564,17 @@
++cols;
}
@@ -148,7 +148,7 @@
++cols;
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2007-09-10 20:17:11 +0200
++++ server/Makefile.in 2008-06-13 23:59:56 +0200
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -159,21 +159,9 @@
done; \
for dir in $(EXPORT_DIRS_APR); do \
(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-09-10 20:17:11 +0200
-@@ -131,7 +131,7 @@
-
- /* crap. this isn't crypto quality, but it will be Good Enough */
-
-- get_system_time(&time_now);
-+ time_now = apr_time_now();
- srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
-
- return rand() & 0x0FFFF;
Index: support/Makefile.in
--- support/Makefile.in.orig 2005-07-07 01:15:34 +0200
-+++ support/Makefile.in 2007-09-10 20:17:11 +0200
++++ support/Makefile.in 2008-06-13 23:59:56 +0200
@@ -22,12 +22,6 @@
chmod 755 $(DESTDIR)$(sbindir)/$$i; \
fi ; \
@@ -189,7 +177,7 @@
htpasswd: $(htpasswd_OBJECTS)
Index: support/apachectl.in
--- support/apachectl.in.orig 2006-07-12 05:38:44 +0200
-+++ support/apachectl.in 2007-09-10 20:17:11 +0200
++++ support/apachectl.in 2008-06-13 23:59:56 +0200
@@ -43,11 +43,6 @@
# the path to your httpd binary, including options if necessary
HTTPD='@exp_sbindir@/@progname@'
@@ -204,7 +192,7 @@
# programs may work.
Index: support/apxs.in
--- support/apxs.in.orig 2006-07-12 05:38:44 +0200
-+++ support/apxs.in 2007-09-10 20:17:11 +0200
++++ support/apxs.in 2008-06-13 23:59:56 +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.434 -r1.435 apache.spec
--- openpkg-src/apache/apache.spec 2 Apr 2008 09:50:33 -0000 1.434
+++ openpkg-src/apache/apache.spec 14 Jun 2008 07:02:35 -0000 1.435
@@ -31,8 +31,8 @@
Class: BASE
Group: Web
License: ASF
-Version: 2.2.8
-Release: 20080402
+Version: 2.2.9
+Release: 20080614
# package options
%option with_mpm_prefork yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
