[fix] fixing Wheezy patches

This commit is contained in:
Benjamin Sonntag 2017-10-06 12:11:35 +02:00
parent 39947d4f1c
commit 9e6b135698
2 changed files with 16 additions and 14 deletions

View File

@ -1,6 +1,8 @@
--- alternc.install.squeeze 2016-05-27 14:25:52.239693435 +0200 diff --git a/install/alternc.install b/install/alternc.install
+++ alternc.install 2016-05-27 14:24:05.908974433 +0200 index b9691b0..2ee07b8 100644
@@ -79,7 +79,7 @@ --- alternc.install.squeeze
+++ alternc.install
@@ -79,7 +79,7 @@ if [ -e /etc/default/saslauthd ]; then
fi fi
if [ -e /etc/dovecot/dovecot.conf ]; then if [ -e /etc/dovecot/dovecot.conf ]; then
@ -9,7 +11,7 @@
fi fi
INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz" 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 fi
# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ ) # We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
@ -18,7 +20,7 @@
else else
# We disable proftpd tls module # 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/ 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/ ) # 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 "SSL not configured"
echo "create a certificate in /etc/alternc/apache.pem and rerun alternc.install" 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
fi fi

View File

@ -1,8 +1,8 @@
--- control.squeeze 2016-05-27 14:30:23.182580393 +0200 --- control.squeeze 2017-10-06 12:01:52.272243664 +0200
+++ control 2016-05-27 14:32:08.785264702 +0200 +++ control 2017-10-06 12:03:02.016307914 +0200
@@ -39,16 +39,19 @@ @@ -38,16 +38,19 @@
, sudo
, adduser , adduser
, mysql-client
, dnsutils , dnsutils
- , dovecot-common (>=1:1.2.15) - , dovecot-common (>=1:1.2.15)
- , dovecot-common(<< 1:2.0) - , dovecot-common(<< 1:2.0)
@ -21,12 +21,12 @@
+ , opendkim-tools + , opendkim-tools
+ , dovecot-sieve + , dovecot-sieve
+ , dovecot-managesieved + , dovecot-managesieved
, mysql-client(>= 5.0) , mysql-client(>= 5.0) | mariadb-client
, php5-curl , php5-curl
, quota , quota
@@ -124,15 +127,18 @@ @@ -123,15 +126,18 @@
, gettext (>= 0.10.40-5)
, adduser , adduser
, mysql-client
, sudo , sudo
- , dovecot-common (>=1:1.2.15) - , dovecot-common (>=1:1.2.15)
- , dovecot-common(<< 1:2.0) - , dovecot-common(<< 1:2.0)
@ -44,6 +44,6 @@
+ , opendkim-tools + , opendkim-tools
+ , dovecot-sieve + , dovecot-sieve
+ , dovecot-managesieved + , dovecot-managesieved
, mysql-client(>= 5.0) , mysql-client(>= 5.0) | mariadb-client
, php5-curl , php5-curl
, ${misc:Depends} , ${misc:Depends}