Update to 2.2.0

Remove old patches, add new patch.
Update instructions in pkg-message.

PR:		ports/125083
Submitted by:	terry@sucked-in.com
Approved by:	maintainer timeout

5 files changed, 41 insertions, 58 deletions

diff --git a/mail/postfixadmin/files/patch-.htacces b/mail/postfixadmin/files/patch-.htacces
deleted file mode 100644
index 105bacab32b5..000000000000
--- a/mail/postfixadmin/files/patch-.htacces
+++ /dev/null
@@ -1,8 +0,0 @@
---- admin/.htaccess.orig	Thu Oct 23 11:17:10 2003
-+++ admin/.htaccess	Thu Oct 23 11:17:23 2003
-@@ -1,4 +1,4 @@
--AuthUserFile /usr/local/postfixadmin/admin/.htpasswd
-+AuthUserFile /usr/local/www/postfixadmin/admin/.htpasswd
- AuthGroupFile /dev/null
- AuthName "Postfix Admin"
- AuthType Basic
diff --git a/mail/postfixadmin/files/patch-VIRTUAL__VACATION_vacation.pl b/mail/postfixadmin/files/patch-VIRTUAL__VACATION_vacation.pl
deleted file mode 100644
index f1b153161b4e..000000000000
--- a/mail/postfixadmin/files/patch-VIRTUAL__VACATION_vacation.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- VIRTUAL_VACATION/vacation.pl.orig	Thu May 19 22:06:24 2005
-+++ VIRTUAL_VACATION/vacation.pl	Thu May 19 22:06:38 2005
-@@ -160,7 +160,7 @@
-       my @row = $sth->fetchrow_array;
-       if (do_cache ($email, $orig_from)) { return; }
-       do_debug ("[SEND RESPONSE] for $orig_messageid:\n", "FROM: $email (orig_to: $orig_to)\n", "TO: $orig_from\n", "SUBJECT: $orig_subject\n", "VACATION SUBJECT: $row[0]\n", "VACATION BODY: $row[1]\n");
--      do_mail ($orig_to, $orig_from, $row[0], $row[1]);
-+      do_mail ($email, $orig_from, $row[0], $row[1]);
-       do_log ($orig_messageid, $orig_to, $orig_from, $orig_subject); 
-    }
- 
diff --git a/mail/postfixadmin/files/patch-functions.inc.php b/mail/postfixadmin/files/patch-functions.inc.php
deleted file mode 100644
index 180d64a5830a..000000000000
--- a/mail/postfixadmin/files/patch-functions.inc.php
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./functions.inc.php.orig	2005-01-07 07:00:00.000000000 +0800
-+++ ./functions.inc.php	2008-05-17 21:19:54.000000000 +0800
-@@ -129,7 +129,12 @@
-    if (get_magic_quotes_gpc () == 0)
-    {
-       if ($CONF['database_type'] == "mysql")  $escaped_string = mysql_real_escape_string ($string);
--      if ($CONF['database_type'] == "mysqli")  $escaped_string = mysqli_real_escape_string ($string);
-+      if ($CONF['database_type'] == "mysqli")
-+      {
-+         $link = db_connect ();
-+         $escaped_string = mysqli_real_escape_string ($link, $string);
-+         mysqli_close ($link);
-+      }
-       if ($CONF['database_type'] == "pgsql")  $escaped_string = pg_escape_string ($string);
-    }
-    else
diff --git a/mail/postfixadmin/files/patch-sendmail.php b/mail/postfixadmin/files/patch-sendmail.php
new file mode 100644
index 000000000000..7e4790d4898f
--- /dev/null
+++ b/mail/postfixadmin/files/patch-sendmail.php
@@ -0,0 +1,24 @@
+--- sendmail.php	2007/12/02 13:59:33	250
++++ sendmail.php	2008/06/29 16:11:37	396
+@@ -49,15 +49,20 @@
+    $fHeaders .= "MIME-Version: 1.0\n";
+    $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
+    $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
++   $fHeaders .= "\n";
+ 
+-   $fHeaders .= escape_string ($_POST['fBody']);
++   $tBody = $_POST['fBody'];
++   if (get_magic_quotes_gpc ())
++   {
++      $tBody = stripslashes($tBody);
++   }
++   $fHeaders .= $tBody;
+ 
+    if (empty ($fTo) or !check_email ($fTo))
+    {
+       $error = 1;
+       $tTo = escape_string ($_POST['fTo']);
+       $tSubject = escape_string ($_POST['fSubject']);
+-      $tBody = escape_string ($_POST['fBody']);
+       $tMessage = $PALANG['pSendmail_to_text_error'];
+    }
diff --git a/mail/postfixadmin/files/pkg-message.in b/mail/postfixadmin/files/pkg-message.in
index e8a8b7e9cdee..766fb69802aa 100644
--- a/mail/postfixadmin/files/pkg-message.in
+++ b/mail/postfixadmin/files/pkg-message.in
@@ -1,25 +1,19 @@
-To Install and use postfixadmin:
+#
+# Postfix Admin
+# by Mischa Peters <mischa at high5 dot net>
+# Copyright (c) 2002 - 2005 High5!
+# Licensed under GPL for more info check GPL-LICENSE.TXT
+#
 
-1. Create the MySQL Tables
---------------------------
-In %%PREFIX%%/www/postfixadmin/DATABASE.TXT you can find the table
-structure that you need in order to configure Postfix Admin and Postfix
-in general to work with Virtual Domains and Users
+REQUIRED!!
+----------
+- You are using Postfix 2.0 or higher.
+- You are using Apache 1.3.27 / Lighttpd 1.3.15 or higher.
+- You are using PHP 4.1 or higher (5.X recommended)
+- You are using MySQL 3.23 or higher (5.x recommended) OR PostgreSQL 7.4 (or higher)
 
-2. Configure
-------------
-Check the %%PREFIX%%/www/postfixadmin/config.inc.php file. There you
-can specify settings that are relevant to your setup.
-
-The default password for the admin part of Postfix Admin is admin/admin.
-This is specified in the .htpasswd file in the admin directory. Make sure
-that the location of the .htpasswd file matches your path.
-
-3. Configure Apache
--------------------
-Add a line in your httpd.conf to allow the use of .htaccess file.
-
-<Directory "%%PREFIX%%/www/postfixadmin">
-	Options Indexes
-	AllowOverride AuthConfig
-</Directory>
+INSTALL / UPGRADE
+----------
+- Postfixadmin has brought about some changes, all database install/update scripts are now php web based
+- Browse to the webroot and run setup.php to install or update your current postfixadmin installation
+- For detailed information please read the INSTALL.TXT