summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2016-05-29 13:08:52 +0200
committerStefan Fritsch <sf@sfritsch.de>2016-05-29 13:09:35 +0200
commitf42eb7853bee26daccc50977e363c6efbed601bf (patch)
tree2ed413a137b3b28d042089285bbe9d1118285a42
parent1314e70a47177a55cdb01821b2c5196550fd32be (diff)
downloadapache2-f42eb7853bee26daccc50977e363c6efbed601bf.tar.gz
Re-introduce mod_imagemap and mod_cern_meta
-rw-r--r--debian/changelog1
-rw-r--r--debian/config-dir/mods-available/cern_meta.load1
-rw-r--r--debian/config-dir/mods-available/imagemap.load1
-rwxr-xr-xdebian/rules2
4 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index fa70401a..0e7667c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ apache2 (2.4.20-3) UNRELEASED; urgency=low
* Fix conffiles that may have got the wrong content during upgrade from
wheezy to early jessie versions. Closes: #794933
+ * Re-introduce mod_imagemap and mod_cern_meta. Closes: #786657
* Set SHELL=/bin/bash during configure to get reproducible builds regardless
of where /bin/sh points to.
diff --git a/debian/config-dir/mods-available/cern_meta.load b/debian/config-dir/mods-available/cern_meta.load
new file mode 100644
index 00000000..bcc7546a
--- /dev/null
+++ b/debian/config-dir/mods-available/cern_meta.load
@@ -0,0 +1 @@
+LoadModule cern_meta_module /usr/lib/apache2/modules/mod_cern_meta.so
diff --git a/debian/config-dir/mods-available/imagemap.load b/debian/config-dir/mods-available/imagemap.load
new file mode 100644
index 00000000..0fd55f8a
--- /dev/null
+++ b/debian/config-dir/mods-available/imagemap.load
@@ -0,0 +1 @@
+LoadModule imagemap_module /usr/lib/apache2/modules/mod_imagemap.so
diff --git a/debian/rules b/debian/rules
index 8556adcd..91e086da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,7 +99,7 @@ override_dh_auto_configure: generate-maintainer-scripts prebuild-checks support/
--with-pcre=yes \
--enable-pie \
--enable-mpms-shared=all \
- --enable-mods-shared="all cgi ident authnz_fcgi" \
+ --enable-mods-shared="all cgi ident authnz_fcgi imagemap cern_meta" \
--enable-mods-static="unixd logio watchdog version" \
CFLAGS="$(AP2_CFLAGS)" CPPFLAGS="$(AP2_CPPFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" \
LTFLAGS="$(AP2_LTFLAGS)" SHELL=/bin/bash