From 6258cc669d3465986e715515181c8c866a3e6f2a Mon Sep 17 00:00:00 2001
From: David Goodwin <david@palepurple.co.uk>
Date: Thu, 7 Sep 2017 14:22:57 +0100
Subject: [PATCH] update quilt patches

---
 ...b_credentials.patch => config-debian.diff} | 28 ++++++-------------
 debian/patches/series                         |  2 +-
 2 files changed, 9 insertions(+), 21 deletions(-)
 rename debian/patches/{0001-db_credentials.patch => config-debian.diff} (75%)

diff --git a/debian/patches/0001-db_credentials.patch b/debian/patches/config-debian.diff
similarity index 75%
rename from debian/patches/0001-db_credentials.patch
rename to debian/patches/config-debian.diff
index 8c299328..4d4a2169 100644
--- a/debian/patches/0001-db_credentials.patch
+++ b/debian/patches/config-debian.diff
@@ -1,31 +1,21 @@
-From: Norman Messtorff <normes@normes.org>
-Date: Sun, 23 Mar 2014 17:40:30 +0100
-Subject: db_credentials
-
----
- config.inc.php | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
 Index: postfixadmin/config.inc.php
 ===================================================================
---- a/config.inc.php
-+++ b/config.inc.php
-@@ -15,6 +15,14 @@
+--- postfixadmin.orig/config.inc.php
++++ postfixadmin/config.inc.php
+@@ -15,6 +15,12 @@
   * Contains configuration options.
   */
  
-+
-+// Debian: This loads the automatic generated DB credentials from 
-+// /etc/postfixadmin/dbconfig.inc.php
++// Debian: This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
 +require_once('dbconfig.inc.php');
 +if (!isset($dbserver) || empty($dbserver)) {
-+        $dbserver='localhost';
++    $dbserver = 'localhost';
 +}
 +
  /*****************************************************************
   *  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
   * You have to set $CONF['configured'] = true; before the
-@@ -22,7 +30,7 @@
+@@ -22,7 +28,7 @@
   * Doing this implies you have changed this file as required.
   * i.e. configuring database etc; specifying setup.php password etc.
   */
@@ -34,7 +24,7 @@ Index: postfixadmin/config.inc.php
  
  // In order to setup Postfixadmin, you MUST specify a hashed password here.
  // To create the hash, visit setup.php in a browser and type a password into the field,
-@@ -81,11 +89,11 @@
+@@ -81,11 +87,11 @@ function language_hook($PALANG, $languag
  // mysqli = MySQL 4.1+ or MariaDB
  // pgsql = PostgreSQL
  // sqlite = SQLite 3
@@ -48,8 +38,6 @@ Index: postfixadmin/config.inc.php
 +$CONF['database_user'] = $dbuser;
 +$CONF['database_password'] = $dbpass;
 +$CONF['database_name'] = $dbname;
+ 
  // If you need to specify a different port for a MYSQL database connection, use e.g.
  //   $CONF['database_host'] = '172.30.33.66:3308';
- // If you need to specify a different port for POSTGRESQL database connection
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 45264b7b..e871f6e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-db_credentials.patch
+config-debian.diff