[apache2] 01/02: Revert "Switch to openssl 1.1" for now

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit 247b5cc9a79efe49bb31055f48ae3c1b19953349
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Jul 16 15:18:43 2017 +0200

    Revert "Switch to openssl 1.1" for now
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f93f012..3fd188b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.27-2) UNRELEASED; urgency=medium
+
+  * Switch back to openssl 1.0 for now. The transition to 1.1 needs more
+    work and should go into experimental, first. Reopens: #851094
+
+ -- Stefan Fritsch <sf at debian.org>  Sun, 16 Jul 2017 15:19:02 +0200
+
 apache2 (2.4.27-1) unstable; urgency=medium
 
   [ New upstream release ]
diff --git a/debian/control b/debian/control
index fa96a39..f7e875a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Stefan Fritsch <sf at debian.org>, Arno Töll <arno at debian.org>
 Build-Depends: debhelper (>= 9.20131213~), lsb-release, dpkg-dev (>= 1.16.1~),
  libaprutil1-dev (>= 1.5.0), libapr1-dev (>= 1.5.0), libpcre3-dev, zlib1g-dev,
- libnghttp2-dev, libssl-dev (>= 1.1), perl,
+ libnghttp2-dev, libssl1.0-dev | libssl-dev (<< 1.1), perl,
  liblua5.2-dev, libxml2-dev, autotools-dev, gawk | awk,
  dh-systemd
 Build-Conflicts: autoconf2.13
@@ -141,7 +141,7 @@ Description: Apache HTTP Server (development headers)
 Package: apache2-ssl-dev
 Architecture: any
 Depends: ${misc:Depends}, apache2-dev (= ${binary:Version}),
- libssl-dev (>= 1.1)
+ 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git