Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25422
Modified Files:
apache2.info apache2.patch
Log Message:
* Fix module dependencies in lbmethod_*.load files. Closes: #717910
LP: #1205314
* Backport open_htaccess hook from upstream 2.4.x branch to allow
building mpm-itk as separate package.
* Improve comment for LogLevel in apache2.conf. Closes: #718677
* Fix comment in ports.conf. Closes: #718650
Index: apache2.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apache2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apache2.info 13 Aug 2013 22:10:46 -0000 1.1
+++ apache2.info 23 Aug 2013 15:40:21 -0000 1.2
@@ -1,6 +1,6 @@
Package: apache2
Version: 2.4.6
-Revision: 2.1
+Revision: 3.1
###
Provides: httpd
BuildDepends: <<
@@ -37,7 +37,7 @@
Source-MD5: 6c17dafd009ef8ffb5ccc9481d1e6441
###
PatchFile: %n.patch
-PatchFile-MD5: a580e350929025b79441cd4eda5b964a
+PatchFile-MD5: 58e283d7e4dff01df29fc2abab183e4b
PatchScript: <<
BASE=$(echo %p | perl -pi -e 's,/,,'); \
sed -e 's,@FINKPREFIX@,%p,g' -e "s,@FINKBASE@,${BASE},g" %{PatchFile} | patch
-p1
@@ -46,11 +46,11 @@
#patch -p1 < fink/patches/make_include_safe.patch # Probably to be droped in
2.4
patch -p1 < fink/patches/fhs_compliance.patch
#patch -p1 < fink/patches/suexec_is_shared.patch # Probably not needed in 2.4
-patch -p1 < fink/patches/dbm_read_hash_or_btree.patch
patch -p1 < fink/patches/no_LD_LIBRARY_PATH.patch
patch -p1 < fink/patches/suexec-CVE-2007-1742.patch
patch -p1 < fink/patches/customize_apxs.patch
patch -p1 < fink/patches/build_suexec-custom.patch
+patch -p1 < fink/patches/open_htaccess_hook.patch
# The patch below must not be applied by quilt at extraction time. It depends
# on some script-fu to be executed before. Have a look
# to debian/rules' prepare-custom-suexec target.
Index: apache2.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apache2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apache2.patch 13 Aug 2013 22:10:46 -0000 1.1
+++ apache2.patch 23 Aug 2013 15:40:21 -0000 1.2
@@ -1938,7 +1938,7 @@
+complete -F _a2disconf a2disconf
diff -ruN httpd-2.4.6.orig/fink/config-dir/apache2.conf
httpd-2.4.6/fink/config-dir/apache2.conf
--- httpd-2.4.6.orig/fink/config-dir/apache2.conf 1969-12-31
17:00:00.000000000 -0700
-+++ httpd-2.4.6/fink/config-dir/apache2.conf 2013-08-06 18:53:14.000000000
-0600
++++ httpd-2.4.6/fink/config-dir/apache2.conf 2013-08-23 09:28:52.000000000
-0600
@@ -0,0 +1,221 @@
+# This is the main Apache server configuration file. It contains the
+# configuration directives that give the server its instructions.
@@ -2070,7 +2070,7 @@
+ErrorLog ${APACHE_LOG_DIR}/error.log
+
+#
-+# LogLevel: Control the number of messages logged to the error_log.
++# LogLevel: Control the severity of messages logged to the error_log.
+# Available values: trace8, ..., trace1, debug, info, notice, warn,
+# error, crit, alert, emerg.
+# It is also possible to configure the log level for particular modules, e.g.
@@ -3866,27 +3866,27 @@
+LoadModule info_module @FINKPREFIX@/lib/apache2/modules/mod_info.so
diff -ruN
httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_bybusyness.load
httpd-2.4.6/fink/config-dir/mods-available/lbmethod_bybusyness.load
--- httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_bybusyness.load
1969-12-31 17:00:00.000000000 -0700
-+++ httpd-2.4.6/fink/config-dir/mods-available/lbmethod_bybusyness.load
2013-08-07 21:46:20.000000000 -0600
++++ httpd-2.4.6/fink/config-dir/mods-available/lbmethod_bybusyness.load
2013-08-23 09:29:43.000000000 -0600
@@ -0,0 +1,2 @@
-+# Depends: mod_proxy_balancer
++# Depends: proxy_balancer
+LoadModule lbmethod_bybusyness_module
@FINKPREFIX@/lib/apache2/modules/mod_lbmethod_bybusyness.so
diff -ruN
httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_byrequests.load
httpd-2.4.6/fink/config-dir/mods-available/lbmethod_byrequests.load
--- httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_byrequests.load
1969-12-31 17:00:00.000000000 -0700
-+++ httpd-2.4.6/fink/config-dir/mods-available/lbmethod_byrequests.load
2013-08-07 21:46:31.000000000 -0600
++++ httpd-2.4.6/fink/config-dir/mods-available/lbmethod_byrequests.load
2013-08-23 09:29:56.000000000 -0600
@@ -0,0 +1,2 @@
-+# Depends: mod_proxy_balancer
++# Depends: proxy_balancer
+LoadModule lbmethod_byrequests_module
@FINKPREFIX@/lib/apache2/modules/mod_lbmethod_byrequests.so
diff -ruN
httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_bytraffic.load
httpd-2.4.6/fink/config-dir/mods-available/lbmethod_bytraffic.load
--- httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_bytraffic.load
1969-12-31 17:00:00.000000000 -0700
-+++ httpd-2.4.6/fink/config-dir/mods-available/lbmethod_bytraffic.load
2013-08-07 21:46:39.000000000 -0600
++++ httpd-2.4.6/fink/config-dir/mods-available/lbmethod_bytraffic.load
2013-08-23 09:30:07.000000000 -0600
@@ -0,0 +1,2 @@
-+# Depends: mod_proxy_balancer
++# Depends: proxy_balancer
+LoadModule lbmethod_bytraffic_module
@FINKPREFIX@/lib/apache2/modules/mod_lbmethod_bytraffic.so
diff -ruN
httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_heartbeat.load
httpd-2.4.6/fink/config-dir/mods-available/lbmethod_heartbeat.load
--- httpd-2.4.6.orig/fink/config-dir/mods-available/lbmethod_heartbeat.load
1969-12-31 17:00:00.000000000 -0700
-+++ httpd-2.4.6/fink/config-dir/mods-available/lbmethod_heartbeat.load
2013-08-07 21:46:45.000000000 -0600
++++ httpd-2.4.6/fink/config-dir/mods-available/lbmethod_heartbeat.load
2013-08-23 09:30:18.000000000 -0600
@@ -0,0 +1,2 @@
-+# Depends: mod_proxy_balancer
++# Depends: proxy_balancer
+LoadModule lbmethod_heartbeat_module
@FINKPREFIX@/lib/apache2/modules/mod_lbmethod_heartbeat.so
diff -ruN httpd-2.4.6.orig/fink/config-dir/mods-available/ldap.conf
httpd-2.4.6/fink/config-dir/mods-available/ldap.conf
--- httpd-2.4.6.orig/fink/config-dir/mods-available/ldap.conf 1969-12-31
17:00:00.000000000 -0700
@@ -4826,11 +4826,11 @@
+LoadModule xml2enc_module @FINKPREFIX@/lib/apache2/modules/mod_xml2enc.so
diff -ruN httpd-2.4.6.orig/fink/config-dir/ports.conf
httpd-2.4.6/fink/config-dir/ports.conf
--- httpd-2.4.6.orig/fink/config-dir/ports.conf 1969-12-31
17:00:00.000000000 -0700
-+++ httpd-2.4.6/fink/config-dir/ports.conf 2013-08-06 18:53:26.000000000
-0600
++++ httpd-2.4.6/fink/config-dir/ports.conf 2013-08-23 09:30:45.000000000
-0600
@@ -0,0 +1,15 @@
+# If you just change the port or add more ports here, you will likely also
+# have to change the VirtualHost statement in
-+# @FINKPREFIX@/etc/apache2/sites-enabled/000-default
++# @FINKPREFIX@/etc/apache2/sites-enabled/000-default.conf
+
+Listen 80
+
@@ -7783,45 +7783,6 @@
+ include %INSTALLBUILDDIR%/special.mk
+
+ # the used tools
-diff -ruN httpd-2.4.6.orig/fink/patches/dbm_read_hash_or_btree.patch
httpd-2.4.6/fink/patches/dbm_read_hash_or_btree.patch
---- httpd-2.4.6.orig/fink/patches/dbm_read_hash_or_btree.patch 1969-12-31
17:00:00.000000000 -0700
-+++ httpd-2.4.6/fink/patches/dbm_read_hash_or_btree.patch 2013-07-21
10:47:15.000000000 -0600
-@@ -0,0 +1,35 @@
-+Description: Be more liberal in the sorts of DBM files we accept.
-+Forwarded: no
-+Author: Adam Conrad <adcon...@0c3.net>
-+Last-Update: 2012-02-25
-+--- a/support/dbmmanage.in
-++++ b/support/dbmmanage.in
-+@@ -25,7 +25,7 @@
-+ BEGIN { @AnyDBM_File::ISA = qw(DB_File NDBM_File GDBM_File SDBM_File) }
-+ use strict;
-+ use Fcntl;
-+-use AnyDBM_File ();
-++use DB_File ();
-+
-+ sub usage {
-+ my $cmds = join "|", sort keys %dbmc::;
-+@@ -155,7 +155,9 @@
-+ my($mode, $flags) = $command =~
-+ /^(?:view|check)$/ ? (0644, O_RDONLY) : (0644, O_RDWR|O_CREAT);
-+
-+-tie (%DB, "AnyDBM_File", $file, $flags, $mode) || die "Can't tie $file: $!";
-++tie (%DB, "DB_File", $file, $flags, $mode, $DB_File::DB_HASH) ||
-++ tie (%DB, "DB_File", $file, $flags, $mode, $DB_File::DB_BTREE) ||
-++ die "Can't tie $file: $!";
-+ dbmc->$command();
-+ untie %DB;
-+
-+@@ -167,7 +169,7 @@
-+ srand (time ^ $$ or time ^ ($$ + ($$ << 15)));
-+ }
-+ else {
-+- for (qw(-xlwwa -le)) {
-++ for (qw(xlwwa -le)) {
-+ `ps $_ 2>/dev/null`;
-+ $psf = $_, last unless $?;
-+ }
diff -ruN httpd-2.4.6.orig/fink/patches/fhs_compliance.patch
httpd-2.4.6/fink/patches/fhs_compliance.patch
--- httpd-2.4.6.orig/fink/patches/fhs_compliance.patch 1969-12-31
17:00:00.000000000 -0700
+++ httpd-2.4.6/fink/patches/fhs_compliance.patch 2013-08-06
18:35:09.000000000 -0600
@@ -8885,8 +8846,8 @@
+#99-rerun-configure.patch
diff -ruN
httpd-2.4.6.orig/fink/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
httpd-2.4.6/fink/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
---
httpd-2.4.6.orig/fink/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
1969-12-31 17:00:00.000000000 -0700
-+++
httpd-2.4.6/fink/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
2013-07-21 10:47:15.000000000 -0600
-@@ -0,0 +1,50 @@
++++
httpd-2.4.6/fink/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
2013-08-23 09:22:57.000000000 -0600
+@@ -0,0 +1,61 @@
+Fix an itk issue where users can sometimes get spurious 403s on persistent
+connections (the description in the comments explains the logic).
+This would particularly hit people with reverse proxies, since these
@@ -8895,7 +8856,18 @@
+
+--- a/server/config.c
++++ b/server/config.c
-+@@ -69,6 +69,8 @@
++@@ -52,6 +52,10 @@
++ #include "util_varbuf.h"
++ #include "mpm_common.h"
++
+++#include "http_connection.h"
+++#include <unistd.h>
+++#include <sys/types.h>
+++
++ #define APLOG_UNSET (APLOG_NO_MODULE - 1)
++ /* we know core's module_index is 0 */
++ #undef APLOG_MODULE_INDEX
++@@ -69,6 +73,8 @@
+
+ AP_DECLARE_DATA ap_directive_t *ap_conftree = NULL;
+
@@ -8904,7 +8876,7 @@
+ APR_HOOK_STRUCT(
+ APR_HOOK_LINK(header_parser)
+ APR_HOOK_LINK(pre_config)
-+@@ -2138,6 +2140,32 @@
++@@ -2138,6 +2144,32 @@
+ else {
+ if (!APR_STATUS_IS_ENOENT(status)
+ && !APR_STATUS_IS_ENOTDIR(status)) {
@@ -9818,6 +9790,160 @@
+-export @SHLIBPATH_VAR@
+-#
+ @OS_SPECIFIC_VARS@
+diff -ruN httpd-2.4.6.orig/fink/patches/open_htaccess_hook.patch
httpd-2.4.6/fink/patches/open_htaccess_hook.patch
+--- httpd-2.4.6.orig/fink/patches/open_htaccess_hook.patch 1969-12-31
17:00:00.000000000 -0700
++++ httpd-2.4.6/fink/patches/open_htaccess_hook.patch 2013-08-23
09:24:24.000000000 -0600
+@@ -0,0 +1,150 @@
++# Commit r1507680 from upstream branches/2.4.x
++#
++# Author: Jim Jagielski <j...@apache.org>
++# Date: Sat Jul 27 16:15:28 2013 +0000
++#
++# Merge r1389339, r1498880 from trunk:
++#
++# add pre_htaccess hook; in conjunction with earlier dirwalk_stat
++# and post_perdir_config hooks, this should allow mpm-itk to be
++# used without patches to httpd core
++#
++#
++#
++# Replace pre_htaccess hook with more flexible open_htaccess hook
++#
++# Submitted by: trawick, sf
++# Reviewed/backported by: jim
++#
++--- a/include/ap_mmn.h
+++++ b/include/ap_mmn.h
++@@ -418,6 +418,7 @@
++ * ap_proxy_pass_brigade()
++ * 20120211.22 (2.4.5-dev) No longer prevent usage of strtoul()
++ * 20120211.23 (2.4.5-dev) Add ap_proxy_clear_connection()
+++ * 20120211.24 (2.4.7-dev) add open_htaccess hook.
++ */
++
++ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
++@@ -425,7 +426,7 @@
++ #ifndef MODULE_MAGIC_NUMBER_MAJOR
++ #define MODULE_MAGIC_NUMBER_MAJOR 20120211
++ #endif
++-#define MODULE_MAGIC_NUMBER_MINOR 23 /* 0...n */
+++#define MODULE_MAGIC_NUMBER_MINOR 24 /* 0...n */
++
++ /**
++ * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
++--- a/include/http_config.h
+++++ b/include/http_config.h
++@@ -1322,6 +1322,31 @@
++ AP_DECLARE_HOOK(void,optional_fn_retrieve,(void))
++
++ /**
+++ * Allow modules to open htaccess files or perform operations before doing so
+++ * @param r The current request
+++ * @param dir_name The directory for which the htaccess file should be opened
+++ * @param access_name The filename for which the htaccess file should be
opened
+++ * @param conffile Where the pointer to the opened ap_configfile_t must be
+++ * stored
+++ * @param full_name Where the full file name of the htaccess file must be
+++ * stored.
+++ * @return APR_SUCCESS on success,
+++ * APR_ENOENT or APR_ENOTDIR if no htaccess file exists,
+++ * AP_DECLINED to let later modules do the opening,
+++ * any other error code on error.
+++ */
+++AP_DECLARE_HOOK(apr_status_t,open_htaccess,
+++ (request_rec *r, const char *dir_name, const char
*access_name,
+++ ap_configfile_t **conffile, const char **full_name))
+++
+++/**
+++ * Core internal function, use ap_run_open_htaccess() instead.
+++ */
+++apr_status_t ap_open_htaccess(request_rec *r, const char *dir_name,
+++ const char *access_name, ap_configfile_t **conffile,
+++ const char **full_name);
+++
+++/**
++ * A generic pool cleanup that will reset a pointer to NULL. For use with
++ * apr_pool_cleanup_register.
++ * @param data The address of the pointer
++--- a/server/config.c
+++++ b/server/config.c
++@@ -80,6 +80,7 @@
++ APR_HOOK_LINK(quick_handler)
++ APR_HOOK_LINK(optional_fn_retrieve)
++ APR_HOOK_LINK(test_config)
+++ APR_HOOK_LINK(open_htaccess)
++ )
++
++ AP_IMPLEMENT_HOOK_RUN_ALL(int, header_parser,
++@@ -171,6 +172,12 @@
++ AP_IMPLEMENT_HOOK_RUN_FIRST(int, quick_handler, (request_rec *r, int lookup),
++ (r, lookup), DECLINED)
++
+++AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t, open_htaccess,
+++ (request_rec *r, const char *dir_name, const
char *access_name,
+++ ap_configfile_t **conffile, const char
**full_name),
+++ (r, dir_name, access_name, conffile, full_name),
+++ AP_DECLINED)
+++
++ /* hooks with no args are implemented last, after disabling APR hook probes
*/
++ #if defined(APR_HOOK_PROBES_ENABLED)
++ #undef APR_HOOK_PROBES_ENABLED
++@@ -2073,14 +2080,23 @@
++ return OK;
++ }
++
+++apr_status_t ap_open_htaccess(request_rec *r, const char *dir_name,
+++ const char *access_name,
+++ ap_configfile_t **conffile,
+++ const char **full_name)
+++{
+++ *full_name = ap_make_full_path(r->pool, dir_name, access_name);
+++ return ap_pcfg_openfile(conffile, r->pool, *full_name);
+++}
+++
++ AP_CORE_DECLARE(int) ap_parse_htaccess(ap_conf_vector_t **result,
++ request_rec *r, int override,
++ int override_opts, apr_table_t
*override_list,
++- const char *d, const char
*access_name)
+++ const char *d, const char
*access_names)
++ {
++ ap_configfile_t *f = NULL;
++ cmd_parms parms;
++- char *filename = NULL;
+++ const char *filename;
++ const struct htaccess_result *cache;
++ struct htaccess_result *new;
++ ap_conf_vector_t *dc = NULL;
++@@ -2104,15 +2120,11 @@
++ parms.path = apr_pstrdup(r->pool, d);
++
++ /* loop through the access names and find the first one */
++- while (access_name[0]) {
++- /* AFAICT; there is no use of the actual 'filename' against
++- * any canonicalization, so we will simply take the given
++- * name, ignoring case sensitivity and aliases
++- */
++- filename = ap_make_full_path(r->pool, d,
++- ap_getword_conf(r->pool, &access_name));
++- status = ap_pcfg_openfile(&f, r->pool, filename);
+++ while (access_names[0]) {
+++ const char *access_name = ap_getword_conf(r->pool, &access_names);
++
+++ filename = NULL;
+++ status = ap_run_open_htaccess(r, d, access_name, &f, &filename);
++ if (status == APR_SUCCESS) {
++ const char *errmsg;
++ ap_directive_t *temptree = NULL;
++--- a/server/core.c
+++++ b/server/core.c
++@@ -4878,6 +4878,7 @@
++ ap_hook_insert_network_bucket(core_insert_network_bucket, NULL, NULL,
++ APR_HOOK_REALLY_LAST);
++ ap_hook_dirwalk_stat(core_dirwalk_stat, NULL, NULL,
APR_HOOK_REALLY_LAST);
+++ ap_hook_open_htaccess(ap_open_htaccess, NULL, NULL,
APR_HOOK_REALLY_LAST);
++
++ /* register the core's insert_filter hook and register core-provided
++ * filters
diff -ruN httpd-2.4.6.orig/fink/patches/suexec-CVE-2007-1742.patch
httpd-2.4.6/fink/patches/suexec-CVE-2007-1742.patch
--- httpd-2.4.6.orig/fink/patches/suexec-CVE-2007-1742.patch 1969-12-31
17:00:00.000000000 -0700
+++ httpd-2.4.6/fink/patches/suexec-CVE-2007-1742.patch 2013-07-21
10:47:15.000000000 -0600
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
