From be1792a3afa66c1efed8c8648c7be1c81ff68621 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Fri, 4 Feb 2011 19:40:43 +0000
Subject: [PATCH] Initial .bep and patch files for apache httpd, patch is based
 on Kaliber's previous patch.  TODO: fix directories being used using finddir,
 and figure out user name issue.

---
 www-servers/apache/apache-2.2.17.bep          | 29 +++++++++++
 .../apache/patches/apache-2.2.17.patch        | 48 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 www-servers/apache/apache-2.2.17.bep
 create mode 100644 www-servers/apache/patches/apache-2.2.17.patch

diff --git a/www-servers/apache/apache-2.2.17.bep b/www-servers/apache/apache-2.2.17.bep
new file mode 100644
index 000000000..9f25947fb
--- /dev/null
+++ b/www-servers/apache/apache-2.2.17.bep
@@ -0,0 +1,29 @@
+DESCRIPTION="The Apache Web Server." 
+HOMEPAGE="http://httpd.apache.org" 
+SRC_URI="http://apache.osuosl.org//httpd/httpd-2.2.17.tar.gz"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-libs/apr >= 1.4 2
+	dev-libs/apr-utils >= 1.3.9"
+CHECKSUM_MD5="66d8e107f85acc039fd5e624e85728a9"
+BUILD {
+	cd httpd-2.2.17
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	make
+}
+
+INSTALL {
+	cd httpd-2.2.17
+	make install
+}
+
+TEST {
+	cd httpd-2.2.17
+	make test
+}
+
+LICENSE="Apache v2"
+COPYRIGHT="2009 The Apache Software Foundation."
diff --git a/www-servers/apache/patches/apache-2.2.17.patch b/www-servers/apache/patches/apache-2.2.17.patch
new file mode 100644
index 000000000..53697699a
--- /dev/null
+++ b/www-servers/apache/patches/apache-2.2.17.patch
@@ -0,0 +1,48 @@
+diff -urN httpd-2.2.17/server/mpm_common.c httpd-2.2.17-haiku/server/mpm_common.c
+--- httpd-2.2.17/server/mpm_common.c	2010-10-07 16:56:54.055836672 +0000
++++ httpd-2.2.17-haiku/server/mpm_common.c	2011-02-05 10:58:12.295436288 +0000
+@@ -950,7 +950,7 @@
+ 
+ static const char *dash_k_arg;
+ 
+-static int send_signal(pid_t pid, int sig)
++static int _send_signal(pid_t pid, int sig)
+ {
+     if (kill(pid, sig) < 0) {
+         ap_log_error(APLOG_MARK, APLOG_STARTUP, errno, NULL,
+@@ -1007,7 +1007,7 @@
+             printf("%s\n", status);
+         }
+         else {
+-            send_signal(otherpid, SIGTERM);
++            _send_signal(otherpid, SIGTERM);
+         }
+         return 1;
+     }
+@@ -1017,7 +1017,7 @@
+             printf("httpd not running, trying to start\n");
+         }
+         else {
+-            *exit_status = send_signal(otherpid, SIGHUP);
++            *exit_status = _send_signal(otherpid, SIGHUP);
+             return 1;
+         }
+     }
+@@ -1027,7 +1027,7 @@
+             printf("httpd not running, trying to start\n");
+         }
+         else {
+-            *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL);
++            *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL);
+             return 1;
+         }
+     }
+@@ -1038,7 +1038,7 @@
+             printf("%s\n", status);
+         }
+         else {
+-            *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL_STOP);
++            *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL_STOP);
+         }
+ #else
+         printf("httpd MPM \"" MPM_NAME "\" does not support graceful-stop\n");