From 6a2179691e44305df3fbeb1d0c0ff9495981be11 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Sun, 15 Apr 2018 12:42:26 -0400 Subject: [PATCH] Rename patch directories to reflect the distributions they patch towards --- jessie/changelog | 15 ------ jessie/control | 30 ----------- {wheezy => squeeze}/95_alternc.conf | 0 .../alternc-roundcube.postinst | 0 {jessie => squeeze}/alternc-ssl.install.php | 0 {jessie => squeeze}/alternc.install | 51 +++++++++++++++---- {jessie => squeeze}/apache2.conf | 0 {jessie => squeeze}/bureau.conf | 0 squeeze/changelog | 22 ++++++++ {jessie => squeeze}/config.inc.php | 0 squeeze/control | 51 +++++++++++++++++++ {wheezy => squeeze}/dovecot-dict-quota.conf | 0 {wheezy => squeeze}/dovecot-sql.conf | 0 {wheezy => squeeze}/dovecot.conf | 0 {jessie => squeeze}/main.inc.php | 0 {jessie => squeeze}/patch.sh | 2 +- {jessie => squeeze}/roundcube-install | 0 {jessie => squeeze}/ssl.conf | 0 {jessie => squeeze}/vhost.conf | 0 wheezy/alternc.install | 51 ++++--------------- wheezy/changelog | 15 ++---- wheezy/control | 43 ++++------------ wheezy/patch.sh | 2 +- 23 files changed, 141 insertions(+), 141 deletions(-) delete mode 100644 jessie/changelog delete mode 100644 jessie/control rename {wheezy => squeeze}/95_alternc.conf (100%) rename {jessie => squeeze}/alternc-roundcube.postinst (100%) rename {jessie => squeeze}/alternc-ssl.install.php (100%) rename {jessie => squeeze}/alternc.install (62%) rename {jessie => squeeze}/apache2.conf (100%) rename {jessie => squeeze}/bureau.conf (100%) create mode 100644 squeeze/changelog rename {jessie => squeeze}/config.inc.php (100%) create mode 100644 squeeze/control rename {wheezy => squeeze}/dovecot-dict-quota.conf (100%) rename {wheezy => squeeze}/dovecot-sql.conf (100%) rename {wheezy => squeeze}/dovecot.conf (100%) rename {jessie => squeeze}/main.inc.php (100%) rename {jessie => squeeze}/patch.sh (79%) rename {jessie => squeeze}/roundcube-install (100%) rename {jessie => squeeze}/ssl.conf (100%) rename {jessie => squeeze}/vhost.conf (100%) diff --git a/jessie/changelog b/jessie/changelog deleted file mode 100644 index 76d43552..00000000 --- a/jessie/changelog +++ /dev/null @@ -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 Fri, 15 Jan 2016 15:26:00 +0100 -- - alternc (3.2.10) oldstable; urgency=low - - * Version identical to 3.1 for Squeeze diff --git a/jessie/control b/jessie/control deleted file mode 100644 index db7ee3d4..00000000 --- a/jessie/control +++ /dev/null @@ -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 diff --git a/wheezy/95_alternc.conf b/squeeze/95_alternc.conf similarity index 100% rename from wheezy/95_alternc.conf rename to squeeze/95_alternc.conf diff --git a/jessie/alternc-roundcube.postinst b/squeeze/alternc-roundcube.postinst similarity index 100% rename from jessie/alternc-roundcube.postinst rename to squeeze/alternc-roundcube.postinst diff --git a/jessie/alternc-ssl.install.php b/squeeze/alternc-ssl.install.php similarity index 100% rename from jessie/alternc-ssl.install.php rename to squeeze/alternc-ssl.install.php diff --git a/jessie/alternc.install b/squeeze/alternc.install similarity index 62% rename from jessie/alternc.install rename to squeeze/alternc.install index 16de5a72..e036cac2 100644 --- a/jessie/alternc.install +++ b/squeeze/alternc.install @@ -1,7 +1,16 @@ diff --git a/install/alternc.install b/install/alternc.install -index 95060b7c..5d92cf0c 100644 +index 95060b7c..10bcbacc 100644 --- a/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 # Ad-hoc fixes # @@ -38,7 +47,7 @@ index 95060b7c..5d92cf0c 100644 fi if ! [ -L /etc/apache2/mods-enabled/rewrite.load ] then -@@ -319,9 +311,8 @@ if [ -x /usr/sbin/apache2 ]; then +@@ -319,14 +311,13 @@ if [ -x /usr/sbin/apache2 ]; then a2enmod ssl s="apache2" fi @@ -50,7 +59,19 @@ index 95060b7c..5d92cf0c 100644 s="apache2" 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/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/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 "create a certificate in /etc/alternc/apache.pem and rerun alternc.install" fi @@ -77,17 +98,25 @@ index 95060b7c..5d92cf0c 100644 # Configure PHPMyAdmin include_str='include("/etc/alternc/phpmyadmin.inc.php")' -@@ -598,9 +588,6 @@ 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 +@@ -592,14 +582,9 @@ else + 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';" + 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 -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) /usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='UPDATE' WHERE gesdns=1;" - -@@ -612,7 +599,7 @@ grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/ope +@@ -612,7 +597,7 @@ grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/ope grep -q "^$PUBLIC_IP\$" /etc/opendkim/TrustedHosts || echo "$PUBLIC_IP" >>/etc/opendkim/TrustedHosts # Add opendkim to service to restart @@ -96,7 +125,7 @@ index 95060b7c..5d92cf0c 100644 # hook 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 # @@ -105,7 +134,7 @@ index 95060b7c..5d92cf0c 100644 invoke-rc.d $service force-reload || true done -@@ -628,10 +615,6 @@ done +@@ -628,10 +613,6 @@ done for service in $SERVICES; do test -x /etc/init.d/$service && invoke-rc.d $service stop || true done diff --git a/jessie/apache2.conf b/squeeze/apache2.conf similarity index 100% rename from jessie/apache2.conf rename to squeeze/apache2.conf diff --git a/jessie/bureau.conf b/squeeze/bureau.conf similarity index 100% rename from jessie/bureau.conf rename to squeeze/bureau.conf diff --git a/squeeze/changelog b/squeeze/changelog new file mode 100644 index 00000000..77c98890 --- /dev/null +++ b/squeeze/changelog @@ -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 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 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 diff --git a/jessie/config.inc.php b/squeeze/config.inc.php similarity index 100% rename from jessie/config.inc.php rename to squeeze/config.inc.php diff --git a/squeeze/control b/squeeze/control new file mode 100644 index 00000000..0a1d6937 --- /dev/null +++ b/squeeze/control @@ -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} diff --git a/wheezy/dovecot-dict-quota.conf b/squeeze/dovecot-dict-quota.conf similarity index 100% rename from wheezy/dovecot-dict-quota.conf rename to squeeze/dovecot-dict-quota.conf diff --git a/wheezy/dovecot-sql.conf b/squeeze/dovecot-sql.conf similarity index 100% rename from wheezy/dovecot-sql.conf rename to squeeze/dovecot-sql.conf diff --git a/wheezy/dovecot.conf b/squeeze/dovecot.conf similarity index 100% rename from wheezy/dovecot.conf rename to squeeze/dovecot.conf diff --git a/jessie/main.inc.php b/squeeze/main.inc.php similarity index 100% rename from jessie/main.inc.php rename to squeeze/main.inc.php diff --git a/jessie/patch.sh b/squeeze/patch.sh similarity index 79% rename from jessie/patch.sh rename to squeeze/patch.sh index c3e02db9..c249f18a 100755 --- a/jessie/patch.sh +++ b/squeeze/patch.sh @@ -6,7 +6,7 @@ # reset your repos back to the serverside one! # 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` ; \ # git diff -p $REV_NEW $REV_OLD -- "$i" > jessie/$BASE_NAME ; done diff --git a/jessie/roundcube-install b/squeeze/roundcube-install similarity index 100% rename from jessie/roundcube-install rename to squeeze/roundcube-install diff --git a/jessie/ssl.conf b/squeeze/ssl.conf similarity index 100% rename from jessie/ssl.conf rename to squeeze/ssl.conf diff --git a/jessie/vhost.conf b/squeeze/vhost.conf similarity index 100% rename from jessie/vhost.conf rename to squeeze/vhost.conf diff --git a/wheezy/alternc.install b/wheezy/alternc.install index e036cac2..16de5a72 100644 --- a/wheezy/alternc.install +++ b/wheezy/alternc.install @@ -1,16 +1,7 @@ diff --git a/install/alternc.install b/install/alternc.install -index 95060b7c..10bcbacc 100644 +index 95060b7c..5d92cf0c 100644 --- a/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 # Ad-hoc fixes # @@ -47,7 +38,7 @@ index 95060b7c..10bcbacc 100644 fi if ! [ -L /etc/apache2/mods-enabled/rewrite.load ] then -@@ -319,14 +311,13 @@ if [ -x /usr/sbin/apache2 ]; then +@@ -319,9 +311,8 @@ if [ -x /usr/sbin/apache2 ]; then a2enmod ssl s="apache2" fi @@ -59,19 +50,7 @@ index 95060b7c..10bcbacc 100644 s="apache2" fi - # 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/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/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 - +@@ -340,13 +331,12 @@ if [ -x /usr/sbin/apache2 ]; then echo "SSL not configured" echo "create a certificate in /etc/alternc/apache.pem and rerun alternc.install" fi @@ -98,25 +77,17 @@ index 95060b7c..10bcbacc 100644 # Configure PHPMyAdmin include_str='include("/etc/alternc/phpmyadmin.inc.php")' -@@ -592,14 +582,9 @@ else - 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';" - fi +@@ -598,9 +588,6 @@ 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 --# 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 -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) /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 # Add opendkim to service to restart @@ -125,7 +96,7 @@ index 95060b7c..10bcbacc 100644 # hook 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 # @@ -134,7 +105,7 @@ index 95060b7c..10bcbacc 100644 invoke-rc.d $service force-reload || true done -@@ -628,10 +613,6 @@ done +@@ -628,10 +615,6 @@ done for service in $SERVICES; do test -x /etc/init.d/$service && invoke-rc.d $service stop || true done diff --git a/wheezy/changelog b/wheezy/changelog index 77c98890..76d43552 100644 --- a/wheezy/changelog +++ b/wheezy/changelog @@ -1,8 +1,8 @@ diff --git a/debian/changelog b/debian/changelog -index 3ed86856..943f76d2 100644 +index 3ed86856..75cd7999 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,17 +1,3 @@ +@@ -1,10 +1,3 @@ -alternc (3.3.10) stable; urgency=low - - * Version identical to 3.1 for Squeeze @@ -10,13 +10,6 @@ index 3ed86856..943f76d2 100644 - - -- Benjamin Sonntag 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 Fri, 15 Jan 2016 15:26:00 +0100 -- - alternc (3.1.11) oldoldstable; urgency=low + alternc (3.2.10) oldstable; urgency=low - * fix This is a big security upgrade of AlternC 3.x + * Version identical to 3.1 for Squeeze diff --git a/wheezy/control b/wheezy/control index 0a1d6937..db7ee3d4 100644 --- a/wheezy/control +++ b/wheezy/control @@ -1,51 +1,30 @@ diff --git a/debian/control b/debian/control -index 551f6171..394506f9 100644 +index 551f6171..ac10f87d 100644 --- a/debian/control +++ b/debian/control -@@ -38,19 +38,16 @@ Depends: debianutils (>= 1.13.1) +@@ -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-mysql -+ , dovecot-common (>=1:1.2.15) -+ , dovecot-common(<< 1:2.0) -+ , dovecot-imapd (>= 1:1.2.15) -+ , dovecot-pop3d (>= 1:1.2.15) ++ , dovecot-common (>=1:2.1.7) ++ , dovecot-imapd ++ , dovecot-pop3d + , dovecot-mysql , 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) +@@ -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-mysql -+ , dovecot-common (>=1:1.2.15) -+ , dovecot-common(<< 1:2.0) -+ , dovecot-imapd (>= 1:1.2.15) -+ , dovecot-pop3d (>= 1:1.2.15) ++ , dovecot-common (>=1:2.1.7) ++ , dovecot-imapd ++ , dovecot-pop3d + , dovecot-mysql , vlogger , mailutils | mailx - , incron - , cron - , opendkim -- , opendkim-tools -- , dovecot-sieve -- , dovecot-managesieved - , mysql-client(>= 5.0) | mariadb-client - , php5-curl - , ${misc:Depends} diff --git a/wheezy/patch.sh b/wheezy/patch.sh index c249f18a..c3e02db9 100755 --- a/wheezy/patch.sh +++ b/wheezy/patch.sh @@ -6,7 +6,7 @@ # reset your repos back to the serverside one! # 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` ; \ # git diff -p $REV_NEW $REV_OLD -- "$i" > jessie/$BASE_NAME ; done