[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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:
RevisionChanges 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 - 1.41
+++ openpkg-src/apache/apache.patch 4 Oct 2009 17:09:19 - 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.layout2009-07-28 19:37:48 +0200
config.layout2009-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
-+++ configure2009-07-28 19:37:49 +0200
-@@ -3597,6 +3597,11 @@
-{ (exit 1); exit 1; }; }
+--- configure.orig 2009-09-24 01:29:56 +0200
configure2009-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.orig2009-07-10 14:30:17 +0200
-+++ docs/conf/mime.types 2009-07-28 19:37:49 +0200
+--- docs/conf/mime.types.orig2009-08-28 16:37:37 +0200
docs/conf/mime.types 2009-10-04 19:02:09 +0200
@@ -98,6 +98,7 @@
application/mboxmbox
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 @@
-It works!
\ No newline at end of file
@@ -89,8 +89,8 @@
+
+
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("", r);
if (autoindex_opts & ICONS_ARE_LINKS) {
-@@ -1763,9 +1770,6 @@
+@@ -1762,9 +1769,6 @@
+ desc_width), NULL);
}
}
+-else {
+-ap_rputs(" ", r);
+-}
}
--else {
--ap_rputs(" ", r);
--}
ap_rputs("\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:
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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:
RevisionChanges 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 - 1.40
+++ openpkg-src/apache/apache.patch 28 Jul 2009 17:44:08 - 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.layout2009-02-01 17:53:32 +0100
config.layout2009-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
-+++ configure2009-02-01 17:53:32 +0100
+--- configure.orig 2009-07-20 22:24:36 +0200
configure2009-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.orig2008-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.orig2009-07-10 14:30:17 +0200
docs/conf/mime.types 2009-07-28 19:37:49 +0200
+@@ -98,6 +98,7 @@
application/mboxmbox
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-excelxls 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.12isldm
-+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.12docm
-+application/vnd.ms-word.template.macroEnabled.12dotm
- 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-templateott
application/vnd.oasis.opendocument.text-web oth
application/vnd.obn
@@ -109,17 +75,9 @@
application/vnd.olpc-sugar xo
application/v
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 01-Feb-2009 20:17:28
Branch: HEAD Handle: 2009020119172700
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
fix autoindex table output and improve output by adding CSS classes
Summary:
RevisionChanges Path
1.40+36 -10 openpkg-src/apache/apache.patch
1.447 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.39 -r1.40 apache.patch
--- openpkg-src/apache/apache.patch 14 Dec 2008 10:07:08 - 1.39
+++ openpkg-src/apache/apache.patch 1 Feb 2009 19:17:27 - 1.40
@@ -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-12-14 11:00:41 +0100
build/config_vars.sh.in 2009-02-01 17:53:32 +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.layout2008-12-14 11:00:41 +0100
config.layout2009-02-01 17:53:32 +0100
@@ -50,7 +50,7 @@
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/htdocs
@@ -24,7 +24,7 @@
runtimedir:${localstatedir}/run
Index: configure
--- configure.orig 2008-12-06 16:17:59 +0100
-+++ configure2008-12-14 11:00:41 +0100
configure2009-02-01 17:53:32 +0100
@@ -3597,6 +3597,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -51,7 +51,7 @@
reconfig.yes)
Index: docs/conf/mime.types
--- docs/conf/mime.types.orig2008-12-01 06:54:25 +0100
-+++ docs/conf/mime.types 2008-12-14 11:01:41 +0100
docs/conf/mime.types 2009-02-01 17:53:32 +0100
@@ -83,6 +83,7 @@
application/mboxmbox
application/media_control+xml
@@ -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-12-14 11:00:41 +0100
docs/docroot/index.html 2009-02-01 17:53:32 +0100
@@ -1 +1,7 @@
-It works!
\ No newline at end of file
@@ -132,7 +132,7 @@
+
Index: modules/generators/mod_autoindex.c
--- 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
modules/generators/mod_autoindex.c 2009-02-01 18:06:21 +0100
@@ -1573,17 +1573,17 @@
++cols;
@@ -154,9 +154,35 @@
emit_link(r, "Size", K_SIZE, keyid, direction,
colargs, static_columns);
++cols;
+@@ -1677,7 +1677,14 @@
+ }
+
+ if (autoindex_opts & TABLE_INDEXING) {
+-ap_rputs("", r);
++char *class;
++if (strcmp(t2, "Parent Directory") == 0)
++class = "updir";
++else if (ar[x]->isdir)
++class = "dir";
++else
++class = "file";
++ap_rvputs(r, "", NULL);
+ if (!(autoindex_opts & SUPPRESS_ICON)) {
+ ap_rputs("", r);
+ if (autoindex_opts & ICONS_ARE_LINKS) {
+@@ -1763,9 +1770,6 @@
+ }
+ }
+ }
+-else {
+-ap_rputs(" ", r);
+-}
+ ap_rputs("\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 2008-12-14 11:00:41 +0100
server/Makefile.in 2009-02-01 17:53:32 +0100
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -169,7 +195,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-12-14 11:00:41 +0100
support/Makefile.in 2009-02-01 17:53:32 +0100
@@ -22,12 +22,6 @@
chmod 755 $(DESTDIR)$(sbindir)/$$i; \
fi ; \
@@ -185,7 +211,7 @@
htpasswd: $(htpasswd_OBJECTS)
Index: support/apachectl.in
--- support/apachectl.in.orig2006-07-12 05:38:44 +0200
-+++ support/apachectl.in 2008-12-14 11:00:41
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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:
RevisionChanges 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 - 1.38
+++ openpkg-src/apache/apache.patch 14 Dec 2008 10:07:08 - 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.layout2008-07-26 20:35:59 +0200
config.layout2008-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
-+++ configure2008-07-26 20:35:59 +0200
-@@ -3591,6 +3591,11 @@
+--- configure.orig 2008-12-06 16:17:59 +0100
configure2008-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.orig2008-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.orig2008-12-01 06:54:25 +0100
docs/conf/mime.types 2008-12-14 11:01:41 +0100
+@@ -83,6 +83,7 @@
application/mboxmbox
+ application/media_control+xml
application/mediaservercontrol+xml mscml
+application/metalink+xmlmetalink
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-excelxls 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-templateott
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 @@
-It works!
\ No newline at end of file
@@ -131,9 +131,9 @@
+
+
In
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 26-Jul-2008 20:38:54
Branch: HEAD Handle: 2008072619385400
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
add out-of-the-box support for downloading Mozilla XPI files (packed
extensions)
Summary:
RevisionChanges Path
1.38+18 -10 openpkg-src/apache/apache.patch
1.436 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.37 -r1.38 apache.patch
--- openpkg-src/apache/apache.patch 14 Jun 2008 07:02:34 - 1.37
+++ openpkg-src/apache/apache.patch 26 Jul 2008 18:38:54 - 1.38
@@ -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-06-13 23:59:56 +0200
build/config_vars.sh.in 2008-07-26 20:35:59 +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.layout2008-06-13 23:59:56 +0200
config.layout2008-07-26 20:35:59 +0200
@@ -50,7 +50,7 @@
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/htdocs
@@ -24,7 +24,7 @@
runtimedir:${localstatedir}/run
Index: configure
--- configure.orig 2008-06-10 21:18:00 +0200
-+++ configure2008-06-13 23:59:56 +0200
configure2008-07-26 20:35:59 +0200
@@ -3591,6 +3591,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -51,7 +51,7 @@
reconfig.yes)
Index: docs/conf/mime.types
--- docs/conf/mime.types.orig2008-01-02 23:10:01 +0100
-+++ docs/conf/mime.types 2008-06-13 23:59:56 +0200
docs/conf/mime.types 2008-07-26 20:36:56 +0200
@@ -81,6 +81,7 @@
application/mbms-user-service-description+xml
application/mboxmbox
@@ -109,9 +109,17 @@
application/vnd.olpc-sugar xo
application/vnd.oma-scws-config
application/vnd.oma-scws-http-request
+@@ -674,6 +695,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 2008-06-13 23:59:56 +0200
docs/docroot/index.html 2008-07-26 20:35:59 +0200
@@ -1 +1,7 @@
-It works!
\ No newline at end of file
@@ -124,7 +132,7 @@
+
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-06-13 23:59:56 +0200
modules/generators/mod_autoindex.c 2008-07-26 20:35:59 +0200
@@ -1564,17 +1564,17 @@
++cols;
@@ -148,7 +156,7 @@
++cols;
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2008-06-13 23:59:56 +0200
server/Makefile.in 2008-07-26 20:35:59 +0200
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -161,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-06-13 23:59:56 +0200
support/Makefile.in 2008-07-26 20:35:59 +0200
@@ -22,12 +22,6 @@
chmod 755 $(DESTDIR)$(sbindir)/$$i; \
fi ; \
@@ -177,7 +185,7 @@
htpasswd: $(htpasswd_OBJECTS)
Index: support/apachectl.in
--- support/apachectl.in.orig2006-07-12 05:38:44 +0200
-+++ support/apachectl.in 2008-06-13 23:59:56 +0200
support/apachectl.in 2008-07-26 20:35:59 +0200
@@ -43,11 +43,6 @@
# the path to your httpd binary, including options if necessary
HTTPD='@exp_sbindir@/@progname@'
@@ -192,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-06-13 23:59:56 +0200
support/apxs.in 2008-07-26 20:35:59 +0200
@@ -190,9 +190,6 @@
my $httpd = get_vars("sbindir") . "/" . get_vars("progname"
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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:
RevisionChanges 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 - 1.36
+++ openpkg-src/apache/apache.patch 14 Jun 2008 07:02:34 - 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.layout2007-09-10 20:17:11 +0200
config.layout2008-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
-+++ configure2007-09-10 20:17:11 +0200
-@@ -3355,6 +3355,11 @@
+--- configure.orig 2008-06-10 21:18:00 +0200
configure2008-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.orig2007-09-01 00:00:42 +0200
-+++ docs/conf/mime.types 2007-09-10 20:18:04 +0200
+--- docs/conf/mime.types.orig2008-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/mboxmbox
application/mediaservercontrol+xml mscml
+application/metalink+xmlmetalink
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-excelxls 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-templateott
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 @@
-It works!
\ No newline at end of file
@@ -123,9 +123,9 @@
+
+
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: se
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 10-Sep-2007 20:20:05
Branch: HEAD Handle: 2007091019200400
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
add Metalink type
Summary:
RevisionChanges Path
1.36+22 -14 openpkg-src/apache/apache.patch
1.427 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.35 -r1.36 apache.patch
--- openpkg-src/apache/apache.patch 7 Sep 2007 08:18:18 - 1.35
+++ openpkg-src/apache/apache.patch 10 Sep 2007 18:20:04 - 1.36
@@ -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-07 10:12:40 +0200
build/config_vars.sh.in 2007-09-10 20:17:11 +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.layout2007-09-07 10:12:40 +0200
config.layout2007-09-10 20:17:11 +0200
@@ -50,7 +50,7 @@
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/htdocs
@@ -24,7 +24,7 @@
runtimedir:${localstatedir}/run
Index: configure
--- configure.orig 2007-09-04 22:09:24 +0200
-+++ configure2007-09-07 10:12:40 +0200
configure2007-09-10 20:17:11 +0200
@@ -3355,6 +3355,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -51,8 +51,16 @@
reconfig.yes)
Index: docs/conf/mime.types
--- docs/conf/mime.types.orig2007-09-01 00:00:42 +0200
-+++ docs/conf/mime.types 2007-09-07 10:14:33 +0200
-@@ -98,6 +98,7 @@
docs/conf/mime.types 2007-09-10 20:18:04 +0200
+@@ -81,6 +81,7 @@
+ application/mbms-user-service-description+xml
+ application/mboxmbox
+ application/mediaservercontrol+xml mscml
++application/metalink+xmlmetalink
+ application/mikey
+ application/mp4 mp4s
+ application/mpeg4-generic
+@@ -98,6 +99,7 @@
application/oda oda
application/oebps-package+xml
application/ogg ogg
@@ -60,7 +68,7 @@
application/parityfec
application/pdf pdf
application/pgp-encrypted pgp
-@@ -376,14 +377,25 @@
+@@ -376,14 +378,25 @@
application/vnd.ms-asf asf
application/vnd.ms-cab-compressed cab
application/vnd.ms-excelxls xlm xla xlc xlt xlw
@@ -86,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 +450,14 @@
+@@ -438,6 +451,14 @@
application/vnd.oasis.opendocument.text-templateott
application/vnd.oasis.opendocument.text-web oth
application/vnd.obn
@@ -103,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-07 10:12:40 +0200
docs/docroot/index.html 2007-09-10 20:17:11 +0200
@@ -1 +1,7 @@
-It works!
\ No newline at end of file
@@ -116,7 +124,7 @@
+
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-07 10:12:40 +0200
modules/generators/mod_autoindex.c 2007-09-10 20:17:11 +0200
@@ -1555,17 +1555,17 @@
++cols;
@@ -140,7 +148,7 @@
++cols;
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2007-09-07 10:12:40 +0200
server/Makefile.in 2007-09-10 20:17:11 +0200
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -153,7 +161,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.orig2006-04-14 20:01:58 +0200
-+++ srclib/apr-util/crypto/getuuid.c 2007-09-07 10:12:40 +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
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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:
RevisionChanges 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 - 1.34
+++ openpkg-src/apache/apache.patch 7 Sep 2007 08:18:18 - 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.layout2007-06-28 22:12:16 +0200
config.layout2007-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
-+++ configure2007-06-28 22:12:16 +0200
-@@ -2711,6 +2711,11 @@
+--- configure.orig 2007-09-04 22:09:24 +0200
configure2007-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.orig2006-01-29 23:34:37.0 +0100
-+++ docs/conf/mime.types 2007-07-19 19:05:56.0 +0200
-@@ -54,6 +54,7 @@
- application/octet-streambin dms lha lzh exe class so dll dmg
- application/oda oda
- application/ogg ogg
+--- docs/conf/mime.types.orig2007-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-excelxls
+ 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-excelxls 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.12isldm
+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.12docm
+application/vnd.ms-
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Jul-2007 19:47:02
Branch: HEAD Handle: 2007071918470100
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
add a bunch of MIME types regarding Microsoft Office 2007. As I wasn't
lucky to find those information at IANA I tried at microsoft.com. The
only source I found was the Japanse TechNet site
(http://www.microsoft.com/japan/technet/prodtechnol/office/ork/library/f88d06fb-c9a4-413c-a1d3-40c97e340c5a.mspx?mfr=true).
So hopefully everything is set up right, at least for my few test
cases it worked correctly.
Summary:
RevisionChanges Path
1.34+42 -3 openpkg-src/apache/apache.patch
1.421 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.33 -r1.34 apache.patch
--- openpkg-src/apache/apache.patch 28 Jun 2007 20:51:37 - 1.33
+++ openpkg-src/apache/apache.patch 19 Jul 2007 17:47:01 - 1.34
@@ -50,9 +50,39 @@
case ${apr_found}.${apu_found} in
reconfig.yes)
Index: docs/conf/mime.types
docs/conf/mime.types.orig2006-01-29 23:34:37 +0100
-+++ docs/conf/mime.types 2007-06-28 22:12:16 +0200
-@@ -265,6 +265,22 @@
+--- docs/conf/mime.types.orig2006-01-29 23:34:37.0 +0100
docs/conf/mime.types 2007-07-19 19:05:56.0 +0200
+@@ -54,6 +54,7 @@
+ application/octet-streambin dms lha lzh exe class so dll dmg
+ application/oda oda
+ 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-excelxls
++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-powerpoint.addin.macroEnabled.12 ppam
++application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptm
++application/vnd.ms-powerpoint.slide.macroEnabled.12isldm
++application/vnd.ms-powerpoint.slideshow.macroEnabled.12 ppsm
++application/vnd.ms-powerpoint.template.macroEnabled.12 potm
+ application/vnd.ms-project
+ application/vnd.ms-tnef
++application/vnd.ms-word.document.macroEnabled.12docm
++application/vnd.ms-word.template.macroEnabled.12dotm
+ 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
@@ -73,8 +103,17 @@
+application/vnd.oasis.opendocument.text-master odm
+application/vnd.oasis.opendocument.text-web oth
application/vnd.obn
++application/vnd.openxmlformats-officedocument.presentationml.presentation
pptx
++application/vnd.openxmlformats-officedocument.presentationml.slide
sldx
++application/vnd.openxmlformats-officedocument.presentationml.slideshow
ppsx
++application/vnd.openxmlformats-officedocument.presentationml.template
potx
++application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
xlsx
++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
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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.420 -r1.421 apache.spec
--- openpkg-src/apache/apache.spec28 Jun 2007 20:51:37 - 1.420
+++ openpkg-src/apache/apache.spec19 Jul 2007 17:47:01 - 1.421
@@ -33,7 +33,7 @@
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 28-Jun-2007 22:51:37
Branch: HEAD Handle: 2007062821513700
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
nuke envvars stuff (we have apache.sh), remove more runtime files and
cleanup packaging in general
Summary:
RevisionChanges Path
1.33+60 -10 openpkg-src/apache/apache.patch
1.420 +11 -13 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.32 -r1.33 apache.patch
--- openpkg-src/apache/apache.patch 23 Jun 2007 09:45:09 - 1.32
+++ openpkg-src/apache/apache.patch 28 Jun 2007 20:51:37 - 1.33
@@ -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-23 11:42:21 +0200
build/config_vars.sh.in 2007-06-28 22:12:16 +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.layout2007-06-23 11:42:21 +0200
config.layout2007-06-28 22:12:16 +0200
@@ -50,7 +50,7 @@
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/htdocs
@@ -24,7 +24,7 @@
runtimedir:${localstatedir}/run
Index: configure
--- configure.orig 2007-01-06 07:40:00 +0100
-+++ configure2007-06-23 11:42:21 +0200
configure2007-06-28 22:12:16 +0200
@@ -2711,6 +2711,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -51,7 +51,7 @@
reconfig.yes)
Index: docs/conf/mime.types
--- docs/conf/mime.types.orig2006-01-29 23:34:37 +0100
-+++ docs/conf/mime.types 2007-06-23 11:42:21 +0200
docs/conf/mime.types 2007-06-28 22:12:16 +0200
@@ -265,6 +265,22 @@
application/vnd.novadigm.edm
application/vnd.novadigm.edx
@@ -77,7 +77,7 @@
application/vnd.palm
Index: docs/docroot/index.html
--- docs/docroot/index.html.orig 2004-11-20 21:16:24 +0100
-+++ docs/docroot/index.html 2007-06-23 11:42:21 +0200
docs/docroot/index.html 2007-06-28 22:12:16 +0200
@@ -1 +1,7 @@
-It works!
\ No newline at end of file
@@ -90,7 +90,7 @@
+
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-23 11:43:20 +0200
modules/generators/mod_autoindex.c 2007-06-28 22:12:16 +0200
@@ -1544,17 +1544,17 @@
++cols;
@@ -114,7 +114,7 @@
++cols;
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2007-06-23 11:42:21 +0200
server/Makefile.in 2007-06-28 22:12:16 +0200
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -127,7 +127,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.orig2006-04-14 20:01:58 +0200
-+++ srclib/apr-util/crypto/getuuid.c 2007-06-23 11:42:21 +0200
srclib/apr-util/crypto/getuuid.c 2007-06-28 22:12:16 +0200
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -137,10 +137,60 @@
srand((unsigned int)(((time_now >> 32) ^ time_now) & 0x));
return rand() & 0x0;
+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
+@@ -22,12 +22,6 @@
+ chmod 755 $(DESTDIR)$(sbindir)/$$i; \
+ fi ; \
+ done
+-@if test -f "$(builddir)/envvars-std"; then \
+-cp -p envvars-std $(DESTDIR)$(sbindir); \
+-if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-fi ; \
+-fi
+
+ htpasswd_OBJECTS = htpasswd.lo
+ htpasswd: $(htpasswd_OBJECTS)
+Index: support/apachectl.in
+--- support/apachectl.in.orig2006-07-12 05:38:44 +0200
support/apachectl.in 2007-06-28 22:15:56 +0200
+@@ -43,11 +43,6 @@
+ # the path to your httpd binary, including options if necessary
+ HTTPD='@exp_sbindir@/@progname@'
+ #
+-# pick up any necessary environment variables
+-if test -f @exp_sbindir@/envvars; then
+
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 22-Jun-2007 18:42:07
Branch: HEAD Handle: 2007062217420700
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
reuse the libtool from APR but post-adjust it for DSO support
Summary:
RevisionChanges Path
1.31+2 -2 openpkg-src/apache/apache.patch
1.412 +4 -3 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.30 -r1.31 apache.patch
--- openpkg-src/apache/apache.patch 22 Jun 2007 15:33:13 - 1.30
+++ openpkg-src/apache/apache.patch 22 Jun 2007 16:42:07 - 1.31
@@ -6,7 +6,7 @@
fi
-APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`"
-+APR_LIBTOOL="@prefix@/bin/libtool"
++APR_LIBTOOL="@prefix@/share/apache/build/libtool"
APR_INCLUDEDIR="`${APR_CONFIG} --includedir`"
APU_INCLUDEDIR="`${APU_CONFIG} --includedir`"
@@ -122,7 +122,7 @@
-my $libtool = `$apr_config --apr-libtool`;
-chomp($libtool);
-+my $libtool = "$prefix/bin/libtool";
++my $libtool = "$prefix/share/apache/build/libtool";
my $apr_includedir = `$apr_config --includes`;
chomp($apr_includedir);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.411 -r1.412 apache.spec
--- openpkg-src/apache/apache.spec22 Jun 2007 16:37:36 - 1.411
+++ openpkg-src/apache/apache.spec22 Jun 2007 16:42:07 - 1.412
@@ -71,8 +71,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, perl, libtool, make
-PreReq: OpenPKG, openpkg >= 20060823, perl, libtool
+BuildPreReq: OpenPKG, openpkg >= 20060823, perl, make
+PreReq: OpenPKG, openpkg >= 20060823, perl
BuildPreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
PreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
%if "%{with_mod_ldap}" == "yes"
@@ -242,8 +242,9 @@
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/sbin/envvars
# adjust GNU libtool configuration
-%{l_shtool} subst \
+%{l_shtool} install -c -m 755 \
-e 's;^build_libtool_libs=no;build_libtool_libs=yes;' \
+%{l_prefix}/share/apr/build-1/libtool \
$RPM_BUILD_ROOT%{l_prefix}/share/apache/build/libtool
# install shell environment script
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 22-Jun-2007 13:59:16
Branch: HEAD Handle: 2007062212591600
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
use a DSO-capable GNU libtool in Apache apxs instead of the
DSO-disabled one from APR
Summary:
RevisionChanges Path
1.28+29 -4 openpkg-src/apache/apache.patch
1.408 +2 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.27 -r1.28 apache.patch
--- openpkg-src/apache/apache.patch 22 Jun 2007 10:54:02 - 1.27
+++ openpkg-src/apache/apache.patch 22 Jun 2007 11:59:16 - 1.28
@@ -1,6 +1,18 @@
+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-22 13:49:29 +0200
+@@ -35,7 +35,7 @@
+[EMAIL PROTECTED]@
+ fi
+
+-APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`"
++APR_LIBTOOL="@prefix@/bin/libtool"
+ APR_INCLUDEDIR="`${APR_CONFIG} --includedir`"
+ APU_INCLUDEDIR="`${APU_CONFIG} --includedir`"
+
Index: configure
--- configure.orig 2007-01-06 07:40:00 +0100
-+++ configure2007-01-10 19:46:27 +0100
configure2007-06-22 13:48:25 +0200
@@ -2711,6 +2711,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -27,7 +39,7 @@
reconfig.yes)
Index: docs/conf/mime.types
--- docs/conf/mime.types.orig2006-01-29 23:34:37 +0100
-+++ docs/conf/mime.types 2007-01-10 19:46:27 +0100
docs/conf/mime.types 2007-06-22 13:48:25 +0200
@@ -265,6 +265,22 @@
application/vnd.novadigm.edm
application/vnd.novadigm.edx
@@ -53,7 +65,7 @@
application/vnd.palm
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2007-01-10 19:46:27 +0100
server/Makefile.in 2007-06-22 13:48:25 +0200
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -66,7 +78,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.orig2006-04-14 20:01:58 +0200
-+++ srclib/apr-util/crypto/getuuid.c 2007-01-10 19:46:27 +0100
srclib/apr-util/crypto/getuuid.c 2007-06-22 13:48:25 +0200
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -76,3 +88,16 @@
srand((unsigned int)(((time_now >> 32) ^ time_now) & 0x));
return rand() & 0x0;
+Index: support/apxs.in
+--- support/apxs.in.orig 2006-07-12 05:38:44 +0200
support/apxs.in 2007-06-22 13:48:25 +0200
+@@ -338,8 +338,7 @@
+ exit(1);
+ }
+
+-my $libtool = `$apr_config --apr-libtool`;
+-chomp($libtool);
++my $libtool = "$prefix/bin/libtool";
+
+ my $apr_includedir = `$apr_config --includes`;
+ chomp($apr_includedir);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.407 -r1.408 apache.spec
--- openpkg-src/apache/apache.spec22 Jun 2007 10:54:02 - 1.407
+++ openpkg-src/apache/apache.spec22 Jun 2007 11:59:16 - 1.408
@@ -72,8 +72,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, perl, make
-PreReq: OpenPKG, openpkg >= 20060823, perl
+BuildPreReq: OpenPKG, openpkg >= 20060823, perl, libtool, make
+PreReq: OpenPKG, openpkg >= 20060823, perl, libtool
BuildPreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
PreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
%if "%{with_mod_ldap}" == "yes"
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 15-Apr-2007 18:13:06
Branch: HEAD Handle: 2007041517130500
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
allow a reasonably sized (128KB instead of just 8KB lines)
AuthGroupFile, please
Summary:
RevisionChanges Path
1.26+25 -0 openpkg-src/apache/apache.patch
1.397 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.25 -r1.26 apache.patch
--- openpkg-src/apache/apache.patch 2 Apr 2007 15:07:30 - 1.25
+++ openpkg-src/apache/apache.patch 15 Apr 2007 16:13:05 - 1.26
@@ -126,3 +126,28 @@
typedef struct {
AP_LONG digest[5]; /* message digest */
+Index: apache_1.3.37/src/modules/standard/mod_auth.c
+--- apache_1.3.37/src/modules/standard/mod_auth.c.orig 2006-07-12
10:16:05 +0200
apache_1.3.37/src/modules/standard/mod_auth.c2007-04-15 18:08:53
+0200
+@@ -107,7 +107,7 @@
+ configfile_t *f;
+ table *grps = ap_make_table(p, 15);
+ pool *sp;
+-char l[MAX_STRING_LEN];
++char *l;
+ const char *group_name, *ll, *w;
+
+ if (!(f = ap_pcfg_openfile(p, grpfile))) {
+@@ -116,9 +116,11 @@
+ return NULL;
+ }
+
++if ((l = (char *)ap_palloc(p, 128*1024)) == NULL)
++return NULL;
+ sp = ap_make_sub_pool(p);
+
+-while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
++while (!(ap_cfg_getline(l, 128*1024, f))) {
+ if ((l[0] == '#') || (!l[0]))
+ continue;
+ ll = l;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.396 -r1.397 apache.spec
--- openpkg-src/apache/apache.spec13 Apr 2007 14:18:06 - 1.396
+++ openpkg-src/apache/apache.spec15 Apr 2007 16:13:05 - 1.397
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070413
+Release: 20070415
# package options (Apache core related)
%option with_hard_server_limit256
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 02-Apr-2007 17:07:30
Branch: HEAD Handle: 2007040216073000
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
fix SHA1 function under AMD64 (where "sizeof(unsigned long) == 8") by
using "unsigned int" in the same brain-dead and still partly broken
way (as "sizeof(unsigned int) == 4" cannot be assumed in general) as
the MD5 function in the Apache source. KEEP IN MIND THAT THIS IS STILL
UGLY, BUT AT LEAST SLIGHTLY BETTER AND AT LEAST AS BRAIN-DEAD AS THE
EXISTING MD5 CODE.
Summary:
RevisionChanges Path
1.25+12 -0 openpkg-src/apache/apache.patch
1.391 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.24 -r1.25 apache.patch
--- openpkg-src/apache/apache.patch 10 Sep 2006 13:20:33 - 1.24
+++ openpkg-src/apache/apache.patch 2 Apr 2007 15:07:30 - 1.25
@@ -114,3 +114,15 @@
if (!(env_path = ap_pstrdup(r->pool, getenv("PATH" {
env_path = DEFAULT_PATH;
}
+Index: apache_1.3.37/src/include/ap_sha1.h
+--- apache_1.3.37/src/include/ap_sha1.h.orig 2007-04-02 16:48:10 +0200
apache_1.3.37/src/include/ap_sha1.h 2007-04-02 16:56:23 +0200
+@@ -38,7 +38,7 @@
+ #define AP_SHA1PW_ID "{SHA}"
+ #define AP_SHA1PW_IDLEN 5
+
+-typedef unsigned long AP_LONG; /* a 32-bit quantity */
++typedef unsigned int AP_LONG; /* a 32-bit quantity */
+
+ typedef struct {
+ AP_LONG digest[5]; /* message digest */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.390 -r1.391 apache.spec
--- openpkg-src/apache/apache.spec30 Mar 2007 16:55:37 - 1.390
+++ openpkg-src/apache/apache.spec2 Apr 2007 15:07:30 - 1.391
@@ -68,7 +68,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20070330
+Release: 20070402
# package options (suexec related)
%option with_suexec yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 10-Sep-2006 15:20:34
Branch: HEAD Handle: 2006091014203301
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
now that the OpenDocument stuff is officially registered at IANA (see
http://www.iana.org/assignments/media-types/application/), add the
MIME types to Apache's mime.types database
Summary:
RevisionChanges Path
1.24+29 -3 openpkg-src/apache/apache.patch
1.350 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.23 -r1.24 apache.patch
--- openpkg-src/apache/apache.patch 28 Jul 2006 06:09:19 - 1.23
+++ openpkg-src/apache/apache.patch 10 Sep 2006 13:20:33 - 1.24
@@ -1,6 +1,32 @@
+Index: apache_1.3.37/conf/mime.types
+--- apache_1.3.37/conf/mime.types.orig 2004-11-24 20:10:19 +0100
apache_1.3.37/conf/mime.types2006-09-10 14:51:11 +0200
+@@ -265,6 +265,22 @@
+ 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.obn
+ application/vnd.osa.netdeploy
+ application/vnd.palm
Index: apache_1.3.37/configure
--- apache_1.3.37/configure.orig 2006-07-12 10:16:05 +0200
-+++ apache_1.3.37/configure 2006-07-28 08:07:56 +0200
apache_1.3.37/configure 2006-09-10 14:49:50 +0200
@@ -1175,10 +1175,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
@@ -18,7 +44,7 @@
## check and debug
Index: apache_1.3.37/src/Configure
--- apache_1.3.37/src/Configure.orig 2006-07-12 10:16:05 +0200
-+++ apache_1.3.37/src/Configure 2006-07-28 08:07:56 +0200
apache_1.3.37/src/Configure 2006-09-10 14:49:50 +0200
@@ -1158,14 +1158,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
@@ -79,7 +105,7 @@
Index: apache_1.3.37/src/main/util_script.c
--- apache_1.3.37/src/main/util_script.c.orig2006-07-12 10:16:05
+0200
-+++ apache_1.3.37/src/main/util_script.c 2006-07-28 08:07:56 +0200
apache_1.3.37/src/main/util_script.c 2006-09-10 14:49:50 +0200
@@ -204,6 +204,7 @@
}
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.349 -r1.350 apache.spec
--- openpkg-src/apache/apache.spec9 Sep 2006 07:44:20 - 1.349
+++ openpkg-src/apache/apache.spec10 Sep 2006 13:20:34 - 1.350
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060909
+Release: 20060910
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 28-Jul-2006 08:09:20
Branch: HEAD Handle: 2006072807091900
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 1.3.36 -> 1.3.37
Summary:
RevisionChanges Path
1.23+13 -13 openpkg-src/apache/apache.patch
1.340 +2 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.22 -r1.23 apache.patch
--- openpkg-src/apache/apache.patch 17 May 2006 19:44:32 - 1.22
+++ openpkg-src/apache/apache.patch 28 Jul 2006 06:09:19 - 1.23
@@ -1,7 +1,7 @@
-Index: apache_1.3.36/configure
apache_1.3.36/configure.orig 2006-04-21 20:40:11 +0200
-+++ apache_1.3.36/configure 2006-04-30 19:30:09 +0200
-@@ -1174,10 +1174,10 @@
+Index: apache_1.3.37/configure
+--- apache_1.3.37/configure.orig 2006-07-12 10:16:05 +0200
apache_1.3.37/configure 2006-07-28 08:07:56 +0200
+@@ -1175,10 +1175,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
##
@@ -16,10 +16,10 @@
##
## check and debug
-Index: apache_1.3.36/src/Configure
apache_1.3.36/src/Configure.orig 2005-10-14 01:36:04 +0200
-+++ apache_1.3.36/src/Configure 2006-04-30 19:30:09 +0200
-@@ -1157,14 +1157,20 @@
+Index: apache_1.3.37/src/Configure
+--- apache_1.3.37/src/Configure.orig 2006-07-12 10:16:05 +0200
apache_1.3.37/src/Configure 2006-07-28 08:07:56 +0200
+@@ -1158,14 +1158,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
*-solaris2*)
@@ -46,7 +46,7 @@
SHLIB_SUFFIX_DEPTH=1
;;
*-sunos4*)
-@@ -1873,27 +1879,12 @@
+@@ -1874,27 +1880,12 @@
# set the default, based on whether expat-lite is bundled. if it is present,
# then we can always include expat.
if [ "x$RULE_EXPAT" = "xdefault" ]; then
@@ -77,10 +77,10 @@
fi
-Index: apache_1.3.36/src/main/util_script.c
apache_1.3.36/src/main/util_script.c.orig2006-04-21 20:40:11
+0200
-+++ apache_1.3.36/src/main/util_script.c 2006-04-30 19:30:09 +0200
-@@ -203,6 +203,7 @@
+Index: apache_1.3.37/src/main/util_script.c
+--- apache_1.3.37/src/main/util_script.c.orig2006-07-12 10:16:05
+0200
apache_1.3.37/src/main/util_script.c 2006-07-28 08:07:56 +0200
+@@ -204,6 +204,7 @@
}
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.339 -r1.340 apache.spec
--- openpkg-src/apache/apache.spec20 Jul 2006 15:08:50 - 1.339
+++ openpkg-src/apache/apache.spec28 Jul 2006 06:09:19 - 1.340
@@ -32,7 +32,7 @@
## go with the macro mechanism. But do not try to repeat this!
# package component versions
-%define V_apache 1.3.36
+%define V_apache 1.3.37
%define V_mod_ssl2.8.27-1.3.36
%define V_mod_perl 1.29
%define V_mod_php5.1.4
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060720
+Release: 20060728
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 17-May-2006 21:44:33
Branch: HEAD Handle: 2006051720443200
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 1.3.35 -> 1.3.36
Summary:
RevisionChanges Path
1.22+9 -9 openpkg-src/apache/apache.patch
1.330 +3 -3 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.21 -r1.22 apache.patch
--- openpkg-src/apache/apache.patch 30 Apr 2006 17:36:04 - 1.21
+++ openpkg-src/apache/apache.patch 17 May 2006 19:44:32 - 1.22
@@ -1,6 +1,6 @@
-Index: apache_1.3.35/configure
apache_1.3.35/configure.orig 2006-04-21 20:40:11 +0200
-+++ apache_1.3.35/configure 2006-04-30 19:30:09 +0200
+Index: apache_1.3.36/configure
+--- apache_1.3.36/configure.orig 2006-04-21 20:40:11 +0200
apache_1.3.36/configure 2006-04-30 19:30:09 +0200
@@ -1174,10 +1174,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
@@ -16,9 +16,9 @@
##
## check and debug
-Index: apache_1.3.35/src/Configure
apache_1.3.35/src/Configure.orig 2005-10-14 01:36:04 +0200
-+++ apache_1.3.35/src/Configure 2006-04-30 19:30:09 +0200
+Index: apache_1.3.36/src/Configure
+--- apache_1.3.36/src/Configure.orig 2005-10-14 01:36:04 +0200
apache_1.3.36/src/Configure 2006-04-30 19:30:09 +0200
@@ -1157,14 +1157,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
@@ -77,9 +77,9 @@
fi
-Index: apache_1.3.35/src/main/util_script.c
apache_1.3.35/src/main/util_script.c.orig2006-04-21 20:40:11
+0200
-+++ apache_1.3.35/src/main/util_script.c 2006-04-30 19:30:09 +0200
+Index: apache_1.3.36/src/main/util_script.c
+--- apache_1.3.36/src/main/util_script.c.orig2006-04-21 20:40:11
+0200
apache_1.3.36/src/main/util_script.c 2006-04-30 19:30:09 +0200
@@ -203,6 +203,7 @@
}
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.329 -r1.330 apache.spec
--- openpkg-src/apache/apache.spec15 May 2006 20:04:22 - 1.329
+++ openpkg-src/apache/apache.spec17 May 2006 19:44:32 - 1.330
@@ -32,8 +32,8 @@
## go with the macro mechanism. But do not try to repeat this!
# package component versions
-%define V_apache 1.3.35
-%define V_mod_ssl2.8.26-1.3.35
+%define V_apache 1.3.36
+%define V_mod_ssl2.8.27-1.3.36
%define V_mod_perl 1.29
%define V_mod_php4.4.2
%define V_mod_php_hardened 4.4.2-0.4.11
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060515
+Release: 20060517
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 30-Apr-2006 19:36:05
Branch: HEAD Handle: 2006043018360400
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 1.3.34 -> 1.3.35
Summary:
RevisionChanges Path
1.21+9 -50 openpkg-src/apache/apache.patch
1.324 +2 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.20 -r1.21 apache.patch
--- openpkg-src/apache/apache.patch 14 Dec 2005 20:11:02 - 1.20
+++ openpkg-src/apache/apache.patch 30 Apr 2006 17:36:04 - 1.21
@@ -1,6 +1,6 @@
-Index: apache_1.3.34/configure
apache_1.3.34/configure.orig 2004-02-20 23:40:50 +0100
-+++ apache_1.3.34/configure 2004-10-22 11:53:40 +0200
+Index: apache_1.3.35/configure
+--- apache_1.3.35/configure.orig 2006-04-21 20:40:11 +0200
apache_1.3.35/configure 2006-04-30 19:30:09 +0200
@@ -1174,10 +1174,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
@@ -16,9 +16,9 @@
##
## check and debug
-Index: apache_1.3.34/src/Configure
apache_1.3.34/src/Configure.orig 2004-09-16 01:45:17 +0200
-+++ apache_1.3.34/src/Configure 2004-10-22 11:53:40 +0200
+Index: apache_1.3.35/src/Configure
+--- apache_1.3.35/src/Configure.orig 2005-10-14 01:36:04 +0200
apache_1.3.35/src/Configure 2006-04-30 19:30:09 +0200
@@ -1157,14 +1157,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
@@ -77,9 +77,9 @@
fi
-Index: apache_1.3.34/src/main/util_script.c
apache_1.3.34/src/main/util_script.c.orig2004-02-16 23:29:33
+0100
-+++ apache_1.3.34/src/main/util_script.c 2004-10-22 11:53:40 +0200
+Index: apache_1.3.35/src/main/util_script.c
+--- apache_1.3.35/src/main/util_script.c.orig2006-04-21 20:40:11
+0200
apache_1.3.35/src/main/util_script.c 2006-04-30 19:30:09 +0200
@@ -203,6 +203,7 @@
}
}
@@ -88,44 +88,3 @@
if (!(env_path = ap_pstrdup(r->pool, getenv("PATH" {
env_path = DEFAULT_PATH;
}
-
--
-
-Security Fix (CVE-2005-3352)
-
-Index: apache_1.3.34/src/main/util.c
apache_1.3.34/src/main/util.c.orig 2004-11-24 20:10:19 +0100
-+++ apache_1.3.34/src/main/util.c2005-12-14 21:06:57 +0100
-@@ -1722,6 +1722,8 @@
- j += 3;
- else if (s[i] == '&')
- j += 4;
-+else if (s[i] == '"')
-+j += 5;
-
- if (j == 0)
- return ap_pstrndup(p, s, i);
-@@ -1740,6 +1742,10 @@
- memcpy(&x[j], "&", 5);
- j += 4;
- }
-+else if (s[i] == '"') {
-+memcpy(&x[j], """, 6);
-+j += 5;
-+}
- else
- x[j] = s[i];
-
-Index: apache_1.3.34/src/modules/standard/mod_imap.c
apache_1.3.34/src/modules/standard/mod_imap.c.orig 2004-11-24
20:10:19 +0100
-+++ apache_1.3.34/src/modules/standard/mod_imap.c2005-12-14 21:06:57
+0100
-@@ -328,7 +328,7 @@
- if (!strcasecmp(value, "referer")) {
- referer = ap_table_get(r->headers_in, "Referer");
- if (referer && *referer) {
--return ap_pstrdup(r->pool, referer);
-+return ap_escape_html(r->pool, referer);
- }
- else {
- /* XXX: This used to do *value = '\0'; ... which is totally bogus
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.323 -r1.324 apache.spec
--- openpkg-src/apache/apache.spec21 Apr 2006 07:08:14 - 1.323
+++ openpkg-src/apache/apache.spec30 Apr 2006 17:36:04 - 1.324
@@ -32,7 +32,7 @@
## go with the macro mechanism. But do not try to repeat this!
# package component versions
-%define V_apache 1.3.34
+%define V_apache 1.3.35
%define V_mod_ssl2.8.25-1.3.34
%define V_mod_perl 1.29
%define V_mod_php4.4.2
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060421
+Release: 20060430
# package options (suexec related)
%option
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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-Dec-2005 21:11:04
Branch: HEAD Handle: 2005121420110200
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
Security Fix (CVE-2005-3352)
Summary:
RevisionChanges Path
1.20+41 -0 openpkg-src/apache/apache.patch
1.318 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.19 -r1.20 apache.patch
--- openpkg-src/apache/apache.patch 18 Oct 2005 06:46:26 - 1.19
+++ openpkg-src/apache/apache.patch 14 Dec 2005 20:11:02 - 1.20
@@ -88,3 +88,44 @@
if (!(env_path = ap_pstrdup(r->pool, getenv("PATH" {
env_path = DEFAULT_PATH;
}
+
+-
+
+Security Fix (CVE-2005-3352)
+
+Index: apache_1.3.34/src/main/util.c
+--- apache_1.3.34/src/main/util.c.orig 2004-11-24 20:10:19 +0100
apache_1.3.34/src/main/util.c2005-12-14 21:06:57 +0100
+@@ -1722,6 +1722,8 @@
+ j += 3;
+ else if (s[i] == '&')
+ j += 4;
++else if (s[i] == '"')
++j += 5;
+
+ if (j == 0)
+ return ap_pstrndup(p, s, i);
+@@ -1740,6 +1742,10 @@
+ memcpy(&x[j], "&", 5);
+ j += 4;
+ }
++else if (s[i] == '"') {
++memcpy(&x[j], """, 6);
++j += 5;
++}
+ else
+ x[j] = s[i];
+
+Index: apache_1.3.34/src/modules/standard/mod_imap.c
+--- apache_1.3.34/src/modules/standard/mod_imap.c.orig 2004-11-24
20:10:19 +0100
apache_1.3.34/src/modules/standard/mod_imap.c2005-12-14 21:06:57
+0100
+@@ -328,7 +328,7 @@
+ if (!strcasecmp(value, "referer")) {
+ referer = ap_table_get(r->headers_in, "Referer");
+ if (referer && *referer) {
+-return ap_pstrdup(r->pool, referer);
++return ap_escape_html(r->pool, referer);
+ }
+ else {
+ /* XXX: This used to do *value = '\0'; ... which is totally bogus
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.317 -r1.318 apache.spec
--- openpkg-src/apache/apache.spec5 Dec 2005 18:52:54 - 1.317
+++ openpkg-src/apache/apache.spec14 Dec 2005 20:11:02 - 1.318
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051205
+Release: 20051214
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
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: 18-Oct-2005 08:46:27
Branch: HEAD Handle: 2005101807462600
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 1.3.33 -> 1.3.34
Summary:
RevisionChanges Path
1.19+9 -9 openpkg-src/apache/apache.patch
1.309 +3 -3 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.18 -r1.19 apache.patch
--- openpkg-src/apache/apache.patch 29 Oct 2004 10:30:05 - 1.18
+++ openpkg-src/apache/apache.patch 18 Oct 2005 06:46:26 - 1.19
@@ -1,6 +1,6 @@
-Index: apache_1.3.33/configure
apache_1.3.33/configure.orig 2004-02-20 23:40:50 +0100
-+++ apache_1.3.33/configure 2004-10-22 11:53:40 +0200
+Index: apache_1.3.34/configure
+--- apache_1.3.34/configure.orig 2004-02-20 23:40:50 +0100
apache_1.3.34/configure 2004-10-22 11:53:40 +0200
@@ -1174,10 +1174,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
@@ -16,9 +16,9 @@
##
## check and debug
-Index: apache_1.3.33/src/Configure
apache_1.3.33/src/Configure.orig 2004-09-16 01:45:17 +0200
-+++ apache_1.3.33/src/Configure 2004-10-22 11:53:40 +0200
+Index: apache_1.3.34/src/Configure
+--- apache_1.3.34/src/Configure.orig 2004-09-16 01:45:17 +0200
apache_1.3.34/src/Configure 2004-10-22 11:53:40 +0200
@@ -1157,14 +1157,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
@@ -77,9 +77,9 @@
fi
-Index: apache_1.3.33/src/main/util_script.c
apache_1.3.33/src/main/util_script.c.orig2004-02-16 23:29:33
+0100
-+++ apache_1.3.33/src/main/util_script.c 2004-10-22 11:53:40 +0200
+Index: apache_1.3.34/src/main/util_script.c
+--- apache_1.3.34/src/main/util_script.c.orig2004-02-16 23:29:33
+0100
apache_1.3.34/src/main/util_script.c 2004-10-22 11:53:40 +0200
@@ -203,6 +203,7 @@
}
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.308 -r1.309 apache.spec
--- openpkg-src/apache/apache.spec9 Oct 2005 06:51:18 - 1.308
+++ openpkg-src/apache/apache.spec18 Oct 2005 06:46:26 - 1.309
@@ -32,8 +32,8 @@
## go with the macro mechanism. But do not try to repeat this!
# package component versions
-%define V_apache 1.3.33
-%define V_mod_ssl2.8.24-1.3.33
+%define V_apache 1.3.34
+%define V_mod_ssl2.8.25-1.3.34
%define V_mod_perl 1.29
%define V_mod_php4.4.0
%define V_mod_php_hardened 4.3.11-0.2.7
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20051009
+Release: 20051018
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Oct-2004 12:30:06
Branch: HEAD Handle: 2004102911300500
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 1.3.32 -> 1.3.33
Summary:
RevisionChanges Path
1.18+9 -9 openpkg-src/apache/apache.patch
1.270 +2 -2 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.17 -r1.18 apache.patch
--- openpkg-src/apache/apache.patch 22 Oct 2004 09:55:44 - 1.17
+++ openpkg-src/apache/apache.patch 29 Oct 2004 10:30:05 - 1.18
@@ -1,6 +1,6 @@
-Index: apache_1.3.32/configure
apache_1.3.32/configure.orig 2004-02-20 23:40:50 +0100
-+++ apache_1.3.32/configure 2004-10-22 11:53:40 +0200
+Index: apache_1.3.33/configure
+--- apache_1.3.33/configure.orig 2004-02-20 23:40:50 +0100
apache_1.3.33/configure 2004-10-22 11:53:40 +0200
@@ -1174,10 +1174,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
@@ -16,9 +16,9 @@
##
## check and debug
-Index: apache_1.3.32/src/Configure
apache_1.3.32/src/Configure.orig 2004-09-16 01:45:17 +0200
-+++ apache_1.3.32/src/Configure 2004-10-22 11:53:40 +0200
+Index: apache_1.3.33/src/Configure
+--- apache_1.3.33/src/Configure.orig 2004-09-16 01:45:17 +0200
apache_1.3.33/src/Configure 2004-10-22 11:53:40 +0200
@@ -1157,14 +1157,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
@@ -77,9 +77,9 @@
fi
-Index: apache_1.3.32/src/main/util_script.c
apache_1.3.32/src/main/util_script.c.orig2004-02-16 23:29:33 +0100
-+++ apache_1.3.32/src/main/util_script.c 2004-10-22 11:53:40 +0200
+Index: apache_1.3.33/src/main/util_script.c
+--- apache_1.3.33/src/main/util_script.c.orig2004-02-16 23:29:33 +0100
apache_1.3.33/src/main/util_script.c 2004-10-22 11:53:40 +0200
@@ -203,6 +203,7 @@
}
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.269 -r1.270 apache.spec
--- openpkg-src/apache/apache.spec28 Oct 2004 15:03:27 - 1.269
+++ openpkg-src/apache/apache.spec29 Oct 2004 10:30:05 - 1.270
@@ -33,7 +33,7 @@
## go with the macro mechanism. But do not try to repeat this!
# package component versions
-%define V_apache 1.3.32
+%define V_apache 1.3.33
%define V_mod_ssl2.8.21-1.3.32
%define V_mod_perl 1.29
%define V_mod_php4.3.9
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20041028
+Release: 20041029
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Oct-2004 11:55:45
Branch: HEAD Handle: 2004102210554400
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
simplify packaging again by recreating the patch against the new
apache source dir and this way also merging together the two patches
against src/Configure
Summary:
RevisionChanges Path
1.17+20 -21 openpkg-src/apache/apache.patch
1.265 +1 -3 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.16 -r1.17 apache.patch
--- openpkg-src/apache/apache.patch 22 Oct 2004 09:04:45 - 1.16
+++ openpkg-src/apache/apache.patch 22 Oct 2004 09:55:44 - 1.17
@@ -1,6 +1,7 @@
apache_1.3.31/configure.orig Tue May 21 14:24:59 2002
-+++ apache_1.3.31/configure Mon Feb 10 11:08:40 2003
-@@ -1216,10 +1216,10 @@
+Index: apache_1.3.32/configure
+--- apache_1.3.32/configure.orig 2004-02-20 23:40:50 +0100
apache_1.3.32/configure 2004-10-22 11:53:40 +0200
+@@ -1174,10 +1174,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
##
@@ -15,9 +16,10 @@
##
## check and debug
apache_1.3.31/src/Configure.dist 2003-06-11 11:59:51.0 +0200
-+++ apache_1.3.31/src/Configure 2003-06-11 12:46:14.0 +0200
-@@ -1190,14 +1190,20 @@
+Index: apache_1.3.32/src/Configure
+--- apache_1.3.32/src/Configure.orig 2004-09-16 01:45:17 +0200
apache_1.3.32/src/Configure 2004-10-22 11:53:40 +0200
+@@ -1157,14 +1157,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
*-solaris2*)
@@ -44,21 +46,7 @@
SHLIB_SUFFIX_DEPTH=1
;;
*-sunos4*)
apache_1.3.31/src/main/util_script.c.origMon Jul 28 17:13:56 2003
-+++ apache_1.3.31/src/main/util_script.c Tue Jul 29 15:55:27 2003
-@@ -246,6 +246,7 @@
- }
- }
-
-+if (!(env_path = ap_pstrdup(r->pool, ap_table_get(r->subprocess_env, "PATH"
- if (!(env_path = ap_pstrdup(r->pool, getenv("PATH" {
- env_path = DEFAULT_PATH;
- }
-
-Index: apache_1.3.31/src/Configure
apache_1.3.31/src/Configure.orig 2004-07-26 14:20:53 +0200
-+++ apache_1.3.31/src/Configure 2004-07-26 14:41:24 +0200
-@@ -1867,27 +1867,12 @@
+@@ -1873,27 +1879,12 @@
# set the default, based on whether expat-lite is bundled. if it is present,
# then we can always include expat.
if [ "x$RULE_EXPAT" = "xdefault" ]; then
@@ -89,3 +77,14 @@
fi
+Index: apache_1.3.32/src/main/util_script.c
+--- apache_1.3.32/src/main/util_script.c.orig2004-02-16 23:29:33 +0100
apache_1.3.32/src/main/util_script.c 2004-10-22 11:53:40 +0200
+@@ -203,6 +203,7 @@
+ }
+ }
+
++if (!(env_path = ap_pstrdup(r->pool, ap_table_get(r->subprocess_env, "PATH"
+ if (!(env_path = ap_pstrdup(r->pool, getenv("PATH" {
+ env_path = DEFAULT_PATH;
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.264 -r1.265 apache.spec
--- openpkg-src/apache/apache.spec22 Oct 2004 09:04:45 - 1.264
+++ openpkg-src/apache/apache.spec22 Oct 2004 09:55:44 - 1.265
@@ -487,9 +487,7 @@
%prep
# unpack Apache distribution
%setup -q -c
-cd apache_%{V_apache}
-%patch -p1
-cd ..
+%patch -p0
%{l_shtool} subst \
-e 's;"Unix";"%{l_openpkg_release -F "OpenPKG/%%s"}";g' \
apache_%{V_apache}/src/os/unix/os.h
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Herbert Schmid
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Oct-2004 11:04:46
Branch: HEAD Handle: 2004102210044500
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 1.3.31 -> 1.3.32
Summary:
RevisionChanges Path
1.16+0 -24 openpkg-src/apache/apache.patch
1.264 +5 -3 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.15 -r1.16 apache.patch
--- openpkg-src/apache/apache.patch 26 Jul 2004 13:06:36 - 1.15
+++ openpkg-src/apache/apache.patch 22 Oct 2004 09:04:45 - 1.16
@@ -55,30 +55,6 @@
env_path = DEFAULT_PATH;
}
-===
-SA-2004.029-apache CAN-2004-0492
-
-RCS file: /home/cvspublic/apache-1.3/src/modules/proxy/proxy_http.c,v
-retrieving revision 1.106
-retrieving revision 1.107
-diff -u -r1.106 -r1.107
apache_1.3.31/src/modules/proxy/proxy_http.c 2004/03/29 17:47:15 1.106
-+++ apache_1.3.31/src/modules/proxy/proxy_http.c 2004/06/11 07:54:38 1.107
-@@ -485,6 +485,13 @@
- content_length = ap_table_get(resp_hdrs, "Content-Length");
- if (content_length != NULL) {
- c->len = ap_strtol(content_length, NULL, 10);
-+
-+if (c->len < 0) {
-+ap_kill_timeout(r);
-+return ap_proxyerror(r, HTTP_BAD_GATEWAY, ap_pstrcat(r->pool,
-+ "Invalid Content-Length from remote server",
-+ NULL));
-+}
- }
-
- }
-
Index: apache_1.3.31/src/Configure
--- apache_1.3.31/src/Configure.orig 2004-07-26 14:20:53 +0200
+++ apache_1.3.31/src/Configure 2004-07-26 14:41:24 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.263 -r1.264 apache.spec
--- openpkg-src/apache/apache.spec15 Oct 2004 13:43:35 - 1.263
+++ openpkg-src/apache/apache.spec22 Oct 2004 09:04:45 - 1.264
@@ -33,7 +33,7 @@
## go with the macro mechanism. But do not try to repeat this!
# package component versions
-%define V_apache 1.3.31
+%define V_apache 1.3.32
%define V_mod_ssl2.8.20-1.3.31
%define V_mod_perl 1.29
%define V_mod_php4.3.9
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20041015
+Release: 20041022
# package options (suexec related)
%option with_suexec yes
@@ -487,7 +487,9 @@
%prep
# unpack Apache distribution
%setup -q -c
-%patch -p0
+cd apache_%{V_apache}
+%patch -p1
+cd ..
%{l_shtool} subst \
-e 's;"Unix";"%{l_openpkg_release -F "OpenPKG/%%s"}";g' \
apache_%{V_apache}/src/os/unix/os.h
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Jul-2004 15:06:37
Branch: HEAD Handle: 2004072614063600
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
fix use-external-Expat patch
Summary:
RevisionChanges Path
1.15+13 -4 openpkg-src/apache/apache.patch
1.250 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.14 -r1.15 apache.patch
--- openpkg-src/apache/apache.patch 7 Jul 2004 09:31:13 - 1.14
+++ openpkg-src/apache/apache.patch 26 Jul 2004 13:06:36 - 1.15
@@ -79,10 +79,19 @@
}
-Index: Configure
apache_1.3.31/src/Configure.orig 2004-04-09 19:01:50 +0200
-+++ apache_1.3.31/src/Configure 2004-07-06 22:05:44 +0200
-@@ -1869,19 +1875,8 @@
+Index: apache_1.3.31/src/Configure
+--- apache_1.3.31/src/Configure.orig 2004-07-26 14:20:53 +0200
apache_1.3.31/src/Configure 2004-07-26 14:41:24 +0200
+@@ -1867,27 +1867,12 @@
+ # set the default, based on whether expat-lite is bundled. if it is present,
+ # then we can always include expat.
+ if [ "x$RULE_EXPAT" = "xdefault" ]; then
+-if [ -d ./lib/expat-lite/ ]; then
+-RULE_EXPAT=yes
+-else
+-RULE_EXPAT=no
+-fi
++RULE_EXPAT=no
fi
if [ "x$RULE_EXPAT" = "xyes" ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.249 -r1.250 apache.spec
--- openpkg-src/apache/apache.spec25 Jul 2004 09:49:12 - 1.249
+++ openpkg-src/apache/apache.spec26 Jul 2004 13:06:36 - 1.250
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040725
+Release: 20040726
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jul-2004 11:31:14
Branch: HEAD Handle: 2004070710311301
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
force apache to use OpenPKG expat because mod_dav and mod_php_xml do
it already and suffer from symbol conflicts with apache internal
expat-lite
Summary:
RevisionChanges Path
1.14+25 -0 openpkg-src/apache/apache.patch
1.242 +2 -4 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.13 -r1.14 apache.patch
--- openpkg-src/apache/apache.patch 11 Jun 2004 14:42:25 - 1.13
+++ openpkg-src/apache/apache.patch 7 Jul 2004 09:31:13 - 1.14
@@ -79,3 +79,28 @@
}
+Index: Configure
+--- apache_1.3.31/src/Configure.orig 2004-04-09 19:01:50 +0200
apache_1.3.31/src/Configure 2004-07-06 22:05:44 +0200
+@@ -1869,19 +1875,8 @@
+ fi
+
+ if [ "x$RULE_EXPAT" = "xyes" ]; then
+-if ./helpers/TestCompile lib expat; then
+-echo " + using system Expat"
+-LIBS="$LIBS -lexpat"
+-else
+-if [ ! -d ./lib/expat-lite/ ]; then
+-echo "ERROR: RULE_EXPAT set to \"yes\" but is not available."
+-exit 1
+-fi
+-echo " + using builtin Expat"
+-EXPATLIB="lib/expat-lite/libexpat.a"
+-APLIBDIRS="expat-lite $APLIBDIRS"
+-CFLAGS="$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat-lite"
+-fi
++echo " + using system Expat"
++LIBS="$LIBS -lexpat"
+ fi
+
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.241 -r1.242 apache.spec
--- openpkg-src/apache/apache.spec28 Jun 2004 08:30:55 - 1.241
+++ openpkg-src/apache/apache.spec7 Jul 2004 09:31:14 - 1.242
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040628
+Release: 20040707
# package options (suexec related)
%option with_suexec yes
@@ -1106,10 +1106,8 @@
%endif
%if "%{with_mod_dav}" == "yes"
--activate-module=src/modules/dav/libdav.a \
- --enable-rule=EXPAT \
-%else
- --disable-rule=EXPAT \
%endif
+ --disable-rule=EXPAT \
%if "%{with_shared_core}" == "yes"
--enable-rule=SHARED_CORE \
%endif
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Jun-2004 16:42:25
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
SA-2004.029-apache; CAN-2004-0492
Summary:
RevisionChanges Path
1.13+0 -0 openpkg-src/apache/apache.patch
1.233 +0 -0 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.12 -r1.13 apache.patch
--- openpkg-src/apache/apache.patch 12 May 2004 08:51:38 - 1.12
+++ openpkg-src/apache/apache.patch 11 Jun 2004 14:42:25 - 1.13
@@ -55,3 +55,27 @@
env_path = DEFAULT_PATH;
}
+===
+SA-2004.029-apache CAN-2004-0492
+
+RCS file: /home/cvspublic/apache-1.3/src/modules/proxy/proxy_http.c,v
+retrieving revision 1.106
+retrieving revision 1.107
+diff -u -r1.106 -r1.107
+--- apache_1.3.31/src/modules/proxy/proxy_http.c 2004/03/29 17:47:15 1.106
apache_1.3.31/src/modules/proxy/proxy_http.c 2004/06/11 07:54:38 1.107
+@@ -485,6 +485,13 @@
+ content_length = ap_table_get(resp_hdrs, "Content-Length");
+ if (content_length != NULL) {
+ c->len = ap_strtol(content_length, NULL, 10);
++
++if (c->len < 0) {
++ap_kill_timeout(r);
++return ap_proxyerror(r, HTTP_BAD_GATEWAY, ap_pstrcat(r->pool,
++ "Invalid Content-Length from remote server",
++ NULL));
++}
+ }
+
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.232 -r1.233 apache.spec
--- openpkg-src/apache/apache.spec8 Jun 2004 15:19:20 - 1.232
+++ openpkg-src/apache/apache.spec11 Jun 2004 14:42:25 - 1.233
@@ -66,7 +66,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040608
+Release: 20040611
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-May-2004 10:51:39
Branch: HEAD Handle: 2004051209513800
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
remove obsolete patch (already applied in 1.3.31)
Summary:
RevisionChanges Path
1.12+0 -126openpkg-src/apache/apache.patch
1.226 +1 -1 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.11 -r1.12 apache.patch
--- openpkg-src/apache/apache.patch 11 May 2004 19:51:59 - 1.11
+++ openpkg-src/apache/apache.patch 12 May 2004 08:51:38 - 1.12
@@ -55,129 +55,3 @@
env_path = DEFAULT_PATH;
}
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0993
-Apache 1.3 before 1.3.30, when running big-endian 64-bit platforms,
-does not properly parse Allow/Deny rules using IP addresses without
-a netmask, which could allow remote attackers to bypass intended
-access restrictions.
-
-http://cvs.apache.org/viewcvs.cgi/apache-1.3/src/modules/standard/mod_access.c?r1=1.46&r2=1.47
-===
-RCS file: /home/cvspublic/apache-1.3/src/modules/standard/mod_access.c,v
-retrieving revision 1.46
-retrieving revision 1.47
-diff -u -r1.46 -r1.47
apache_1.3.31/src/modules/standard/mod_access.c 2004/02/20 20:37:40 1.46
-+++ apache_1.3.31/src/modules/standard/mod_access.c 2004/03/07 21:47:14 1.47
-@@ -39,8 +39,8 @@
- union {
- char *from;
- struct {
--unsigned long net;
--unsigned long mask;
-+struct in_addr net;
-+struct in_addr mask;
- } ip;
- } x;
- enum allowdeny_type type;
-@@ -124,14 +124,14 @@
-
- }
- else if ((s = strchr(where, '/'))) {
--unsigned long mask;
-+struct in_addr mask;
-
- a->type = T_IP;
- /* trample on where, we won't be using it any more */
- *s++ = '\0';
-
- if (!is_ip(where)
--|| (a->x.ip.net = ap_inet_addr(where)) == INADDR_NONE) {
-+|| (a->x.ip.net.s_addr = ap_inet_addr(where)) == INADDR_NONE) {
- a->type = T_FAIL;
- return "syntax error in network portion of network/netmask";
- }
-@@ -143,24 +143,26 @@
- }
- /* is it in /a.b.c.d form? */
- if (strchr(s, '.')) {
--mask = ap_inet_addr(s);
--if (mask == INADDR_NONE) {
-+mask.s_addr = ap_inet_addr(s);
-+if (mask.s_addr == INADDR_NONE) {
- a->type = T_FAIL;
- return "syntax error in mask portion of network/netmask";
- }
- }
- else {
-+int i;
-+
- /* assume it's in /nnn form */
--mask = atoi(s);
--if (mask > 32 || mask <= 0) {
-+i = atoi(s);
-+if (i > 32 || i <= 0) {
- a->type = T_FAIL;
- return "invalid mask in network/netmask";
- }
--mask = 0xUL << (32 - mask);
--mask = htonl(mask);
-+mask.s_addr = 0xUL << (32 - i);
-+mask.s_addr = htonl(mask.s_addr);
- }
- a->x.ip.mask = mask;
--a->x.ip.net = (a->x.ip.net & mask); /* pjr - This fixes PR 4770 */
-+a->x.ip.net.s_addr = (a->x.ip.net.s_addr & mask.s_addr); /* pjr - This
fixes PR 4770 */
- }
- else if (ap_isdigit(*where) && is_ip(where)) {
- /* legacy syntax for ip addrs: a.b.c. ==> a.b.c.0/24 for example */
-@@ -171,8 +173,8 @@
- a->type = T_IP;
- /* parse components */
- s = where;
--a->x.ip.net = 0;
--a->x.ip.mask = 0;
-+a->x.ip.net.s_addr = 0;
-+a->x.ip.mask.s_addr = 0;
- shift = 24;
- while (*s) {
- t = s;
-@@ -191,6 +193,7 @@
- return "invalid ip address";
- }
- if (shift < 0) {
-+a->type = T_FAIL;
- return "invalid ip address, only 4 octets allowed";
- }
- octet = atoi(s);
-@@ -198,13 +201,13 @@
- a->type = T_FAIL;
- return "each octet must be between 0 and 255 inclusive";
- }
--a->x.ip.net |= octet << shift;
--a->x.ip.mask |= 0xFFUL << shift;
-+a->x.ip.net.s_addr |= (unsigned int)octet << shift;
-+a->x.ip.mask.s_addr |= 0xFFUL << shift;
- s = t;
- shift -= 8;
[CVS] OpenPKG: openpkg-src/apache/ apache.patch apache.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-May-2004 21:52:00
Branch: HEAD Handle: 2004051120515900
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 1.3.29 -> 1.3.31
Summary:
RevisionChanges Path
1.11+8 -8 openpkg-src/apache/apache.patch
1.225 +3 -3 openpkg-src/apache/apache.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
$ cvs diff -u -r1.10 -r1.11 apache.patch
--- openpkg-src/apache/apache.patch 11 Mar 2004 12:34:37 - 1.10
+++ openpkg-src/apache/apache.patch 11 May 2004 19:51:59 - 1.11
@@ -1,5 +1,5 @@
apache_1.3.29/configure.orig Tue May 21 14:24:59 2002
-+++ apache_1.3.29/configure Mon Feb 10 11:08:40 2003
+--- apache_1.3.31/configure.orig Tue May 21 14:24:59 2002
apache_1.3.31/configure Mon Feb 10 11:08:40 2003
@@ -1216,10 +1216,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
@@ -15,8 +15,8 @@
##
## check and debug
apache_1.3.29/src/Configure.dist 2003-06-11 11:59:51.0 +0200
-+++ apache_1.3.29/src/Configure 2003-06-11 12:46:14.0 +0200
+--- apache_1.3.31/src/Configure.dist 2003-06-11 11:59:51.0 +0200
apache_1.3.31/src/Configure 2003-06-11 12:46:14.0 +0200
@@ -1190,14 +1190,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
@@ -44,8 +44,8 @@
SHLIB_SUFFIX_DEPTH=1
;;
*-sunos4*)
apache_1.3.29/src/main/util_script.c.origMon Jul 28 17:13:56 2003
-+++ apache_1.3.29/src/main/util_script.c Tue Jul 29 15:55:27 2003
+--- apache_1.3.31/src/main/util_script.c.origMon Jul 28 17:13:56 2003
apache_1.3.31/src/main/util_script.c Tue Jul 29 15:55:27 2003
@@ -246,6 +246,7 @@
}
}
@@ -67,8 +67,8 @@
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
apache_1.3.29/src/modules/standard/mod_access.c 2004/02/20 20:37:40 1.46
-+++ apache_1.3.29/src/modules/standard/mod_access.c 2004/03/07 21:47:14 1.47
+--- apache_1.3.31/src/modules/standard/mod_access.c 2004/02/20 20:37:40 1.46
apache_1.3.31/src/modules/standard/mod_access.c 2004/03/07 21:47:14 1.47
@@ -39,8 +39,8 @@
union {
char *from;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.224 -r1.225 apache.spec
--- openpkg-src/apache/apache.spec21 Apr 2004 17:48:37 - 1.224
+++ openpkg-src/apache/apache.spec11 May 2004 19:51:59 - 1.225
@@ -33,8 +33,8 @@
## go with the macro mechanism. But do not try to repeat this!
# package component versions
-%define V_apache 1.3.29
-%define V_mod_ssl2.8.16-1.3.29
+%define V_apache 1.3.31
+%define V_mod_ssl2.8.17-1.3.31
%define V_mod_perl 1.29
%define V_mod_php4.3.6
%define V_mod_dav1.0.3-1.3.6
@@ -64,7 +64,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20040421
+Release: 20040511
# package options (suexec related)
%option with_suexec yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
