diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 305de7896..dcd105710 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,4 +1,4 @@ -DIST gentoo-apache-2.2.27-r3-20140522.tar.bz2 64512 SHA256 ff2dec65d379bf362583e8b5a6e9dc8b121bf78710e2c120e2c51573e3bc8464 SHA512 d6997a2f6907c31ccf43f129f59692eb9f205be3f6aad24f0cea5a4989f0591f4d65b434adc967dbf0042845db4254ac8a6a85d3915b6663a28b5f111017c1ca WHIRLPOOL 44370466e0d30c45959edcc352770fb3fd24586d04f77d50d6c9e0903ab2c77f58f3286495352b3059d3d93cd5e166557dfb07174bb23c565287019ebfc9fc57 +DIST gentoo-apache-2.2.27-r4-20140731.tar.bz2 69094 SHA256 0837bb5bef0bf4c5c6a086dcc59e7a6e03405cc507244a5d147052801ab9bb73 SHA512 f84aa56fee3b36ff8d7594117c9ae215639fdea866cdf0356d4dfc991ebf285d51d7edf1ba3af2b080ae31ffe5313e3f2676efcc45526131085099595749772e WHIRLPOOL 372b6a5d39c7106332ae5ac3c881c315e666c73ec06b2d86a506b8c32e5e214dfd87a5f0706812105e8e5e85ce1d96b93c55e4ca2f8f80dec022cd42ea345f0d DIST gentoo-apache-2.4.9-r2-20140421.tar.bz2 24952 SHA256 0494a3e2fbcfc2139b2edeeb04fa87e66d31e0335c22a47e93dbb24289f13a10 SHA512 19dabea049730ab0ea177ec95cc34364835ec11185e87851e1ad31a4b08e3a2855a79d4be0eef2c72fe07bc4647fcf1ffc444be57f7af92b798decc20270552f WHIRLPOOL 96210b689696214d689e4842da4b3795f02732abedb5b9508a3e0c881b8f8bf67a41cf06a8cb6a353f267ddad1af9202a32a0b1b41c9ad49dbc98e5c0841f1d5 DIST httpd-2.2.27.tar.bz2 5616798 SHA256 205973ded6ca55c056ce9c84d73ab708f7829f330193bd39b651463b8d4f8147 SHA512 b318c157392e5c602d42eb52c8d7f1bd7258c817756fd20dcec8a8a177af3e42db4e25891473646c293ace42bc5d5608de083a14878ed446b8559709492bbf1d WHIRLPOOL c80c56d511586c87d6eb41eb8f5c00317d101b7532b127d50531409f4068aceba1022b16cf2ab122d91edcd9552fcae8543e8a31fbab78564dcd2e057b29e0f1 DIST httpd-2.4.9.tar.bz2 4994460 SHA256 f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603 SHA512 3a66302e18a2d165b3851665dc73be7d3849fc3359c1ff9dd9e2eaebf1f1d8fb89b7b0a05929d6247750bf0ed1abf9cf3c236a373b2d99635c8ca41698719c96 WHIRLPOOL 735677695d3b1497d554dd3e8d97733359140f3bb524335ab474275ca2b5546ceab8f5f3778948fabee2d152bf5b096d99b3dabb1011a4b68905c7cd5012a648 diff --git a/www-servers/apache/apache-2.2.27-r3.ebuild b/www-servers/apache/apache-2.2.27-r4.ebuild similarity index 96% rename from www-servers/apache/apache-2.2.27-r3.ebuild rename to www-servers/apache/apache-2.2.27-r4.ebuild index d8b3f953b..d6afeee7c 100644 --- a/www-servers/apache/apache-2.2.27-r3.ebuild +++ b/www-servers/apache/apache-2.2.27-r4.ebuild @@ -5,9 +5,9 @@ EAPI=5 # latest gentoo apache files -GENTOO_PATCHSTAMP="20140522" +GENTOO_PATCHSTAMP="20140731" GENTOO_DEVELOPER="polynomial-c" -GENTOO_PATCHNAME="gentoo-apache-2.2.27-r3" +GENTOO_PATCHNAME="gentoo-apache-2.2.27-r4" # IUSE/USE_EXPAND magic IUSE_MPMS_FORK="itk peruser prefork" @@ -83,7 +83,7 @@ MODULE_CRITICAL=" inherit apache-2 systemd toolchain-funcs -DESCRIPTION="The Apache Web Server." +DESCRIPTION="The Apache Web Server" HOMEPAGE="http://httpd.apache.org/" # some helper scripts are Apache-1.1, thus both are here diff --git a/www-servers/apache/files/2.2.22-envvars-std.in b/www-servers/apache/files/2.2.22-envvars-std.in deleted file mode 100644 index 9493bc749..000000000 --- a/www-servers/apache/files/2.2.22-envvars-std.in +++ /dev/null @@ -1,28 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -# envvars-std - default environment variables for apachectl -# -# This file is generated from envvars-std.in -# -if test "x$@SHLIBPATH_VAR@" != "x" ; then - @SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@" -else - @SHLIBPATH_VAR@="@exp_libdir@" -fi -export @SHLIBPATH_VAR@ -# -@OS_SPECIFIC_VARS@ diff --git a/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch b/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch deleted file mode 100644 index 92a073117..000000000 --- a/www-servers/apache/files/gentoo-apache-2.2.23-initd_fixups.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- gentoo-apache-2.2.23/init/apache2.initd -+++ gentoo-apache-2.2.23/init/apache2.initd -@@ -77,12 +77,16 @@ - # Use start stop daemon to apply system limits #347301 - start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start - -- i=0 -- while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do -+ local i=0 retval=1 -+ while [ $i -lt ${TIMEOUT} ] ; do -+ if [ -e "${PIDFILE}" ] ; then -+ retval=0 -+ break -+ fi - sleep 1 && i=$(expr $i + 1) - done - -- eend $(test $i -lt ${TIMEOUT}) -+ eend ${retval} - } - - stop() { -@@ -101,13 +105,14 @@ - ebegin "Stopping ${SVCNAME}" - ${APACHE2} ${APACHE2_OPTS} -k stop - -- i=0 -- while ( ! test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \ -+ local i=0 retval=0 -+ while ( test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \ - && [ $i -lt ${TIMEOUT} ]; do - sleep 1 && i=$(expr $i + 1) - done -+ [ -e "${PIDFILE}" ] && retval=1 - -- eend $(test $i -lt ${TIMEOUT}) -+ eend ${retval} - } - - reload() { diff --git a/www-servers/apache/files/httpd-2.4.3-mod_systemd.patch b/www-servers/apache/files/httpd-2.4.3-mod_systemd.patch deleted file mode 100644 index a9b1fd991..000000000 --- a/www-servers/apache/files/httpd-2.4.3-mod_systemd.patch +++ /dev/null @@ -1,163 +0,0 @@ ---- httpd-2.4.3/modules/arch/unix/config5.m4.systemd -+++ httpd-2.4.3/modules/arch/unix/config5.m4 -@@ -18,6 +18,19 @@ APACHE_MODULE(privileges, Per-virtualhos - fi - ]) - -+ -+APACHE_MODULE(systemd, Systemd support, , , $unixd_mods_enabled, [ -+ AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") -+ AC_CHECK_HEADERS(systemd/sd-daemon.h, [ap_HAVE_SD_DAEMON_H="yes"], [ap_HAVE_SD_DAEMON_H="no"]) -+ if test $ap_HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then -+ AC_MSG_WARN([Your system does not support systemd.]) -+ enable_systemd="no" -+ else -+ APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS]) -+ enable_systemd="yes" -+ fi -+]) -+ - APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) - - APACHE_MODPATH_FINISH ---- httpd-2.4.3/modules/arch/unix/mod_systemd.c.systemd -+++ httpd-2.4.3/modules/arch/unix/mod_systemd.c -@@ -0,0 +1,138 @@ -+/* Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -+#include -+#include "ap_mpm.h" -+#include -+#include -+#include -+#include -+#include -+#include "unixd.h" -+#include "scoreboard.h" -+#include "mpm_common.h" -+ -+#include "systemd/sd-daemon.h" -+ -+#if APR_HAVE_UNISTD_H -+#include -+#endif -+ -+#define KBYTE 1024 -+ -+static pid_t pid; /* PID of the main httpd instance */ -+static int server_limit, thread_limit, threads_per_child, max_servers; -+static time_t last_update_time; -+static unsigned long last_update_access; -+static unsigned long last_update_kbytes; -+ -+static int systemd_pre_mpm(apr_pool_t *p, ap_scoreboard_e sb_type) -+{ -+ int rv; -+ last_update_time = time(0); -+ -+ ap_mpm_query(AP_MPMQ_HARD_LIMIT_THREADS, &thread_limit); -+ ap_mpm_query(AP_MPMQ_HARD_LIMIT_DAEMONS, &server_limit); -+ ap_mpm_query(AP_MPMQ_MAX_THREADS, &threads_per_child); -+ /* work around buggy MPMs */ -+ if (threads_per_child == 0) -+ threads_per_child = 1; -+ ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &max_servers); -+ -+ pid = getpid(); -+ -+ rv = sd_notifyf(0, "READY=1\n" -+ "STATUS=Processing requests...\n" -+ "MAINPID=%lu", -+ (unsigned long) pid); -+ if (rv < 0) { -+ ap_log_perror(APLOG_MARK, APLOG_ERR, 0, p, -+ "sd_notifyf returned an error %d", rv); -+ } -+ -+ return OK; -+} -+ -+static int systemd_monitor(apr_pool_t *p, server_rec *s) -+{ -+ int i, j, res, rv; -+ process_score *ps_record; -+ worker_score *ws_record; -+ unsigned long access = 0; -+ unsigned long bytes = 0; -+ unsigned long kbytes = 0; -+ char bps[5]; -+ time_t now = time(0); -+ time_t elapsed = now - last_update_time; -+ -+ for (i = 0; i < server_limit; ++i) { -+ ps_record = ap_get_scoreboard_process(i); -+ for (j = 0; j < thread_limit; ++j) { -+ ws_record = ap_get_scoreboard_worker_from_indexes(i, j); -+ if (ap_extended_status && !ps_record->quiescing && ps_record->pid) { -+ res = ws_record->status; -+ if (ws_record->access_count != 0 || -+ (res != SERVER_READY && res != SERVER_DEAD)) { -+ access += ws_record->access_count; -+ bytes += ws_record->bytes_served; -+ if (bytes >= KBYTE) { -+ kbytes += (bytes >> 10); -+ bytes = bytes & 0x3ff; -+ } -+ } -+ } -+ } -+ } -+ -+ apr_strfsize((unsigned long)(KBYTE *(float) (kbytes - last_update_kbytes) -+ / (float) elapsed), bps); -+ -+ rv = sd_notifyf(0, "READY=1\n" -+ "STATUS=Total requests: %lu; Current requests/sec: %.3g; " -+ "Current traffic: %sB/sec\n", access, -+ ((float)access - last_update_access) / (float) elapsed, bps); -+ if (rv < 0) { -+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00000) -+ "sd_notifyf returned an error %d", rv); -+ } -+ -+ last_update_access = access; -+ last_update_kbytes = kbytes; -+ last_update_time = now; -+ -+ return DECLINED; -+} -+ -+static void systemd_register_hooks(apr_pool_t *p) -+{ -+ /* We know the PID in this hook ... */ -+ ap_hook_pre_mpm(systemd_pre_mpm, NULL, NULL, APR_HOOK_LAST); -+ /* Used to update httpd's status line using sd_notifyf */ -+ ap_hook_monitor(systemd_monitor, NULL, NULL, APR_HOOK_MIDDLE); -+} -+ -+module AP_MODULE_DECLARE_DATA systemd_module = -+{ -+ STANDARD20_MODULE_STUFF, -+ NULL, -+ NULL, -+ NULL, -+ NULL, -+ NULL, -+ systemd_register_hooks, -+};