Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=77fdd2cae05da55b64b9aacd2332abe4daf3e5e4

commit 77fdd2cae05da55b64b9aacd2332abe4daf3e5e4
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date:   Sun Jan 20 22:37:07 2008 +0100

apache-2.2.8-1-i686
version bump
remove CVE-2007-5000.diff backport

diff --git a/source/network/apache/CVE-2007-5000.diff 
b/source/network/apache/CVE-2007-5000.diff
deleted file mode 100644
index 4bfaffa..0000000
--- a/source/network/apache/CVE-2007-5000.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: modules/mappers/mod_imagemap.c
-===================================================================
---- modules/mappers/mod_imagemap.c     (revision 603710)
-+++ modules/mappers/mod_imagemap.c     (revision 603711)
-@@ -479,13 +479,16 @@
-
- static void menu_header(request_rec *r, char *menu)
- {
--    ap_set_content_type(r, "text/html");
-+    ap_set_content_type(r, "text/html; charset=ISO-8859-1");
-
--    ap_rvputs(r, DOCTYPE_HTML_3_2, "<html><head>\n<title>Menu for ", r->uri,
--           "</title>\n</head><body>\n", NULL);
-+    ap_rvputs(r, DOCTYPE_HTML_3_2, "<html><head>\n<title>Menu for ",
-+              ap_escape_html(r->pool, r->uri),
-+              "</title>\n</head><body>\n", NULL);
-
-     if (!strcasecmp(menu, "formatted")) {
--        ap_rvputs(r, "<h1>Menu for ", r->uri, "</h1>\n<hr />\n\n", NULL);
-+        ap_rvputs(r, "<h1>Menu for ",
-+                  ap_escape_html(r->pool, r->uri),
-+                  "</h1>\n<hr />\n\n", NULL);
-     }
-
-     return;
diff --git a/source/network/apache/FrugalBuild 
b/source/network/apache/FrugalBuild
index 61ac68c..e2abc7f 100644
--- a/source/network/apache/FrugalBuild
+++ b/source/network/apache/FrugalBuild
@@ -3,8 +3,8 @@
# Maintainer: Zsolt Szalai <[EMAIL PROTECTED]>

pkgname=apache
-pkgver=2.2.6
-pkgrel=3
+pkgver=2.2.8
+pkgrel=1
pkgdesc="A high performance Unix-based HTTP server (with SSL)"
url="http://httpd.apache.org/";
backup=(etc/httpd/conf/{httpd.conf,ssl.conf,ssl.crt/server.crt,ssl.csr/server.csr,ssl.key/server.key}
 \
@@ -16,9 +16,8 @@ up2date="lynx -dump http://httpd.apache.org/download.cgi 
|grep 'best available'|
source=(http://www.apache.org/dist/httpd/httpd-$pkgver.tar.gz \
http://ftp.frugalware.org/pub/other/sources/apache/mkcert.tar.gz \
rc.httpd rc.httpd-hu.po httpd.conf ssl.conf \
-       README.Frugalware index.html 
http://frugalware.org/images/frugalware.png \
-       CVE-2007-5000.diff)
-signatures=($source.asc '' '' '' '' '' '' '' '' '')
+       README.Frugalware index.html 
http://frugalware.org/images/frugalware.png)
+signatures=($source.asc '' '' '' '' '' '' '' '')

# svn web interface:
# http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to