[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 9ab7c89a2f83bae78e2ad16d5e75b181ffb25467

[Arno Töll]

The following commit has been merged in the next branch:
commit 3929b434d52510f8089b6c2629f10b6866081243
Author: Jean-Michel Vourgère <jmv_deb at nirgal.com>
Date:   Sat Feb 25 14:17:08 2012 +0100

    Drop patch 009
    
    Upstream is no longer testing DSO is available.
    So we don't need to remove that test anymore.
    
    Signed-off-by: Arno Töll <debian at toell.net>

diff --git a/debian/patches/009_apache2_has_dso b/debian/patches/009_apache2_has_dso
deleted file mode 100755
index 24b2cd3..0000000
--- a/debian/patches/009_apache2_has_dso
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 009_apache2_has_dso by Adam Conrad <adconrad at 0c3.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make apxs usable without having apache2 installed.
-
- at DPATCH@
---- a/support/apxs.in
-+++ b/support/apxs.in
-@@ -198,18 +198,19 @@
-     ($httpd = $0) =~ s:support/apxs$::;
- }
- 
--unless (-x "$httpd") {
--	error("$httpd not found or not executable");
--	exit 1;
--}
-+#commented out for Debian GNU/Linux. We know that apache2 has dso support
-+#unless (-x "$httpd") {
-+#	error("$httpd not found or not executable");
-+#	exit 1;
-+#}
- 
--unless (grep /mod_so/, `. $envvars && $httpd -l`) {
--    error("Sorry, no shared object support for Apache");
--    error("available under your platform. Make sure");
--    error("the Apache module mod_so is compiled into");
--    error("your server binary `$httpd'.");
--    exit 1;
--}
-+#unless (grep /mod_so/, `. $envvars && $httpd -l`) {
-+#    error("Sorry, no shared object support for Apache");
-+#    error("available under your platform. Make sure");
-+#    error("the Apache module mod_so is compiled into");
-+#    error("your server binary `$httpd'.");
-+#    exit 1;
-+#}
- 
- sub get_config_vars{
-     my ($file, $rh_config) = @_;
diff --git a/debian/patches/series b/debian/patches/series
index c4ba807..5f7b7a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 #008_make_include_safe
-#009_apache2_has_dso
 010_fhs_compliance
 #031_apxs2_sucks_more
 #032_suexec_is_shared

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)