Version bump

4 files changed, 113 insertions, 12 deletions

diff --git a/www-apps/mambo/ChangeLog b/www-apps/mambo/ChangeLog
index a02bf0c6496e..23e54a7d5d4e 100644
--- a/www-apps/mambo/ChangeLog
+++ b/www-apps/mambo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/mambo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.6 2005/02/10 17:26:25 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.7 2005/02/21 21:39:42 stuart Exp $
+
+*mambo-4.5.2 (21 Feb 2005)
+
+  21 Feb 2005; Stuart Herbert <stuart@gentoo.org> +mambo-4.5.2.ebuild:
+  Version bump; includes the patch needed for bug 82830
 
 *mambo-4.5-r1 (10 Feb 2005)
 
diff --git a/www-apps/mambo/Manifest b/www-apps/mambo/Manifest
index 886f76577785..30eb5634363b 100644
--- a/www-apps/mambo/Manifest
+++ b/www-apps/mambo/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 94b15dda19d9b00021fdd83a00e7d8bd ChangeLog 1043
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 03c3dcfc36b02d76f2e87061288c5cf0 mambo-4.5-r1.ebuild 3361
-MD5 0fb377af9c13e19e1bc5ee9dd2933763 files/digest-mambo-4.5-r1 149
+MD5 613dde4f6c8f734350a3b6ecdc9ab3fc mambo-4.5.2.ebuild 3329
+MD5 a7900b11e87180055671791835ca401e files/digest-mambo-4.5.2 141
 MD5 e061f7e080ca70cc58815179056d3313 files/postinstall-en.txt 925
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCC5lJEZCkKN40op4RAux7AJ9noBaP88ScmXrPPqtuWMgiCdaYfACgw/OS
-BjMufRLyBNs5jYEcoBkAJFA=
-=FUY4
------END PGP SIGNATURE-----
+MD5 0fb377af9c13e19e1bc5ee9dd2933763 files/digest-mambo-4.5-r1 149
diff --git a/www-apps/mambo/files/digest-mambo-4.5.2 b/www-apps/mambo/files/digest-mambo-4.5.2
new file mode 100644
index 000000000000..3f1442f2c617
--- /dev/null
+++ b/www-apps/mambo/files/digest-mambo-4.5.2
@@ -0,0 +1,2 @@
+MD5 6f4f934bc26ceed05137a23a1dcf8a54 mamboV4.5.2-Stable.tar.gz 1561319
+MD5 0dc49db1cf7a5c0ff11d69f05cfae69f Patch_4.5.2_to_4.5.2.1.zip 32429
diff --git a/www-apps/mambo/mambo-4.5.2.ebuild b/www-apps/mambo/mambo-4.5.2.ebuild
new file mode 100644
index 000000000000..0ab1d0213ee7
--- /dev/null
+++ b/www-apps/mambo/mambo-4.5.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.5.2.ebuild,v 1.1 2005/02/21 21:39:42 stuart Exp $
+
+inherit webapp eutils
+
+MY_P="${PN/M/m}V${PV}-Stable"
+DESCRIPTION="Mambo is yet another CMS"
+HOMEPAGE="http://www.mamboserver.com/"
+SRC_URI="http://mamboforge.net/frs/download.php/4004/${MY_P}.tar.gz
+	http://mamboforge.net/frs/download.php/4043/Patch_4.5.2_to_4.5.2.1.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+S=${WORKDIR}
+
+IUSE=""
+
+RDEPEND="dev-db/mysql
+	>=virtual/php-4.1
+	net-www/apache"
+DEPEND="app-arch/unzip"
+
+pkg_setup () {
+	webapp_pkg_setup
+	einfo "Please make sure that your PHP is compiled with zlib, XML, and MySQL support"
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${S}
+	# sec bug 80578
+	unpack Patch_4.5.2_to_4.5.2.1.zip
+}
+
+src_install () {
+	webapp_src_preinst
+	local files="administrator/backups administrator/components components images media language modules templates"
+
+	dodoc documentation/Changelog INSTALL
+	dohtml documentation/Install.html
+
+	cp -R [^d]* ${D}/${MY_HTDOCSDIR}
+
+	for file in ${files}; do
+		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	done
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst () {
+	einfo "Now run ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	einfo "to setup the database"
+	einfo "Note that db and dbuser need to be present prior to running db setup"
+}
+
+pkg_config() {
+	# default values for db stuff
+	D_DB="mambo"
+	D_HOST="localhost"
+	D_USER="mambo"
+
+	# do we want to start mysqld?
+	/etc/init.d/mysql restart || die "mysql needs to be running"
+
+	echo -n "mysql db name [${D_DB}]: "; read MY_DB
+	if (test -z ${MY_DB}) ; then MY_DB=${D_DB} ; fi
+
+	echo -n "mysql db host [${D_HOST}]: "; read MY_HOST
+	if (test -z ${MY_HOST}) ; then MY_HOST=${D_HOST}; fi
+
+	echo -n "mysql dbuser name [${D_USER}]: "; read MY_USER
+	if (test -z ${MY_USER}) ; then MY_USER=${D_USER} ; fi
+
+	echo -n "mysql dbuser password: "; read mypwd
+	if (test -z ${mypwd}) ; then die "Error: no dbuser password" ; fi
+
+	# privileges
+	echo -n "Please enter login info for user who has grant privileges on ${MY_HOST} [$USER]: "; read adminuser
+	if (test -z ${adminuser}) ; then adminuser="$USER" ; fi
+	if [ "${MY_HOST}" != "localhost" ]; then
+		echo -n "Client address (at db side) [$(hostname -f)]: "; read clientaddr
+		if (test -z ${clientaddr}) ; then clientaddr="$(hostname -f)" ; fi
+	fi
+	# this will be default for localhost
+	if (test -z ${clientaddr}) ; then clientaddr="${MY_HOST}" ; fi
+
+	# if $MY_HOST == localhost, don't specify -h argument, so local socket can be used.
+	host=${MY_HOST/localhost}
+	mysqladmin -u ${MY_USER} ${host:+-h ${host}} -p create ${MY_DB} || die "Error creating database"
+	mysql -u ${adminuser} ${host:+-h ${host}} -p mysql --exec="GRANT SELECT,INSERT,UPDATE,DELETE,INDEX, ALTER,CREATE,DROP,REFERENCES ON ${MY_DB}.* TO ${MY_USER}@${clientaddr} IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;"  || {
+	echo "Error running query!"
+	echo
+	echo "Please run it manually on ${host}."
+	echo
+	echo "   \$ mysql -u ${adminuser} -p mysql --exec=\"GRANT SELECT,INSERT,UPDATE,DELETE,INDEX, ALTER,CREATE,DROP,REFERENCES ON ${MY_DB}.* TO ${MY_USER}@${clientaddr} IDENTIFIED BY '${mypwd}'; FLUSH PRIVILEGES;\""
+	echo
+	}
+}