Run of fresh-releases for postfixadmin

Try this locally (using silver-platter):

debian-svp new-upstream postfixadmin 

Merge these changes:

git pull https://janitor.debian.net/git/postfixadmin fresh-releases/main

Summary

Merged new upstream version: 3.2.2 (was: 3.2.1).

Diff

diff --git a/.travis.yml b/.travis.yml
index 371faa5..da92b7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: php
 php:
-  - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 cache:
   directories:
@@ -13,5 +13,5 @@ before_script:
   - composer install
 
 script:
-  - composer check-format
+  - composer lint
 
diff --git a/debian/changelog b/debian/changelog
index 176f0c2..5da5689 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postfixadmin (3.2.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Drop patch 0004-remove-backported-checks.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 28 Aug 2019 21:50:20 +0000
+
 postfixadmin (3.2.1-2) unstable; urgency=medium
 
   * remove backported code which results in errors (closes: #920564)
diff --git a/debian/patches/0001-db_credentials.patch b/debian/patches/0001-db_credentials.patch
index 7e9bd78..d301060 100644
--- a/debian/patches/0001-db_credentials.patch
+++ b/debian/patches/0001-db_credentials.patch
@@ -6,8 +6,10 @@ Subject: db_credentials
  config.inc.php | 19 ++++++++++++-------
  1 file changed, 12 insertions(+), 7 deletions(-)
 
---- a/config.inc.php
-+++ b/config.inc.php
+Index: postfixadmin/config.inc.php
+===================================================================
+--- postfixadmin.orig/config.inc.php
++++ postfixadmin/config.inc.php
 @@ -32,6 +32,14 @@
  
  
diff --git a/debian/patches/0002-dovecotpw.patch b/debian/patches/0002-dovecotpw.patch
index 3ef9523..06b63c5 100644
--- a/debian/patches/0002-dovecotpw.patch
+++ b/debian/patches/0002-dovecotpw.patch
@@ -6,8 +6,10 @@ Applied-Upstream: fixed upstream in version 2.91
 Last-Update: 2014-10-03
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/config.inc.php
-+++ b/config.inc.php
+Index: postfixadmin/config.inc.php
+===================================================================
+--- postfixadmin.orig/config.inc.php
++++ postfixadmin/config.inc.php
 @@ -200,7 +200,7 @@ $CONF['authlib_default_flavor'] = 'md5ra
  // for dovecot 1.x
  // $CONF['dovecotpw'] = "/usr/sbin/dovecotpw";
diff --git a/debian/patches/0004-remove-backported-checks.patch b/debian/patches/0004-remove-backported-checks.patch
deleted file mode 100644
index 24eff0f..0000000
--- a/debian/patches/0004-remove-backported-checks.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/functions.inc.php	2019-01-12 21:46:34.000000000 +0100
-+++ b/functions.inc.php	2019-01-24 01:44:34.971950615 +0100
-@@ -2137,42 +2137,6 @@ function gen_show_status($show_alias) {
-         }
-     }
- 
--    // Vacation CHECK
--    if ( $CONF['show_vacation'] == 'YES' ) {
--        $stat_result = db_query("SELECT * FROM ". $CONF['database_tables']['vacation'] ." WHERE email = '" . $show_alias . "' AND active = '" . db_get_boolean(true) . "'") ;
--        if ($stat_result['rows'] == 1) {
--            $stat_string .= "<span style='background-color:" . $CONF['show_vacation_color'] . "'>" . $CONF['show_status_text'] . "</span>&nbsp;";
--        } else {
--            $stat_string .= $CONF['show_status_text'] . "&nbsp;";
--        }
--    }
--
--    // Disabled CHECK
--    if ( $CONF['show_disabled'] == 'YES' ) {
--        $stat_result = db_query("SELECT * FROM ". $CONF['database_tables']['mailbox'] ." WHERE username = '" . $show_alias . "' AND active = '" . db_get_boolean(false) . "'");
--        if ($stat_result['rows'] == 1) {
--            $stat_string .= "<span style='background-color:" . $CONF['show_disabled_color'] . "'>" . $CONF['show_status_text'] . "</span>&nbsp;";
--        } else {
--            $stat_string .= $CONF['show_status_text'] . "&nbsp;";
--        }
--    }
--
--    // Expired CHECK
--    if ( Config::bool('password_expiration') && Config::bool('show_expired') ) {
--        $now = 'now()';
--        if (db_sqlite()) {
--            $now = "datetime('now')";
--        }
--
--        $stat_result = db_query("SELECT * FROM ". $CONF['database_tables']['mailbox'] ." WHERE username = '" . $show_alias . "' AND password_expiry <= $now AND active = '" . db_get_boolean(true) . "'");
--
--        if ($stat_result['rows'] == 1) {
--            $stat_string .= "<span style='background-color:" . $CONF['show_expired_color'] . "'>" . $CONF['show_status_text'] . "</span>&nbsp;";
--        } else {
--            $stat_string .= $CONF['show_status_text'] . "&nbsp;";
--        }
--    }
--
-     // POP/IMAP CHECK
-     if ($CONF['show_popimap'] == 'YES') {
-         $stat_delimiter = "";
diff --git a/debian/patches/series b/debian/patches/series
index f4c4df1..972e790 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-db_credentials.patch
 0002-dovecotpw.patch
-0004-remove-backported-checks.patch
diff --git a/functions.inc.php b/functions.inc.php
index cf8e7a2..f8805fa 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -1462,7 +1462,7 @@ function db_connect($ignore_errors = false) {
             if (function_exists("mysqli_real_connect")) {
                 $link = mysqli_init();
                 $link->ssl_set($CONF['database_ssl_key'], $CONF['database_ssl_cert'], $CONF['database_ssl_ca'], $CONF['database_ssl_ca_path'], $CONF['database_ssl_cipher']);
-                $connected = mysqli_real_connect($link, $CONF['database_host'], $CONF['database_user'], $CONF['database_password'], $CONF['database_name'], $CONF['database_port']);
+                $connected = mysqli_real_connect($link, $CONF['database_host'], $CONF['database_user'], $CONF['database_password'], $CONF['database_name'], $CONF['database_port'], null, constant('MYSQLI_CLIENT_SSL'));
                 $is_connected = $connected;
             } else {
                 $error_text .= "<p />DEBUG INFORMATION:<br />MySQLi 5 functions not available! (php5-mysqli installed?)<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT";
@@ -2138,7 +2138,7 @@ function gen_show_status($show_alias) {
     }
 
     // Vacation CHECK
-    if ( $CONF['show_vacation'] == 'YES' ) {
+    if ( isset($CONF['show_vacation']) && $CONF['show_vacation'] == 'YES' ) {
         $stat_result = db_query("SELECT * FROM ". $CONF['database_tables']['vacation'] ." WHERE email = '" . $show_alias . "' AND active = '" . db_get_boolean(true) . "'") ;
         if ($stat_result['rows'] == 1) {
             $stat_string .= "<span style='background-color:" . $CONF['show_vacation_color'] . "'>" . $CONF['show_status_text'] . "</span>&nbsp;";
@@ -2148,7 +2148,7 @@ function gen_show_status($show_alias) {
     }
 
     // Disabled CHECK
-    if ( $CONF['show_disabled'] == 'YES' ) {
+    if ( isset($CONF['show_disabled']) && $CONF['show_disabled'] == 'YES' ) {
         $stat_result = db_query("SELECT * FROM ". $CONF['database_tables']['mailbox'] ." WHERE username = '" . $show_alias . "' AND active = '" . db_get_boolean(false) . "'");
         if ($stat_result['rows'] == 1) {
             $stat_string .= "<span style='background-color:" . $CONF['show_disabled_color'] . "'>" . $CONF['show_status_text'] . "</span>&nbsp;";
@@ -2157,22 +2157,6 @@ function gen_show_status($show_alias) {
         }
     }
 
-    // Expired CHECK
-    if ( Config::bool('password_expiration') && Config::bool('show_expired') ) {
-        $now = 'now()';
-        if (db_sqlite()) {
-            $now = "datetime('now')";
-        }
-
-        $stat_result = db_query("SELECT * FROM ". $CONF['database_tables']['mailbox'] ." WHERE username = '" . $show_alias . "' AND password_expiry <= $now AND active = '" . db_get_boolean(true) . "'");
-
-        if ($stat_result['rows'] == 1) {
-            $stat_string .= "<span style='background-color:" . $CONF['show_expired_color'] . "'>" . $CONF['show_status_text'] . "</span>&nbsp;";
-        } else {
-            $stat_string .= $CONF['show_status_text'] . "&nbsp;";
-        }
-    }
-
     // POP/IMAP CHECK
     if ($CONF['show_popimap'] == 'YES') {
         $stat_delimiter = "";

Full worker log Full build log