Added postfixadmin-2.2.0 (#220141) and fixed #223387.

(Portage version: 2.1.4.4)

5 files changed, 139 insertions, 118 deletions

diff --git a/www-apps/postfixadmin/ChangeLog b/www-apps/postfixadmin/ChangeLog
index 23a6c4cb4f4c..94c752fdcfca 100644
--- a/www-apps/postfixadmin/ChangeLog
+++ b/www-apps/postfixadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/postfixadmin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.11 2008/02/22 15:56:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.12 2008/06/01 15:08:28 wrobel Exp $
+
+*postfixadmin-2.2.0 (01 Jun 2008)
+
+  01 Jun 2008; wrobel@gentoo.org +files/postinstall-en-2.2.0.txt,
+  -postfixadmin-2.1.0.ebuild, postfixadmin-2.1.0-r1.ebuild,
+  +postfixadmin-2.2.0.ebuild:
+  Added postfixadmin-2.2.0 (#220141) and fixed #223387.
 
   22 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
   postfixadmin-2.1.0-r1.ebuild:
diff --git a/www-apps/postfixadmin/files/postinstall-en-2.2.0.txt b/www-apps/postfixadmin/files/postinstall-en-2.2.0.txt
new file mode 100644
index 000000000000..6b9773a6e85f
--- /dev/null
+++ b/www-apps/postfixadmin/files/postinstall-en-2.2.0.txt
@@ -0,0 +1,47 @@
+You will need to provide a database for your postfixadmin installation.
+
+This assumes you have some knowledge of MySQL, and already have it
+installed and configured. If not, please refer to the Gentoo MySQL
+guide at the following URL:
+
+http://www.gentoo.org/doc/en/mysql-howto.xml
+
+Log in to MySQL, and create a new database as well as a user with full
+access to this database. After that you will need to provide the details
+of this database and the associated user within the file
+
+${MY_INSTALLDIR}/config.inc.php
+
+Make sure you also set
+
+  $CONF['configured'] = true;
+
+in this file.
+
+Finally you should be able to complete the installation of postfixadmin
+by pointing your browser at
+
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup.php
+
+
+Updating from older version of Postfix Admin:
+  * When you are upgrading from an older Postfix Admin version, make sure you
+  * backup your database before you run the update script on your database.
+  *   mysqldump -a -u root -p > /tmp/postfixadmin-backup.sql
+
+  For update from 1.5.x version of Postfix Admin:
+    1. Please read the DOCUMENTS/UPGRADE.TXT
+	2. Run: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup.php
+
+
+To use Virtual Vacation, please read VIRTUAL_VACATION_INSTALL.
+
+Check the config.inc.php file. There you can specify settings that are
+relevant to your setup.
+
+Postfix Admin contains 3 views of administration:
+  1. Site Admin view, located at http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/admin/.
+  2. Domain Admin view, located at http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/.
+  3. User Admin View, located at http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/users/.
+
+In order to do the initial configuration you have to go to the Site Admin view.
diff --git a/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild b/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild
index 20f021c75304..5813b8f34ebe 100644
--- a/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild,v 1.2 2008/02/22 15:56:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild,v 1.3 2008/06/01 15:08:28 wrobel Exp $
 
 inherit eutils webapp depend.php confutils
 
@@ -60,6 +60,9 @@ src_install() {
 		insinto /var/spool/vacation
 		insopts -m770 -o vacation -g vacation
 		doins "${S}"/VIRTUAL_VACATION/vacation.pl
+
+	        diropts -m775 -o root -g root
+	        insopts -m644 -o root -g root
 	fi
 
 	local docs="BACKUP_MX.TXT CHANGELOG.TXT INSTALL.TXT LANGUAGE.TXT
diff --git a/www-apps/postfixadmin/postfixadmin-2.1.0.ebuild b/www-apps/postfixadmin/postfixadmin-2.1.0.ebuild
deleted file mode 100644
index e69e5d883563..000000000000
--- a/www-apps/postfixadmin/postfixadmin-2.1.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.1.0.ebuild,v 1.10 2008/02/05 15:10:24 hollow Exp $
-
-# Source: http://bugs.gentoo.org/show_bug.cgi?id=50035
-# Submitted-By: SteveB <tp22a@softhome.net>
-# Reviewed-By: wrobel 2005-12-14
-# $Id: postfixadmin-2.1.0.ebuild,v 1.10 2008/02/05 15:10:24 hollow Exp $
-
-inherit eutils webapp depend.apache
-
-IUSE="vhosts"
-DESCRIPTION="Postfix Admin is a Web Based Management tool for Postfix when you are dealing with Postfix Style Virtual Domains and Virtual Users that are stored in MySQL."
-HOMEPAGE="http://high5.net/postfixadmin/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-RESTRICT="mirror"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/httpd-php
-		>=mail-mta/postfix-2.0.0
-		>=dev-lang/perl-5.0
-		dev-perl/DBI
-		dev-perl/DBD-mysql"
-
-RDEPEND=">=sys-apps/sed-4.0.5
-		sys-apps/grep
-		sys-apps/findutils"
-
-need_apache2
-
-LICENSE="MPL-1.1"
-
-pkg_setup() {
-	webapp_pkg_setup
-	id vacation 2>/dev/null || enewgroup vacation
-	id vacation 2>/dev/null || enewuser vacation -1 -1 /dev/null vacation
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# Remove .cvs* files and CVS directories
-	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) -exec rm -rf {} \;
-
-	# Database support (we don't care wich one is used. Allow both of them!)
-	cp ./DATABASE_MYSQL.TXT ${T}/mysql-setup.sql || die "Creating MySQL setup script failed!"
-	cp ./TABLE_CHANGES.TXT ${T}/mysql-update.sql || die "Creating MySQL update script failed!"
-	cp ./VIRTUAL_VACATION/INSTALL.TXT ${T}/VIRTUAL_VACATION_INSTALL.TXT
-
-	# Rename config.inc.php
-	cp ./config.inc.php.sample ${T}/config.inc.php || die "Creating config file failed!"
-
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# Virtual Vacation only works with MySQL
-	diropts -m0770 -o vacation -g vacation
-	dodir /var/spool/vacation
-	keepdir /var/spool/vacation
-	insinto /var/spool/vacation
-	insopts -m770 -o vacation -g vacation
-	doins ${S}/VIRTUAL_VACATION/vacation.pl
-
-	# Documentation
-	#
-	local docs="BACKUP_MX.TXT CHANGELOG.TXT INSTALL.TXT LANGUAGE.TXT LICENSE.TXT TABLE_BACKUP_MX.TXT TABLE_CHANGES.TXT UPGRADE.TXT"
-	docs="${docs} DATABASE_MYSQL.TXT ${T}/VIRTUAL_VACATION_INSTALL.TXT"
-
-	# install the SQL scripts available to us
-	#
-	# unfortunately, we do not have scripts to upgrade from older versions
-	# these are things we need to add at a later date
-	#
-	webapp_sqlscript mysql ${T}/mysql-setup.sql
-	webapp_sqlscript mysql ${T}/mysql-update.sql 2.0.x
-	webapp_sqlscript mysql ${T}/mysql-update.sql 1.5x
-
-	# Copy the app's main files
-	#
-	einfo "Installing main files"
-	mkdir -p ${D}${MY_HTDOCSDIR}
-	cp -r . ${D}${MY_HTDOCSDIR} || die "cp failed"
-	cp ${T}/config.inc.php ${D}${MY_HTDOCSDIR} || die "cp failed"
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-	#
-	dodoc ${docs}
-	for foo in ${docs} DATABASE_MYSQL.TXT DATABASE_PGSQL.TXT ADDITIONS VIRTUAL_VACATION
-	do
-		rm -f ${D}${MY_HTDOCSDIR}/${foo}
-	done
-
-	# Identify the configuration files that this app uses
-	#
-	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
-	webapp_configfile ${MY_HTDOCSDIR}/admin/.htpasswd
-
-	# Add the hook file to fix the .htaccess file
-	webapp_hook_script ${FILESDIR}/config-hook.sh
-
-	# Add the post-installation instructions
-	#
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	# All done
-	#
-	# Now we let the eclass strut its stuff ;-)
-	#
-	webapp_src_install
-}
diff --git a/www-apps/postfixadmin/postfixadmin-2.2.0.ebuild b/www-apps/postfixadmin/postfixadmin-2.2.0.ebuild
new file mode 100644
index 000000000000..148ecdc2a2a8
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-2.2.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.2.0.ebuild,v 1.1 2008/06/01 15:08:28 wrobel Exp $
+
+inherit eutils webapp depend.php confutils
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users."
+HOMEPAGE="http://high5.net/postfixadmin/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres"
+
+DEPEND=">=mail-mta/postfix-2.0.0
+	>=dev-lang/perl-5.0
+	dev-perl/DBI
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )"
+RDEPEND="${DEPEND}"
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	confutils_require_any mysql postgres
+	confutils_use_depend_built_with_all mysql mail-mta/postfix mysql
+	confutils_use_depend_built_with_all postgres mail-mta/postfix postgres
+
+	if use mysql; then
+		enewgroup vacation
+		enewuser vacation -1 -1 -1 vacation
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	ecvs_clean
+
+	mv VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# virtual vacation only works with MySQL
+	if use mysql; then
+		diropts -m0770 -o vacation -g vacation
+		dodir /var/spool/vacation
+		keepdir /var/spool/vacation
+		insinto /var/spool/vacation
+		insopts -m770 -o vacation -g vacation
+		doins "${S}"/VIRTUAL_VACATION/vacation.pl
+
+		diropts -m775 -o root -g root
+		insopts -m644 -o root -g root
+	fi
+
+	local docs="DOCUMENTS/BACKUP_MX.txt CHANGELOG.TXT INSTALL.TXT
+		DOCUMENTS/LANGUAGE.txt DOCUMENTS/UPGRADE.txt
+		VIRTUAL_VACATION_INSTALL.TXT"
+	dodoc ${docs}
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	for FILE in ${docs} GPL-LICENSE.TXT LICENSE.TXT ADDITIONS/ debian/
+	do
+	  rm -rf ${FILE}
+	done
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.2.0.txt
+	webapp_src_install
+}