[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. debian/2.2.22-3-229-g9bfcd2c
Stefan Fritsch
sf at sfritsch.de
Tue May 1 15:55:52 UTC 2012
The following commit has been merged in the next branch:
commit 9bfcd2ce9e659873dae3e455731ac800df38f592
Merge: bfbfd8c59544bb9de280bfdeb103bd323acb8973 201f359b7de1ab2726b47d8c749b47e4df4661f0
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Tue May 1 17:45:09 2012 +0200
Merge branch 'master' into next
Import missing changes up to 2.2.22-5:
modified: debian/changelog
new file: debian/patches/dlopen_search_path.patch
modified: debian/patches/series
Conflicts:
debian/apache2-prefork-dev.install
debian/apache2-threaded-dev.install
debian/apache2-utils.install
debian/apache2.2-bin.install
debian/changelog
debian/config-dir/sites-available/default
debian/config-dir/sites-available/default-ssl
debian/control
debian/gbp.conf
debian/patches/series
debian/rules
diff --combined debian/changelog
index 6c8f801,f8c763a..4a784f3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,297 -1,25 +1,319 @@@
+apache2 (2.4.2-2) experimental; urgency=low
+
+ * UNRELEASED
+
+ [ Stefan Fritsch ]
+ * Explicitly enable mod_authz_core on upgrades. It can happen that it is
+ not pulled in by any of the enabled modules, but we need it in any case
+ for apache2.conf. Closes: #669876
+ * Don't ship the changelogs in the apache2-mpm-itk transitional package.
+ * Make dh_apache2 only accept shell function names as conditional, to avoid
+ problems with shell and sed special characters.
+
+ [ Arno Töll ]
+ * Add mode lines to various configuration files and scripts. Reformat
+ configuration files for consitency.
+ * Fix "Fix typographic errors in configuration file comments": Thanks to Oxan
+ van Leeuwen for providing a patch (Closes: #669269)
+ * Formulate several clarifications in PACKAGING, start versioning this document
+ and add normative read hints. Moreover, document the -m switch for a2enmod.
+ * Merge spelling and grammar fixes provided by Justin B Rye. Much appreciated!
+ * Change various state and run directories used by Apache from
+ /var/run/<basename> to /var/run/apache2/<basename>. This might change again
+ for Wheezy+1 to adopt /run.
+ * Use more exit status codes for a2query which allows to tell apart why a
+ module was disabled, also make its output more readable.
+ * Changes in apache2-maintscript-helper:
+ + Finally apache2_invoke may behave correctly and catch all cases
+ including upgrades from Squeeze.
+ + apache2_invoke: accepts a third argument to override the rc.d-action now
+ + support APACHE2_MAINTSCRIPT_DEBUG: When defined in the environment or in
+ /etc/apache2/envvars, debug output is displayed.
+ * Implement a -r switch for dh_apache2 which allows to force a reload of the
+ web server if required.
+
+ -- Arno Töll <arno at debian.org> Fri, 27 Apr 2012 02:22:58 +0200
+
+ apache2 (2.2.22-5) unstable; urgency=low
+
+ * Make LoadFile and LoadModule look in the standard search paths if the
+ dso file name is given as a pure filename. This helps with the multi-arch
+ transition.
+
+ -- Stefan Fritsch <sf at debian.org> Mon, 30 Apr 2012 23:38:33 +0200
+
+ apache2 (2.2.22-4) unstable; urgency=high
+
+ * CVE-2012-0216: Remove "Alias /doc /usr/share/doc" from the default virtual
+ hosts' config files.
+ If scripting modules like mod_php or mod_rivet are enabled on systems
+ where either 1) some frontend server forwards connections to an apache2
+ backend server on the localhost address, or 2) the machine running
+ apache2 is also used for web browsing, this could allow a remote
+ attacker to execute example scripts stored under /usr/share/doc.
+ Depending on the installed packages, this could lead to issues like cross
+ site scripting, code execution, or leakage of sensitive data.
+
+ -- Stefan Fritsch <sf at debian.org> Sun, 15 Apr 2012 23:41:43 +0200
+
+apache2 (2.4.2-1) experimental; urgency=low
+
+ * New upstream release
+
+ [ Arno Töll ]
+ * Drop update-alternative call in postrm. Our prerm script catches them
+ already anyway.
+ * Update my mail address.
+ * Fix "dh_apache2 does not set "x" bits on /usr/lib/apache2/modules/"
+ Set directory permissions to 755 by default (Closes: #666875). Thanks Axel
+ Beckert for the hint.
+ * Add /usr/share/doc/apache2/migrate-sites.pl, a script to assist users to
+ give sites a .conf suffix, add a hint to the NEWS file.
+ * Do stateful configuration handling by remembering who enabled when a
+ particular piece of configuration. That way in can be told under which
+ circumstances for example modules should be re-enabled. Thanks to Filip M.
+ Nowak who was providing a patch where my changes are built upon.
+ * Fix apxs to import LDFLAGS from config_vars.mk. Moreover, make it possible
+ to override LDFLAGS at compile time by defining LDLAGS in the environment,
+ just like it is possible for CFLAGS. This also means, config_vars.mk now
+ exports hardening build flags by default.
+ * Provide the virtual packages httpd and httpd-cgi again.
+
+
+ [ Stefan Fritsch ]
+ * Change default config to deny access to / in the file system and only
+ allow access to /var/www, /usr/share, and /usr/lib/cgi-bin. Closes: #341022
+ * Disable MultiViews in the default config.
+ * Update ssl default cipher config, add alternative speed optimized config.
+ Closes: #649020
+ * Move the configuration of /usr/lib/cgi-bin into a separate config file.
+ Closes: #589638
+ * Comment out per-vhost loglevel.
+ * Add section to security.conf that shows how to forbid access to VCS
+ directories. Closes: #548213
+ * Change the compiled in default of DocumentRoot to /var/www by updating
+ fhs_compliance.patch
+ * Re-add mpm_itk (version 2.4.1-pre01). This is still very experimental!
+
+ -- Stefan Fritsch <sf at debian.org> Sun, 15 Apr 2012 20:50:28 +0200
+
+apache2 (2.4.1-3) experimental; urgency=low
+
+ [ Arno Töll ]
+ * apache2-suexec-{custom,pristine}: Fix argument order when removing
+ alternatives, do not remove alternatives on upgrades. Thanks Andreas
+ Beckmann for spotting the issue (Closes: #665002)
+ * Install suexec(8) link to /usr/share/man/man8/...
+ * Enable mod_version statically, drop associated module load file.
+ * Update PACKAGING hints and cope several questions raised among the
+ discussions with packagers. Thus, invokation of apache2-maintscript-helper
+ in maintainer scripts are covered now.
+ * Changes in dh_apache2:
+ + Invoke the maintscript helper postrm action for simple package removals,
+ too.
+ + Fix a bug which accidentally called "en{mod,site,conf}" instead of
+ "di{mod,site,conf}"
+ + Set the default conditional back to "true", now the maintainer script is
+ expected to cope itself with upgrades correctly
+ * Changes in apache2_maintscript_helper
+ + Provide apache2_action_needed, apache2_msg
+ + Parse maintainer script arguments to find out which script called us
+ + Support APACHE2_MAINTSCRIPT_HELPER_QUIET which, when set, omits any
+ visible output
+ + Break APIs: apache2_invoke accepts a single configuration file argument
+ only now. However, other than dh_apache2 no users of this feature were
+ known.
+ * Build the apache2.2-bin transitional package again, without it updates from
+ Squeeze are broken from some use cases
+ * Remove 2.2's postrm script only if we're actually upgrading.
+ This previously didn't have bad side-effects, but caused a disturbing
+ warning.
+
+ [ Stefan Fritsch ]
+ * Import lots of bug fixes from upstream svn: All code changes from branch
+ 2.4.x up to r1307835, plus r1294306 and r1307067 from trunk.
+ * CVE-2012-0216: Remove /usr/share/doc alias from default virtual hosts'
+ configs.
+ * Add 'Multi-Arch: foreign' to apache2-utils
+ * Make a2enconf and a2ensite warn if dependencies are not fullfilled.
+
+ -- Stefan Fritsch <sf at debian.org> Sun, 01 Apr 2012 21:11:51 +0200
+
+apache2 (2.4.1-2) experimental; urgency=low
+
+ [ Arno Töll ]
+ * Shift convert_docs script to a arch-indep target only. Debhelper does not
+ build apache2-doc on binary only builds causing a FTBS on binary-only (-B)
+ builds
+ * Raise debhelper build-dependency to 8.9.7~ due to the use of arch-indep
+ targets
+
+ [ Stefan Fritsch ]
+ * dh_apache2: Make autoscripts only run on upgrades by default. Bump
+ debhelper dependency of apache2-dev. Escape slashes in conditionals.
+
+ -- Stefan Fritsch <sf at debian.org> Tue, 20 Mar 2012 21:32:43 +0100
+
+apache2 (2.4.1-1) experimental; urgency=low
+
+ * Package the coming up 2.4 branch of Apache by packaging the current
+ GA release 2.4.1.
+ + Fix "IndexIgnore only allowes to add in vhost context, not replace"
+ (Closes: #296886)
+ + Fix "mod_status stats are wrong." (Closes: #519322)
+ + Fix "PNG DirectoryIndex icons transparancy messed up" (Closes: #233047)
+ + Fix "apache2-common: there should be a possibility to access the
+ parsed configuration" (Closes: #350285)
+ + Fix "AddOutputFilterByType is deprecated but used in deflate.conf"
+ (Closes: #601033)
+ + Fixes "Renegotiation on POST request fails intermittently"
+ (Closes: #601606)
+ + Allows configuring source address for proxy requests. (Closes: #465283)
+ + Supports CONNECT request through https. (Closes: #307298)
+ + New Upstream (2.4). (Closes: #662115)
+
+ * Refresh patches but leave all hunks unchanged where possible. Give all
+ * patches a ".patch" suffix, drop sequence numbers as they are not needed when
+ * using quilt. Notable changes are.
+ + [AT] 202_suexec-custom: Keep functionality as is, but rewrite smaller
+ parts of the patch to build two binaries: suexec-pristine and
+ suexec-custom (see below)
+ + [AT] 201_build_suexec-custom: Patch the makefile to build
+ "suexec-pristine" instead. Aside of that, refresh hunks.
+ + [AT] 010_fhs_compliance: Drop config.layout patches. These have been
+ applied upstream
+ + [JMV] Drop patches:
+ + 004_usr_bin_perl_0wnz_j00: printenv exemple doesn't refer to
+ /usr/local/bin/perl anymore
+ + 008_make_include_safe: Include doesn't support directory anymore.
+ Include dir/*.conf must be used.
+ + 009_apache2_has_dso: Upstream is no longer testing DSO is available. So
+ we don't need to remove that test anymore.
+ + [AT] customize_apxs.patch: Aggregate changes from various apxs2 patches,
+ drop obsolete hunks
+
+ [ Arno Töll ]
+
+ * Rewrite most parts of debian/rules / debhelper configuration.
+ + move cronjob and init script to debhelper configuration files
+ (apache2.cron.daily and apache2.init respectively)
+ + move man pages to debian/manpages
+ + Remove Ubuntu hacks in debian/rules, we expect them to carry Ubuntu
+ specifics in their own patch set, as it diverges already anyway.
+ + shake-up files installed in different packages
+ + Do not copy the source tree anymore, build package in place.
+ * Push standards version to 3.9.3 - no special changes required
+ * Refactor binary packages, now as things simplified. MPMs are simple
+ modules now, they can be bundled into the same binary package which do not
+ need to conflict with each other. Thus, Apache now primarily consists of the
+ following packages:
+ + apache2 - configuration files and init scripts, Debian specific helper
+ scripts
+ + apache2-bin - binaries and modules
+ + apache2-data - error pages and images
+ * Drop the ITK MPM entirely for now
+ * Consolidate development packages. As MPM packages are gone, we do not need
+ specific development packages either. Thus, drop all MPM specific apache2
+ development packages and provide a single apache2-dev package instead.
+ (Closes: #428095)
+ * Drop debian/source/options again: We do not need to ignore .svn directories
+ anymore since the new package management system is based on git and includes
+ the full source
+ * Rework the suexec mechanism. Now there are two suexec packages providing
+ alternatives through the update-alternatives mechanism. The untouched
+ upstream "suexec" binary is provided by the apache2-suexec-pristine package,
+ whereas the configurable suexec can be found in the apache2-suexec-custom
+ package. Both are providing the "suexec" binary which are managed by the
+ update-alternatives(9) mechanism.
+ This change is transparent to users at runtime and does not need any
+ configuration changes.
+ * Remove obsolete README.source file.
+ * Update doc-base metadata for the apache2-doc package
+ * Changes in the default configuration (not specific modules):
+ + On the head of the apache2.conf configuration file, give a short summary
+ how configuration of the Apache web server works in Debian.
+ + Drop NameVirtualHost entirely. It is deprecated (Closes: #511594)
+ + Remove DefaultType. It is deprecated.
+ + Replace Allow/Deny directives in the default configuration by using the
+ new Require directive. Load mod_access_compat if you rely on the old
+ syntax
+ + Replace LockFile by Mutex which consolidates all lock file
+ synchronization files among modules
+ + Update configuration to use the new IncludeOptional syntax
+ + Enable these modules by default: authz_core authz_host alias cgi dir
+ + Move MPM specific configuration to their respective configuration files.
+ Users can just load and unload MPMs like other modules, enable the worker
+ MPM by default
+ + Move per-site global configuration from conf.d to conf-available and
+ manage it similar to modules and sites. To do so, the new tools
+ "a2enconf" and "a2disconf" are provided. Moreover, such configuration
+ files need to have a .conf suffix now. The following configuration
+ files are enabled by default: charset localized-error-pages
+ other-vhosts-access-log security. These were enabled by default
+ previously, too (Closes: #620347, Closes: #605227).
+ This holds for apache2-doc as well, which is still enabled by default but
+ can be disabled easily anytime by using a2disconf (Closes: #604980).
+ + Give site configuration a .conf suffix, too. For example the default vhost
+ is called default.conf. Moreover, files without .conf suffix are ignored
+ upon startup. Please update your site links and confs. Also rename the
+ default vhost to 000-default.conf and don't do hacky things in a2enmod
+ anymore.
+ * Changes in a2enmod:
+ + Parse "Conflicts: " header to denote conflicts between modules which
+ cannot be loaded into the same Apache server.
+ + Remove dangling "module.conf" files, too. They were forgotten previously
+ if they existed and only the "module.load" file was removed.
+ + Extend the tool to support conf-available/conf-enabled directories (see
+ also configuration changes).
+ + Expect a .conf suffix for sites-enabled/sites-available configurations.
+ + Remove the default vhost special handling. Instead, we expect the default
+ host to be named appropripriately (for example 000-default.conf;
+ Closes: #605535).
+ * The following modules and associated configuration files were removed:
+ + mod_authz_default and mod_authn_default: Please use a proper
+ authentication module instead
+ + mod_mem_cache: Use mod_cache_disk instead
+ * The following modules and associated configuration files are provided (but
+ not enabled by default):
+ access_compat, allowmethods, authz_dbd, cache_disk, data, log_debug, lua
+ proxy_express, proxy_fcgi, proxy_fdpass, proxy_html, ratelimit, reflector
+ remoteip, request, session, session_cookie, session_crypto, session_dbd
+ (Closes: #400881)
+ * Provide a dh_apache2 debhelper which can be used by reverse dependencies to
+ install modules, module configuration files, site configuration files and
+ global configuration files which need to be registered to the Apache web
+ server.
+ Thus, dh_apache2 can be used for Apache web server modules and web
+ applications providing configuration files for Apache.
+ * Write apache2-maintscript-helper which packagers can use to interface in a
+ reliable way with the Apache 2 web server in maintainer scripts
+ * Document programming hints how to interface with the Apache 2 web server for
+ * packagers of web applications and module maintainer in
+ /usr/share/doc/apache2/PACKAGING.gz.
+ * Fix the watch file, thanks to Jean-Michel Vourgère for pointing out the
+ problem.
+ * Update debian/copyright and switch it to the copyright-format 1.0 (formerly
+ known as DEP5)
+
+ [ Stefan Fritsch ]
+
+ * Use "dh --with autotools_dev" instead of patching config.sub/config.guess.
+ * Only include conf.d/*.conf, not conf.d/*.
+ * Don't create httpd.conf anymore. Also, do a proper transition of existing
+ httpd.conf files to /etc/apache2/conf-available (Closes: #639383)
+ * Add "AddCharset" for .brf files in default mod_mime config.
+ (Closes: #402567)
+ * Update the README.Debian file
+
+ [ Jean-Michel Vourgère ]
+
+ * Update bash completion functions to reflect the new site setup. (Closes:
+ #657492)
+ * Migrate patches to DEP-3 format. For particular changes see the summary
+ above.
+
+ -- Stefan Fritsch <sf at debian.org> Mon, 19 Mar 2012 10:46:02 +0100
+
apache2 (2.2.22-3) unstable; urgency=low
* Fix "FTBFS: mkdir: cannot create directory `debian/build-tree/arch':
@@@ -312,22 -40,22 +334,22 @@@ apache2 (2.2.22-2) unstable; urgency=lo
-- Stefan Fritsch <sf at debian.org> Thu, 15 Mar 2012 00:02:31 +0100
-apache2 (2.2.22-1) unstable; urgency=medium
+apache2 (2.2.22-1) unstable; urgency=low
- [ Stefan Fritsch ]
- * New upstream release, urgency medium due to security fixes:
- - Fix CVE-2012-0021: mod_log_config: DoS with '%{cookiename}C' log format
- - Fix CVE-2012-0031: Unprivileged child process could cause the parent to
- crash at shutdown
- - Fix CVE-2012-0053: Exposure of "httpOnly" cookies in code 400 error
- message.
- * Move httxt2dbm to apache2-utils
- * Adjust debian/control to point to new git repository.
-
- [ Arno Töll ]
- * Fix "typo in /etc/apache2/apache2.conf" (Closes: #653801)
+ [ Stefan Fritsch ]
+ * New upstream release, urgency medium due to security fixes:
+ - Fix CVE-2012-0021: mod_log_config: DoS with '%{cookiename}C' log format
+ - Fix CVE-2012-0031: Unprivileged child process could cause the parent to
+ crash at shutdown
+ - Fix CVE-2012-0053: Exposure of "httpOnly" cookies in code 400 error
+ message.
+ * Move httxt2dbm to apache2-utils
+ * Adjust debian/control to point to new git repository.
+
+ [ Arno Töll ]
+ * Fix "typo in /etc/apache2/apache2.conf" (Closes: #653801)
- -- Stefan Fritsch <sf at debian.org> Wed, 01 Feb 2012 21:49:04 +0100
+ -- Stefan Fritsch <sf at debian.org> Wed, 01 Feb 2012 21:49:04 +0100
apache2 (2.2.21-5) unstable; urgency=low
diff --combined debian/patches/dlopen_search_path.patch
index 0000000,54671c3..54671c3
mode 000000,100644..100644
--- a/debian/patches/dlopen_search_path.patch
+++ b/debian/patches/dlopen_search_path.patch
@@@ -1,0 -1,145 +1,145 @@@
+ Backport r1332378 from upstream trunk:
+
+ If a filename without slashes is specified for LoadFile or
+ LoadModule and the file cannot be found in the server root directory,
+ try to use the standard dlopen() search path.
+
+ git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1332378 13f79535-47bb-0310-9956-ffa450edef68
+ ---
+ modules/mappers/mod_so.c | 77 ++++++++++++++++++++++++++--------------------
+ 1 file changed, 43 insertions(+), 34 deletions(-)
+
+ diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c
+ index 2d4a54c..6a9fdae 100644
+ --- a/modules/mappers/mod_so.c
+ +++ b/modules/mappers/mod_so.c
+ @@ -144,6 +144,37 @@ static apr_status_t unload_module(void *data)
+ return APR_SUCCESS;
+ }
+
+ +static const char *dso_load(cmd_parms *cmd, apr_dso_handle_t **modhandlep,
+ + const char *filename, const char **used_filename)
+ +{
+ + int retry = 0;
+ + const char *fullname = ap_server_root_relative(cmd->temp_pool, filename);
+ + char my_error[256];
+ + if (filename != NULL && ap_strchr_c(filename, '/') == NULL) {
+ + /* retry on error without path to use dlopen()'s search path */
+ + retry = 1;
+ + }
+ +
+ + if (fullname == NULL && !retry) {
+ + return apr_psprintf(cmd->temp_pool, "Invalid %s path %s",
+ + cmd->cmd->name, filename);
+ + }
+ + *used_filename = fullname;
+ + if (apr_dso_load(modhandlep, fullname, cmd->pool) == APR_SUCCESS) {
+ + return NULL;
+ + }
+ + if (retry) {
+ + *used_filename = filename;
+ + if (apr_dso_load(modhandlep, filename, cmd->pool) == APR_SUCCESS)
+ + return NULL;
+ + }
+ +
+ + return apr_pstrcat(cmd->temp_pool, "Cannot load ", filename,
+ + " into server: ",
+ + apr_dso_error(*modhandlep, my_error, sizeof(my_error)),
+ + NULL);
+ +}
+ +
+ /*
+ * This is called for the directive LoadModule and actually loads
+ * a shared object file into the address space of the server process.
+ @@ -155,7 +186,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
+ apr_dso_handle_t *modhandle;
+ apr_dso_handle_sym_t modsym;
+ module *modp;
+ - const char *szModuleFile = ap_server_root_relative(cmd->pool, filename);
+ + const char *module_file;
+ so_server_conf *sconf;
+ ap_module_symbol_t *modi;
+ ap_module_symbol_t *modie;
+ @@ -168,11 +199,6 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
+ */
+ *(ap_directive_t **)dummy = NULL;
+
+ - if (!szModuleFile) {
+ - return apr_pstrcat(cmd->pool, "Invalid LoadModule path ",
+ - filename, NULL);
+ - }
+ -
+ /*
+ * check for already existing module
+ * If it already exists, we have nothing to do
+ @@ -235,16 +261,11 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
+ /*
+ * Load the file into the Apache address space
+ */
+ - if (apr_dso_load(&modhandle, szModuleFile, cmd->pool) != APR_SUCCESS) {
+ - char my_error[256];
+ -
+ - return apr_pstrcat(cmd->pool, "Cannot load ", szModuleFile,
+ - " into server: ",
+ - apr_dso_error(modhandle, my_error, sizeof(my_error)),
+ - NULL);
+ - }
+ + error = dso_load(cmd, &modhandle, filename, &module_file);
+ + if (error)
+ + return error;
+ ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, cmd->pool,
+ - "loaded module %s", modname);
+ + "loaded module %s from %s", modname, module_file);
+
+ /*
+ * Retrieve the pointer to the module structure through the module name:
+ @@ -255,7 +276,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
+ char my_error[256];
+
+ return apr_pstrcat(cmd->pool, "Can't locate API module structure `",
+ - modname, "' in file ", szModuleFile, ": ",
+ + modname, "' in file ", module_file, ": ",
+ apr_dso_error(modhandle, my_error, sizeof(my_error)),
+ NULL);
+ }
+ @@ -272,7 +293,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
+ "is garbled - expected signature %08lx but saw "
+ "%08lx - perhaps this is not an Apache module DSO, "
+ "or was compiled for a different Apache version?",
+ - modname, szModuleFile,
+ + modname, module_file,
+ MODULE_MAGIC_COOKIE, modp->magic);
+ }
+
+ @@ -307,26 +328,14 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
+ static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename)
+ {
+ apr_dso_handle_t *handle;
+ - const char *file;
+ -
+ - file = ap_server_root_relative(cmd->pool, filename);
+ + const char *used_file, *error;
+
+ - if (!file) {
+ - return apr_pstrcat(cmd->pool, "Invalid LoadFile path ",
+ - filename, NULL);
+ - }
+ -
+ - if (apr_dso_load(&handle, file, cmd->pool) != APR_SUCCESS) {
+ - char my_error[256];
+ -
+ - return apr_pstrcat(cmd->pool, "Cannot load ", filename,
+ - " into server: ",
+ - apr_dso_error(handle, my_error, sizeof(my_error)),
+ - NULL);
+ - }
+ + error = dso_load(cmd, &handle, filename, &used_file);
+ + if (error)
+ + return error;
+
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
+ - "loaded file %s", filename);
+ + "loaded file %s", used_file);
+
+ return NULL;
+ }
diff --combined debian/patches/series
index f5dffe0,baf225d..5016025
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,14 -1,32 +1,15 @@@
-004_usr_bin_perl_0wnz_j00
-008_make_include_safe
-009_apache2_has_dso
-010_fhs_compliance
-031_apxs2_sucks_more
-032_suexec_is_shared
-033_dbm_read_hash_or_btree
-034_apxs2_libtool_fixtastic
-038_no_LD_LIBRARY_PATH
-045_suexec_log_cloexec
-047_fix_usage_message
-052_logresolve_linelength
-057_disablemods
-058_suexec-CVE-2007-1742
-067_fix_segfault_in_ab
-071_fix_cacheenable
-073_mod_dav_trunk_fixes
-074_link_support_progs_with_lcrypt
-075_mod_rewrite_literal_ipv6_redirect
-076_apxs2_a2enmod
-077_CacheIgnoreURLSessionIdentifiers
-079_polish_translation
-082_ab_num_requests
-083_dlopen_search_path
-099_config_guess_sub_update
-201_build_suexec-custom
+#make_include_safe.patch # Probably to be droped in 2.4
+fhs_compliance.patch
+#suexec_is_shared.patch # Probably not needed in 2.4
+dbm_read_hash_or_btree.patch
+no_LD_LIBRARY_PATH.patch
+suexec-CVE-2007-1742.patch
+customize_apxs.patch
+build_suexec-custom.patch
++dlopen_search_path
# 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.
# If you're aware of that you can uncomment it at any time later and work on it
# as you wish.
-#202_suexec-custom
+#suexec-custom.patch
--
Debian packaging for apache2 (Apache HTTPD 2.x)
More information about the Pkg-apache-commits
mailing list