diff options
author | taca <taca@pkgsrc.org> | 2010-03-05 00:22:59 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2010-03-05 00:22:59 +0000 |
commit | addf9135a9ebb54cb243db8eb8e5161b3ac1206f (patch) | |
tree | c404f353c9d088823f0f8eeadc96da9fcb2263f4 /www/apache22 | |
parent | 5cecb768bcc6bfd9c2f0002bdaabe38d88af9047 (diff) | |
download | pkgsrc-addf9135a9ebb54cb243db8eb8e5161b3ac1206f.tar.gz |
Remove CVE-2007-3304 related patches. CVE-2007-3304 was fixed
in Apache 2.2.6 and these patches are noop.
Diffstat (limited to 'www/apache22')
-rw-r--r-- | www/apache22/distinfo | 5 | ||||
-rw-r--r-- | www/apache22/patches/patch-aq | 24 | ||||
-rw-r--r-- | www/apache22/patches/patch-as | 14 | ||||
-rw-r--r-- | www/apache22/patches/patch-au | 14 |
4 files changed, 1 insertions, 56 deletions
diff --git a/www/apache22/distinfo b/www/apache22/distinfo index 0dd94c23a49..4dfed50fb0c 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2009/12/26 04:51:01 obache Exp $ +$NetBSD: distinfo,v 1.30 2010/03/05 00:22:59 taca Exp $ SHA1 (httpd-2.2.14.tar.bz2) = eacd04c87b489231ae708c84a77dc8e9ee176fd2 RMD160 (httpd-2.2.14.tar.bz2) = ff5077e444ba995475202bb3b9be733384c809d1 @@ -12,7 +12,4 @@ SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312 SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1 SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08 -SHA1 (patch-aq) = 27a0093fc75dcafc673abc25e9ebe80167f52ac1 -SHA1 (patch-as) = 7880eae75b702563bff8bca833ca81fb3dc4444c -SHA1 (patch-au) = d4c623bb953ac45cb4c8d95fc1d3c2788452d9a1 SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4 diff --git a/www/apache22/patches/patch-aq b/www/apache22/patches/patch-aq deleted file mode 100644 index 45eccc2d043..00000000000 --- a/www/apache22/patches/patch-aq +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2007/06/28 01:20:53 lkundrak Exp $ - -Part of fix for CVE-2007-3304 Denial of Service. - ---- include/mpm_common.h.orig 2007-06-28 02:53:26.000000000 +0200 -+++ include/mpm_common.h -@@ -145,6 +145,17 @@ int ap_unregister_extra_mpm_process(pid_ - #endif - - /** -+ * Safely signal an MPM child process, if the process is in the -+ * current process group. Otherwise fail. -+ * @param pid the process id of a child process to signal -+ * @param sig the signal number to send -+ * @return APR_SUCCESS if signal is sent, otherwise an error as per kill(3) -+ */ -+#ifdef AP_MPM_WANT_RECLAIM_CHILD_PROCESSES -+apr_status_t ap_mpm_safe_kill(pid_t pid, int sig); -+#endif -+ -+/** - * Determine if any child process has died. If no child process died, then - * this process sleeps for the amount of time specified by the MPM defined - * macro SCOREBOARD_MAINTENANCE_INTERVAL. diff --git a/www/apache22/patches/patch-as b/www/apache22/patches/patch-as deleted file mode 100644 index a849cb0a6d3..00000000000 --- a/www/apache22/patches/patch-as +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-as,v 1.1 2007/06/28 01:20:53 lkundrak Exp $ - -Part of fix for CVE-2007-3304 Denial of Service. - ---- server/mpm/prefork/mpm.h.orig 2007-06-28 02:53:26.000000000 +0200 -+++ server/mpm/prefork/mpm.h -@@ -53,6 +53,7 @@ - #define AP_MPM_USES_POD 1 - #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid) - #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0) -+#define MPM_VALID_PID(p) (getpgid(p) == getpgrp()) - #define MPM_ACCEPT_FUNC unixd_accept - - extern int ap_threads_per_child; diff --git a/www/apache22/patches/patch-au b/www/apache22/patches/patch-au deleted file mode 100644 index 3a86830be07..00000000000 --- a/www/apache22/patches/patch-au +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-au,v 1.1 2007/06/28 01:20:54 lkundrak Exp $ - -Part of fix for CVE-2007-3304 Denial of Service. - ---- server/mpm/worker/mpm.h.orig 2007-06-28 02:53:26.000000000 +0200 -+++ server/mpm/worker/mpm.h -@@ -52,6 +52,7 @@ - #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid) - #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0) - #define MPM_ACCEPT_FUNC unixd_accept -+#define MPM_VALID_PID(p) (getpgid(p) == getpgrp()) - - extern int ap_threads_per_child; - extern int ap_max_daemons_limit; |