From 9e6b13569844c3f476f9da20b670e5d33e474dd6 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Fri, 6 Oct 2017 12:11:35 +0200
Subject: [PATCH] =?UTF-8?q?[fix]=C2=A0fixing=20Wheezy=20patches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wheezy/alternc.install.diff | 14 ++++++++------
 wheezy/control.diff         | 16 ++++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/wheezy/alternc.install.diff b/wheezy/alternc.install.diff
index 8d7987d0..e8aaae24 100644
--- a/wheezy/alternc.install.diff
+++ b/wheezy/alternc.install.diff
@@ -1,6 +1,8 @@
---- alternc.install.squeeze	2016-05-27 14:25:52.239693435 +0200
-+++ alternc.install	2016-05-27 14:24:05.908974433 +0200
-@@ -79,7 +79,7 @@
+diff --git a/install/alternc.install b/install/alternc.install
+index b9691b0..2ee07b8 100644
+--- alternc.install.squeeze
++++ alternc.install
+@@ -79,7 +79,7 @@ if [ -e /etc/default/saslauthd ]; then
  fi
  
  if [ -e /etc/dovecot/dovecot.conf ]; then
@@ -9,7 +11,7 @@
  fi
  
  INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz"
-@@ -316,7 +316,7 @@
+@@ -317,7 +317,7 @@ if [ -x /usr/sbin/apache2 ]; then
          fi
  
  	# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
@@ -18,7 +20,7 @@
  
      else
          # We disable proftpd tls module
-@@ -325,7 +325,7 @@
+@@ -326,7 +326,7 @@ if [ -x /usr/sbin/apache2 ]; then
          cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
  
  	# We disable dovecot SSL certificate instructions: (on wheezy we should remove a file in /etc/dovecot/conf.d/ )
@@ -27,7 +29,7 @@
  
          echo "SSL not configured"
          echo "create a certificate in /etc/alternc/apache.pem and rerun alternc.install"
-@@ -573,9 +573,11 @@
+@@ -574,9 +574,11 @@ if [ "$HAS_ROOT" != "1" ]; then
      fi
  fi
  
diff --git a/wheezy/control.diff b/wheezy/control.diff
index ca62e43a..3e6d38b0 100644
--- a/wheezy/control.diff
+++ b/wheezy/control.diff
@@ -1,8 +1,8 @@
---- control.squeeze	2016-05-27 14:30:23.182580393 +0200
-+++ control	2016-05-27 14:32:08.785264702 +0200
-@@ -39,16 +39,19 @@
+--- control.squeeze	2017-10-06 12:01:52.272243664 +0200
++++ control	2017-10-06 12:03:02.016307914 +0200
+@@ -38,16 +38,19 @@
+        , sudo
         , adduser
-        , mysql-client
         , dnsutils
 -       , dovecot-common (>=1:1.2.15)
 -       , dovecot-common(<< 1:2.0)
@@ -21,12 +21,12 @@
 +       , opendkim-tools
 +       , dovecot-sieve
 +       , dovecot-managesieved
-        , mysql-client(>= 5.0)
+        , mysql-client(>= 5.0) | mariadb-client
         , php5-curl
         , quota
-@@ -124,15 +127,18 @@
+@@ -123,15 +126,18 @@
+          , gettext (>= 0.10.40-5)
           , adduser
-          , mysql-client
           , sudo
 -         , dovecot-common (>=1:1.2.15)
 -         , dovecot-common(<< 1:2.0)
@@ -44,6 +44,6 @@
 +         , opendkim-tools
 +         , dovecot-sieve
 +         , dovecot-managesieved
-          , mysql-client(>= 5.0)
+          , mysql-client(>= 5.0) | mariadb-client
           , php5-curl
           , ${misc:Depends}