Rename patch directories to reflect the distributions they patch towards
This commit is contained in:
parent
83a4bad18e
commit
6a2179691e
|
|
@ -1,15 +0,0 @@
|
||||||
diff --git a/debian/changelog b/debian/changelog
|
|
||||||
index 3ed86856..75cd7999 100644
|
|
||||||
--- a/debian/changelog
|
|
||||||
+++ b/debian/changelog
|
|
||||||
@@ -1,10 +1,3 @@
|
|
||||||
-alternc (3.3.10) stable; urgency=low
|
|
||||||
-
|
|
||||||
- * Version identical to 3.1 for Squeeze
|
|
||||||
- * Includes small patches / dependency for apache & dovecot 2.0 for Jessie
|
|
||||||
-
|
|
||||||
- -- Benjamin Sonntag <benjamin@sonntag.fr> Fri, 15 Jan 2016 15:26:00 +0100
|
|
||||||
-
|
|
||||||
alternc (3.2.10) oldstable; urgency=low
|
|
||||||
|
|
||||||
* Version identical to 3.1 for Squeeze
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
diff --git a/debian/control b/debian/control
|
|
||||||
index 551f6171..ac10f87d 100644
|
|
||||||
--- a/debian/control
|
|
||||||
+++ b/debian/control
|
|
||||||
@@ -38,9 +38,9 @@ Depends: debianutils (>= 1.13.1)
|
|
||||||
, sudo
|
|
||||||
, adduser
|
|
||||||
, dnsutils
|
|
||||||
- , dovecot-core (>=1:2.1.7)
|
|
||||||
- , dovecot-imapd (>=1:2.1.7)
|
|
||||||
- , dovecot-pop3d (>=1:2.1.7)
|
|
||||||
+ , dovecot-common (>=1:2.1.7)
|
|
||||||
+ , dovecot-imapd
|
|
||||||
+ , dovecot-pop3d
|
|
||||||
, dovecot-mysql
|
|
||||||
, vlogger
|
|
||||||
, mailutils | mailx
|
|
||||||
@@ -126,9 +126,9 @@ Depends: debianutils (>= 1.13.1)
|
|
||||||
, gettext (>= 0.10.40-5)
|
|
||||||
, adduser
|
|
||||||
, sudo
|
|
||||||
- , dovecot-core (>=1:2.1.7)
|
|
||||||
- , dovecot-imapd (>=1:2.1.7)
|
|
||||||
- , dovecot-pop3d (>=1:2.1.7)
|
|
||||||
+ , dovecot-common (>=1:2.1.7)
|
|
||||||
+ , dovecot-imapd
|
|
||||||
+ , dovecot-pop3d
|
|
||||||
, dovecot-mysql
|
|
||||||
, vlogger
|
|
||||||
, mailutils | mailx
|
|
||||||
|
|
@ -1,7 +1,16 @@
|
||||||
diff --git a/install/alternc.install b/install/alternc.install
|
diff --git a/install/alternc.install b/install/alternc.install
|
||||||
index 95060b7c..5d92cf0c 100644
|
index 95060b7c..10bcbacc 100644
|
||||||
--- a/install/alternc.install
|
--- a/install/alternc.install
|
||||||
+++ b/install/alternc.install
|
+++ b/install/alternc.install
|
||||||
|
@@ -79,7 +79,7 @@ if [ -e /etc/default/saslauthd ]; then
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -e /etc/dovecot/dovecot.conf ]; then
|
||||||
|
- CONFIG_FILES="$CONFIG_FILES etc/dovecot/alternc-sql.conf etc/dovecot/alternc-dict-quota.conf etc/dovecot/conf.d/95_alternc.conf"
|
||||||
|
+ CONFIG_FILES="$CONFIG_FILES etc/dovecot/dovecot.conf etc/dovecot/dovecot-sql.conf etc/dovecot/dovecot-dict-quota.conf"
|
||||||
|
fi
|
||||||
|
|
||||||
|
INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz"
|
||||||
@@ -279,20 +279,12 @@ rm -f $SED_SCRIPT
|
@@ -279,20 +279,12 @@ rm -f $SED_SCRIPT
|
||||||
# Ad-hoc fixes
|
# Ad-hoc fixes
|
||||||
#
|
#
|
||||||
|
|
@ -38,7 +47,7 @@ index 95060b7c..5d92cf0c 100644
|
||||||
fi
|
fi
|
||||||
if ! [ -L /etc/apache2/mods-enabled/rewrite.load ]
|
if ! [ -L /etc/apache2/mods-enabled/rewrite.load ]
|
||||||
then
|
then
|
||||||
@@ -319,9 +311,8 @@ if [ -x /usr/sbin/apache2 ]; then
|
@@ -319,14 +311,13 @@ if [ -x /usr/sbin/apache2 ]; then
|
||||||
a2enmod ssl
|
a2enmod ssl
|
||||||
s="apache2"
|
s="apache2"
|
||||||
fi
|
fi
|
||||||
|
|
@ -50,7 +59,19 @@ index 95060b7c..5d92cf0c 100644
|
||||||
s="apache2"
|
s="apache2"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -340,13 +331,12 @@ if [ -x /usr/sbin/apache2 ]; then
|
# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
|
||||||
|
- ( echo "# Don't change this file, it will be overwriten by alternc.install. Change ssl parameters in a file named 99_ssl.conf instead" ; echo "ssl_cert = </etc/alternc/apache.pem" ; echo "ssl_key = </etc/alternc/apache.pem" ) >/etc/dovecot/conf.d/96_ssl.conf
|
||||||
|
+ sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
|
||||||
|
|
||||||
|
else
|
||||||
|
# We disable proftpd tls module
|
||||||
|
@@ -335,18 +326,17 @@ 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/ )
|
||||||
|
- ( echo "# Don't change this file, it will be overwriten by alternc.install. Change ssl parameters in a file named 99_ssl.conf instead" ; echo "ssl_cert = </etc/ssl/certs/ssl-cert-snakeoil.pem" ; echo "ssl_key = </etc/ssl/private/ssl-cert-snakeoil.key" ) >/etc/dovecot/conf.d/96_ssl.conf
|
||||||
|
+ sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
|
||||||
|
|
||||||
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"
|
||||||
fi
|
fi
|
||||||
|
|
@ -77,17 +98,25 @@ index 95060b7c..5d92cf0c 100644
|
||||||
|
|
||||||
# Configure PHPMyAdmin
|
# Configure PHPMyAdmin
|
||||||
include_str='include("/etc/alternc/phpmyadmin.inc.php")'
|
include_str='include("/etc/alternc/phpmyadmin.inc.php")'
|
||||||
@@ -598,9 +588,6 @@ chmod g+r /etc/dovecot/alternc-sql.conf
|
@@ -592,14 +582,9 @@ else
|
||||||
# Override some dovecot 2.0 configuration that may have happened during dovecot postinst:
|
mysql --defaults-file=/etc/alternc/my.cnf -e "UPDATE db_servers SET host='$MYSQL_HOST', login='$MYSQL_USER', password='$MYSQL_PASS', client='$MYSQL_HOST_CLIENT' WHERE name='Default';"
|
||||||
sed -i -e 's/^ *!include/#!include/' /etc/dovecot/conf.d/10-auth.conf
|
fi
|
||||||
|
|
||||||
|
-# giving vmail user read access on dovecot sql file
|
||||||
|
-chgrp vmail /etc/dovecot/alternc-sql.conf
|
||||||
|
-chmod g+r /etc/dovecot/alternc-sql.conf
|
||||||
|
-# Override some dovecot 2.0 configuration that may have happened during dovecot postinst:
|
||||||
|
-sed -i -e 's/^ *!include/#!include/' /etc/dovecot/conf.d/10-auth.conf
|
||||||
|
-
|
||||||
-# Changing owner of web panel's files
|
-# Changing owner of web panel's files
|
||||||
-chown -R alterncpanel:alterncpanel "/usr/share/alternc/panel/"
|
-chown -R alterncpanel:alterncpanel "/usr/share/alternc/panel/"
|
||||||
-
|
+#giving vmail user read access on dovecot sql file
|
||||||
|
+chgrp vmail /etc/dovecot/dovecot.conf
|
||||||
|
+chmod g+r /etc/dovecot/dovecot.conf
|
||||||
|
|
||||||
# We force the re-computing of the DNS zones, since we may have changed the IP address (see #460)
|
# We force the re-computing of the DNS zones, since we may have changed the IP address (see #460)
|
||||||
/usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='UPDATE' WHERE gesdns=1;"
|
/usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='UPDATE' WHERE gesdns=1;"
|
||||||
|
@@ -612,7 +597,7 @@ grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/ope
|
||||||
@@ -612,7 +599,7 @@ grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/ope
|
|
||||||
grep -q "^$PUBLIC_IP\$" /etc/opendkim/TrustedHosts || echo "$PUBLIC_IP" >>/etc/opendkim/TrustedHosts
|
grep -q "^$PUBLIC_IP\$" /etc/opendkim/TrustedHosts || echo "$PUBLIC_IP" >>/etc/opendkim/TrustedHosts
|
||||||
|
|
||||||
# Add opendkim to service to restart
|
# Add opendkim to service to restart
|
||||||
|
|
@ -96,7 +125,7 @@ index 95060b7c..5d92cf0c 100644
|
||||||
|
|
||||||
# hook
|
# hook
|
||||||
run-parts --arg=before-reload /usr/lib/alternc/install.d
|
run-parts --arg=before-reload /usr/lib/alternc/install.d
|
||||||
@@ -620,7 +607,7 @@ run-parts --arg=before-reload /usr/lib/alternc/install.d
|
@@ -620,7 +605,7 @@ run-parts --arg=before-reload /usr/lib/alternc/install.d
|
||||||
#######################################################################
|
#######################################################################
|
||||||
# Reload services
|
# Reload services
|
||||||
#
|
#
|
||||||
|
|
@ -105,7 +134,7 @@ index 95060b7c..5d92cf0c 100644
|
||||||
invoke-rc.d $service force-reload || true
|
invoke-rc.d $service force-reload || true
|
||||||
done
|
done
|
||||||
|
|
||||||
@@ -628,10 +615,6 @@ done
|
@@ -628,10 +613,6 @@ done
|
||||||
for service in $SERVICES; do
|
for service in $SERVICES; do
|
||||||
test -x /etc/init.d/$service && invoke-rc.d $service stop || true
|
test -x /etc/init.d/$service && invoke-rc.d $service stop || true
|
||||||
done
|
done
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
diff --git a/debian/changelog b/debian/changelog
|
||||||
|
index 3ed86856..943f76d2 100644
|
||||||
|
--- a/debian/changelog
|
||||||
|
+++ b/debian/changelog
|
||||||
|
@@ -1,17 +1,3 @@
|
||||||
|
-alternc (3.3.10) stable; urgency=low
|
||||||
|
-
|
||||||
|
- * Version identical to 3.1 for Squeeze
|
||||||
|
- * Includes small patches / dependency for apache & dovecot 2.0 for Jessie
|
||||||
|
-
|
||||||
|
- -- Benjamin Sonntag <benjamin@sonntag.fr> Fri, 15 Jan 2016 15:26:00 +0100
|
||||||
|
-
|
||||||
|
-alternc (3.2.10) oldstable; urgency=low
|
||||||
|
-
|
||||||
|
- * Version identical to 3.1 for Squeeze
|
||||||
|
- * Includes a small dovecot patch / dependency for dovecot 2.0 for Wheezy
|
||||||
|
-
|
||||||
|
- -- Benjamin Sonntag <benjamin@sonntag.fr> Fri, 15 Jan 2016 15:26:00 +0100
|
||||||
|
-
|
||||||
|
alternc (3.1.11) oldoldstable; urgency=low
|
||||||
|
|
||||||
|
* fix This is a big security upgrade of AlternC 3.x
|
||||||
|
|
@ -0,0 +1,51 @@
|
||||||
|
diff --git a/debian/control b/debian/control
|
||||||
|
index 551f6171..394506f9 100644
|
||||||
|
--- a/debian/control
|
||||||
|
+++ b/debian/control
|
||||||
|
@@ -38,19 +38,16 @@ Depends: debianutils (>= 1.13.1)
|
||||||
|
, sudo
|
||||||
|
, adduser
|
||||||
|
, dnsutils
|
||||||
|
- , dovecot-core (>=1:2.1.7)
|
||||||
|
- , dovecot-imapd (>=1:2.1.7)
|
||||||
|
- , dovecot-pop3d (>=1:2.1.7)
|
||||||
|
- , dovecot-mysql
|
||||||
|
+ , dovecot-common (>=1:1.2.15)
|
||||||
|
+ , dovecot-common(<< 1:2.0)
|
||||||
|
+ , dovecot-imapd (>= 1:1.2.15)
|
||||||
|
+ , dovecot-pop3d (>= 1:1.2.15)
|
||||||
|
, vlogger
|
||||||
|
, mailutils | mailx
|
||||||
|
, zip
|
||||||
|
, incron
|
||||||
|
, cron
|
||||||
|
, opendkim
|
||||||
|
- , opendkim-tools
|
||||||
|
- , dovecot-sieve
|
||||||
|
- , dovecot-managesieved
|
||||||
|
, mysql-client(>= 5.0) | mariadb-client
|
||||||
|
, php5-curl | php7.0-curl
|
||||||
|
, quota
|
||||||
|
@@ -126,18 +123,15 @@ Depends: debianutils (>= 1.13.1)
|
||||||
|
, gettext (>= 0.10.40-5)
|
||||||
|
, adduser
|
||||||
|
, sudo
|
||||||
|
- , dovecot-core (>=1:2.1.7)
|
||||||
|
- , dovecot-imapd (>=1:2.1.7)
|
||||||
|
- , dovecot-pop3d (>=1:2.1.7)
|
||||||
|
- , dovecot-mysql
|
||||||
|
+ , dovecot-common (>=1:1.2.15)
|
||||||
|
+ , dovecot-common(<< 1:2.0)
|
||||||
|
+ , dovecot-imapd (>= 1:1.2.15)
|
||||||
|
+ , dovecot-pop3d (>= 1:1.2.15)
|
||||||
|
, vlogger
|
||||||
|
, mailutils | mailx
|
||||||
|
, incron
|
||||||
|
, cron
|
||||||
|
, opendkim
|
||||||
|
- , opendkim-tools
|
||||||
|
- , dovecot-sieve
|
||||||
|
- , dovecot-managesieved
|
||||||
|
, mysql-client(>= 5.0) | mariadb-client
|
||||||
|
, php5-curl
|
||||||
|
, ${misc:Depends}
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
# reset your repos back to the serverside one!
|
# reset your repos back to the serverside one!
|
||||||
|
|
||||||
# The patch files were generated by running
|
# The patch files were generated by running
|
||||||
# REV_NEW=ebb3471f04d49dd839237608bafc396e8b5090e5 REV_OLD=3ae6c0a5c2eecf864319dd42afbfc995baee9f68 \
|
# export REV_NEW=ebb3471f04d49dd839237608bafc396e8b5090e5; export REV_OLD=d6d9be4c6a751279c9ad2a9b50aeb5d3ff1f91f9; \
|
||||||
# for i in `git diff --name-only $REV_NEW $REV_OLD` ; do BASE_NAME=`echo $i | rev | cut -d '/' -f 1 | rev` ; \
|
# for i in `git diff --name-only $REV_NEW $REV_OLD` ; do BASE_NAME=`echo $i | rev | cut -d '/' -f 1 | rev` ; \
|
||||||
# git diff -p $REV_NEW $REV_OLD -- "$i" > jessie/$BASE_NAME ; done
|
# git diff -p $REV_NEW $REV_OLD -- "$i" > jessie/$BASE_NAME ; done
|
||||||
|
|
||||||
|
|
@ -1,16 +1,7 @@
|
||||||
diff --git a/install/alternc.install b/install/alternc.install
|
diff --git a/install/alternc.install b/install/alternc.install
|
||||||
index 95060b7c..10bcbacc 100644
|
index 95060b7c..5d92cf0c 100644
|
||||||
--- a/install/alternc.install
|
--- a/install/alternc.install
|
||||||
+++ b/install/alternc.install
|
+++ b/install/alternc.install
|
||||||
@@ -79,7 +79,7 @@ if [ -e /etc/default/saslauthd ]; then
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e /etc/dovecot/dovecot.conf ]; then
|
|
||||||
- CONFIG_FILES="$CONFIG_FILES etc/dovecot/alternc-sql.conf etc/dovecot/alternc-dict-quota.conf etc/dovecot/conf.d/95_alternc.conf"
|
|
||||||
+ CONFIG_FILES="$CONFIG_FILES etc/dovecot/dovecot.conf etc/dovecot/dovecot-sql.conf etc/dovecot/dovecot-dict-quota.conf"
|
|
||||||
fi
|
|
||||||
|
|
||||||
INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz"
|
|
||||||
@@ -279,20 +279,12 @@ rm -f $SED_SCRIPT
|
@@ -279,20 +279,12 @@ rm -f $SED_SCRIPT
|
||||||
# Ad-hoc fixes
|
# Ad-hoc fixes
|
||||||
#
|
#
|
||||||
|
|
@ -47,7 +38,7 @@ index 95060b7c..10bcbacc 100644
|
||||||
fi
|
fi
|
||||||
if ! [ -L /etc/apache2/mods-enabled/rewrite.load ]
|
if ! [ -L /etc/apache2/mods-enabled/rewrite.load ]
|
||||||
then
|
then
|
||||||
@@ -319,14 +311,13 @@ if [ -x /usr/sbin/apache2 ]; then
|
@@ -319,9 +311,8 @@ if [ -x /usr/sbin/apache2 ]; then
|
||||||
a2enmod ssl
|
a2enmod ssl
|
||||||
s="apache2"
|
s="apache2"
|
||||||
fi
|
fi
|
||||||
|
|
@ -59,19 +50,7 @@ index 95060b7c..10bcbacc 100644
|
||||||
s="apache2"
|
s="apache2"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
|
@@ -340,13 +331,12 @@ if [ -x /usr/sbin/apache2 ]; then
|
||||||
- ( echo "# Don't change this file, it will be overwriten by alternc.install. Change ssl parameters in a file named 99_ssl.conf instead" ; echo "ssl_cert = </etc/alternc/apache.pem" ; echo "ssl_key = </etc/alternc/apache.pem" ) >/etc/dovecot/conf.d/96_ssl.conf
|
|
||||||
+ sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
|
|
||||||
|
|
||||||
else
|
|
||||||
# We disable proftpd tls module
|
|
||||||
@@ -335,18 +326,17 @@ 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/ )
|
|
||||||
- ( echo "# Don't change this file, it will be overwriten by alternc.install. Change ssl parameters in a file named 99_ssl.conf instead" ; echo "ssl_cert = </etc/ssl/certs/ssl-cert-snakeoil.pem" ; echo "ssl_key = </etc/ssl/private/ssl-cert-snakeoil.key" ) >/etc/dovecot/conf.d/96_ssl.conf
|
|
||||||
+ sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
|
|
||||||
|
|
||||||
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"
|
||||||
fi
|
fi
|
||||||
|
|
@ -98,25 +77,17 @@ index 95060b7c..10bcbacc 100644
|
||||||
|
|
||||||
# Configure PHPMyAdmin
|
# Configure PHPMyAdmin
|
||||||
include_str='include("/etc/alternc/phpmyadmin.inc.php")'
|
include_str='include("/etc/alternc/phpmyadmin.inc.php")'
|
||||||
@@ -592,14 +582,9 @@ else
|
@@ -598,9 +588,6 @@ chmod g+r /etc/dovecot/alternc-sql.conf
|
||||||
mysql --defaults-file=/etc/alternc/my.cnf -e "UPDATE db_servers SET host='$MYSQL_HOST', login='$MYSQL_USER', password='$MYSQL_PASS', client='$MYSQL_HOST_CLIENT' WHERE name='Default';"
|
# Override some dovecot 2.0 configuration that may have happened during dovecot postinst:
|
||||||
fi
|
sed -i -e 's/^ *!include/#!include/' /etc/dovecot/conf.d/10-auth.conf
|
||||||
|
|
||||||
-# giving vmail user read access on dovecot sql file
|
|
||||||
-chgrp vmail /etc/dovecot/alternc-sql.conf
|
|
||||||
-chmod g+r /etc/dovecot/alternc-sql.conf
|
|
||||||
-# Override some dovecot 2.0 configuration that may have happened during dovecot postinst:
|
|
||||||
-sed -i -e 's/^ *!include/#!include/' /etc/dovecot/conf.d/10-auth.conf
|
|
||||||
-
|
|
||||||
-# Changing owner of web panel's files
|
-# Changing owner of web panel's files
|
||||||
-chown -R alterncpanel:alterncpanel "/usr/share/alternc/panel/"
|
-chown -R alterncpanel:alterncpanel "/usr/share/alternc/panel/"
|
||||||
+#giving vmail user read access on dovecot sql file
|
-
|
||||||
+chgrp vmail /etc/dovecot/dovecot.conf
|
|
||||||
+chmod g+r /etc/dovecot/dovecot.conf
|
|
||||||
|
|
||||||
# We force the re-computing of the DNS zones, since we may have changed the IP address (see #460)
|
# We force the re-computing of the DNS zones, since we may have changed the IP address (see #460)
|
||||||
/usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='UPDATE' WHERE gesdns=1;"
|
/usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='UPDATE' WHERE gesdns=1;"
|
||||||
@@ -612,7 +597,7 @@ grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/ope
|
|
||||||
|
@@ -612,7 +599,7 @@ grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/ope
|
||||||
grep -q "^$PUBLIC_IP\$" /etc/opendkim/TrustedHosts || echo "$PUBLIC_IP" >>/etc/opendkim/TrustedHosts
|
grep -q "^$PUBLIC_IP\$" /etc/opendkim/TrustedHosts || echo "$PUBLIC_IP" >>/etc/opendkim/TrustedHosts
|
||||||
|
|
||||||
# Add opendkim to service to restart
|
# Add opendkim to service to restart
|
||||||
|
|
@ -125,7 +96,7 @@ index 95060b7c..10bcbacc 100644
|
||||||
|
|
||||||
# hook
|
# hook
|
||||||
run-parts --arg=before-reload /usr/lib/alternc/install.d
|
run-parts --arg=before-reload /usr/lib/alternc/install.d
|
||||||
@@ -620,7 +605,7 @@ run-parts --arg=before-reload /usr/lib/alternc/install.d
|
@@ -620,7 +607,7 @@ run-parts --arg=before-reload /usr/lib/alternc/install.d
|
||||||
#######################################################################
|
#######################################################################
|
||||||
# Reload services
|
# Reload services
|
||||||
#
|
#
|
||||||
|
|
@ -134,7 +105,7 @@ index 95060b7c..10bcbacc 100644
|
||||||
invoke-rc.d $service force-reload || true
|
invoke-rc.d $service force-reload || true
|
||||||
done
|
done
|
||||||
|
|
||||||
@@ -628,10 +613,6 @@ done
|
@@ -628,10 +615,6 @@ done
|
||||||
for service in $SERVICES; do
|
for service in $SERVICES; do
|
||||||
test -x /etc/init.d/$service && invoke-rc.d $service stop || true
|
test -x /etc/init.d/$service && invoke-rc.d $service stop || true
|
||||||
done
|
done
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/debian/changelog b/debian/changelog
|
diff --git a/debian/changelog b/debian/changelog
|
||||||
index 3ed86856..943f76d2 100644
|
index 3ed86856..75cd7999 100644
|
||||||
--- a/debian/changelog
|
--- a/debian/changelog
|
||||||
+++ b/debian/changelog
|
+++ b/debian/changelog
|
||||||
@@ -1,17 +1,3 @@
|
@@ -1,10 +1,3 @@
|
||||||
-alternc (3.3.10) stable; urgency=low
|
-alternc (3.3.10) stable; urgency=low
|
||||||
-
|
-
|
||||||
- * Version identical to 3.1 for Squeeze
|
- * Version identical to 3.1 for Squeeze
|
||||||
|
|
@ -10,13 +10,6 @@ index 3ed86856..943f76d2 100644
|
||||||
-
|
-
|
||||||
- -- Benjamin Sonntag <benjamin@sonntag.fr> Fri, 15 Jan 2016 15:26:00 +0100
|
- -- Benjamin Sonntag <benjamin@sonntag.fr> Fri, 15 Jan 2016 15:26:00 +0100
|
||||||
-
|
-
|
||||||
-alternc (3.2.10) oldstable; urgency=low
|
alternc (3.2.10) oldstable; urgency=low
|
||||||
-
|
|
||||||
- * Version identical to 3.1 for Squeeze
|
|
||||||
- * Includes a small dovecot patch / dependency for dovecot 2.0 for Wheezy
|
|
||||||
-
|
|
||||||
- -- Benjamin Sonntag <benjamin@sonntag.fr> Fri, 15 Jan 2016 15:26:00 +0100
|
|
||||||
-
|
|
||||||
alternc (3.1.11) oldoldstable; urgency=low
|
|
||||||
|
|
||||||
* fix This is a big security upgrade of AlternC 3.x
|
* Version identical to 3.1 for Squeeze
|
||||||
|
|
|
||||||
|
|
@ -1,51 +1,30 @@
|
||||||
diff --git a/debian/control b/debian/control
|
diff --git a/debian/control b/debian/control
|
||||||
index 551f6171..394506f9 100644
|
index 551f6171..ac10f87d 100644
|
||||||
--- a/debian/control
|
--- a/debian/control
|
||||||
+++ b/debian/control
|
+++ b/debian/control
|
||||||
@@ -38,19 +38,16 @@ Depends: debianutils (>= 1.13.1)
|
@@ -38,9 +38,9 @@ Depends: debianutils (>= 1.13.1)
|
||||||
, sudo
|
, sudo
|
||||||
, adduser
|
, adduser
|
||||||
, dnsutils
|
, dnsutils
|
||||||
- , dovecot-core (>=1:2.1.7)
|
- , dovecot-core (>=1:2.1.7)
|
||||||
- , dovecot-imapd (>=1:2.1.7)
|
- , dovecot-imapd (>=1:2.1.7)
|
||||||
- , dovecot-pop3d (>=1:2.1.7)
|
- , dovecot-pop3d (>=1:2.1.7)
|
||||||
- , dovecot-mysql
|
+ , dovecot-common (>=1:2.1.7)
|
||||||
+ , dovecot-common (>=1:1.2.15)
|
+ , dovecot-imapd
|
||||||
+ , dovecot-common(<< 1:2.0)
|
+ , dovecot-pop3d
|
||||||
+ , dovecot-imapd (>= 1:1.2.15)
|
, dovecot-mysql
|
||||||
+ , dovecot-pop3d (>= 1:1.2.15)
|
|
||||||
, vlogger
|
, vlogger
|
||||||
, mailutils | mailx
|
, mailutils | mailx
|
||||||
, zip
|
@@ -126,9 +126,9 @@ Depends: debianutils (>= 1.13.1)
|
||||||
, incron
|
|
||||||
, cron
|
|
||||||
, opendkim
|
|
||||||
- , opendkim-tools
|
|
||||||
- , dovecot-sieve
|
|
||||||
- , dovecot-managesieved
|
|
||||||
, mysql-client(>= 5.0) | mariadb-client
|
|
||||||
, php5-curl | php7.0-curl
|
|
||||||
, quota
|
|
||||||
@@ -126,18 +123,15 @@ Depends: debianutils (>= 1.13.1)
|
|
||||||
, gettext (>= 0.10.40-5)
|
, gettext (>= 0.10.40-5)
|
||||||
, adduser
|
, adduser
|
||||||
, sudo
|
, sudo
|
||||||
- , dovecot-core (>=1:2.1.7)
|
- , dovecot-core (>=1:2.1.7)
|
||||||
- , dovecot-imapd (>=1:2.1.7)
|
- , dovecot-imapd (>=1:2.1.7)
|
||||||
- , dovecot-pop3d (>=1:2.1.7)
|
- , dovecot-pop3d (>=1:2.1.7)
|
||||||
- , dovecot-mysql
|
+ , dovecot-common (>=1:2.1.7)
|
||||||
+ , dovecot-common (>=1:1.2.15)
|
+ , dovecot-imapd
|
||||||
+ , dovecot-common(<< 1:2.0)
|
+ , dovecot-pop3d
|
||||||
+ , dovecot-imapd (>= 1:1.2.15)
|
, dovecot-mysql
|
||||||
+ , dovecot-pop3d (>= 1:1.2.15)
|
|
||||||
, vlogger
|
, vlogger
|
||||||
, mailutils | mailx
|
, mailutils | mailx
|
||||||
, incron
|
|
||||||
, cron
|
|
||||||
, opendkim
|
|
||||||
- , opendkim-tools
|
|
||||||
- , dovecot-sieve
|
|
||||||
- , dovecot-managesieved
|
|
||||||
, mysql-client(>= 5.0) | mariadb-client
|
|
||||||
, php5-curl
|
|
||||||
, ${misc:Depends}
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
# reset your repos back to the serverside one!
|
# reset your repos back to the serverside one!
|
||||||
|
|
||||||
# The patch files were generated by running
|
# The patch files were generated by running
|
||||||
# export REV_NEW=ebb3471f04d49dd839237608bafc396e8b5090e5; export REV_OLD=d6d9be4c6a751279c9ad2a9b50aeb5d3ff1f91f9; \
|
# REV_NEW=ebb3471f04d49dd839237608bafc396e8b5090e5 REV_OLD=3ae6c0a5c2eecf864319dd42afbfc995baee9f68 \
|
||||||
# for i in `git diff --name-only $REV_NEW $REV_OLD` ; do BASE_NAME=`echo $i | rev | cut -d '/' -f 1 | rev` ; \
|
# for i in `git diff --name-only $REV_NEW $REV_OLD` ; do BASE_NAME=`echo $i | rev | cut -d '/' -f 1 | rev` ; \
|
||||||
# git diff -p $REV_NEW $REV_OLD -- "$i" > jessie/$BASE_NAME ; done
|
# git diff -p $REV_NEW $REV_OLD -- "$i" > jessie/$BASE_NAME ; done
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue