Introduce apache2-ssl-dev package

This allows most modules to build without dealing with the libssl-dev
mess.

5 files changed, 33 insertions, 3 deletions

diff --git a/debian/PACKAGING b/debian/PACKAGING
index 0bbb06c4..24b80dfb 100644
--- a/debian/PACKAGING
+++ b/debian/PACKAGING
@@ -69,6 +69,11 @@ interface. If an updated package is not buildable with Apache 2.2 anymore, the
 apache2-dev build-dependency should be versioned ">> 2.4~", because older
 versions of apache2-threaded-dev did provide apache2-dev.
 
+A module package that uses openssl specific interfaces in mod_ssl, either by
+using the mod_ssl_openssl.h header, or by using mod_ssl-internal private
+interfaces (don't do that!), must build-depend on apache2-ssl-dev to ensure
+that the correct version of the openssl headers are used.
+
 The resulting binary package should be called libapache2-mod-<modulename> and
 MUST NOT depend on apache2 or apache2-bin. Instead a module package must depend
 on our virtual package providing the module magic number which denotes the ABI
diff --git a/debian/apache2-ssl-dev.install b/debian/apache2-ssl-dev.install
new file mode 100644
index 00000000..5ba2e5e0
--- /dev/null
+++ b/debian/apache2-ssl-dev.install
@@ -0,0 +1 @@
+/usr/include/apache2/mod_ssl_openssl.h
diff --git a/debian/changelog b/debian/changelog
index dbd548a4..754dbf0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apache2 (2.4.23-8) UNRELEASED; urgency=medium
+
+  * Move the mod_ssl_openssl.h header and the dependency on libssl-dev to a
+    new package apache2-ssl-dev.  Packages that interface with openssl
+    state from mod_ssl must build-depend on this new package.
+    This will help to disentangle the build-deps in the openssl transition.
+    Closes: #845033
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 19 Nov 2016 23:55:28 +0100
+
 apache2 (2.4.23-7) unstable; urgency=medium
 
   * Make apache2-dev depend on openssl 1.0, too. Closes: #844160
diff --git a/debian/control b/debian/control
index d0294513..d7b18dc4 100644
--- a/debian/control
+++ b/debian/control
@@ -120,8 +120,7 @@ Description: Apache HTTP Server (on-site documentation)
 
 Package: apache2-dev
 Architecture: any
-Depends: ${misc:Depends}, openssl,
- libapr1-dev, libaprutil1-dev, libssl1.0-dev | libssl-dev (<< 1.1),
+Depends: ${misc:Depends}, openssl, libapr1-dev, libaprutil1-dev,
  debhelper (>= 9), ${perl:Depends}
 Provides: dh-apache2
 Description: Apache HTTP Server (development headers)
@@ -139,6 +138,18 @@ Description: Apache HTTP Server (development headers)
   - Site configuration files
   - Global configuration files
 
+Package: apache2-ssl-dev
+Architecture: any
+Depends: ${misc:Depends}, apache2-dev (= ${binary:Version}),
+ libssl1.0-dev | libssl-dev (<< 1.1)
+Description: Apache HTTP Server (mod_ssl development headers)
+ The Apache HTTP Server Project's goal is to build a secure, efficient and
+ extensible HTTP server as standards-compliant open source software. The
+ result has long been the number one web server on the Internet.
+ .
+ This package provides the development header and the dependencies for
+ modules that interact with mod_ssl's internal openssl state.
+
 Package: apache2-dbg
 Section: debug
 Priority: extra
diff --git a/debian/rules b/debian/rules
index f4af2da7..8b2e7680 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,7 +129,9 @@ else
 endif
 
 override_dh_install: clean-config-vars prepare-scripts debian/config-dir/apache2.conf
-	dh_install --list-missing
+	# don't install mod_ssl_openssl.h in apache2-dev
+	dh_install --list-missing -papache2-dev -Xopenssl
+	dh_install --list-missing --remaining-packages
 
 override_dh_fixperms-arch:
 	# standard suexec
@@ -166,6 +168,7 @@ override_dh_installdocs-indep:
 
 override_dh_installdocs-arch:
 	dh_installdocs --link-doc=apache2 -papache2 -papache2-dbg
+	dh_installdocs --link-doc=apache2-dev -papache2-ssl-dev
 	dh_installdocs -a
 
 override_dh_installchangelogs: