haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated apache to 2.2.22

Browse Source
This commit is contained in:
Scott McCreary
2012-07-20 21:58:28 +00:00
parent 45409b289b
commit a479487bb1
2 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
www-servers/apache/apache-2.2.22.bep Normal file
View File

@@ -0,0 +1,32 @@
DESCRIPTION="The Apache Web Server."
HOMEPAGE="http://httpd.apache.org"
SRC_URI="http://apache.osuosl.org//httpd/httpd-2.2.22.tar.gz"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/apr >= 1.4 2
dev-libs/apr-utils >= 1.3.9"
CHECKSUM_MD5="d77fa5af23df96a8af68ea8114fa6ce1"
BUILD {
cd httpd-2.2.22
libtoolize --force --copy --install
aclocal
autoconf
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`
make
}
INSTALL {
cd httpd-2.2.22
make install
}
TEST {
cd httpd-2.2.22
make test
}
LICENSE="Apache v2"
COPYRIGHT="2012 The Apache Software Foundation."

48
www-servers/apache/patches/apache-2.2.22.patch Normal file
View File

@@ -0,0 +1,48 @@
diff -urN httpd-2.2.22/server/mpm_common.c httpd-2.2.22-haiku/server/mpm_common.c
--- httpd-2.2.22/server/mpm_common.c 2010-10-07 16:56:54.055836672 +0000
+++ httpd-2.2.22-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");