Version bump, security bug #155468.

(Portage version: 2.1.2_rc1-r5)

3 files changed, 99 insertions, 1 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index f4721ef3a34a..324856336a71 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.219 2006/11/09 22:23:01 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.220 2006/11/19 21:06:19 rl03 Exp $
+
+*phpmyadmin-2.9.1.1 (19 Nov 2006)
+
+  19 Nov 2006; Renat Lumpau <rl03@gentoo.org> +phpmyadmin-2.9.1.1.ebuild:
+  Version bump, security bug #155468.
 
 *phpmyadmin-2.9.1 (09 Nov 2006)
 
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.1.1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.1.1
new file mode 100644
index 000000000000..7dd465a20b62
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.1.1
@@ -0,0 +1,3 @@
+MD5 6f2c21f0f126c0df381ff2c5c042b861 phpMyAdmin-2.9.1.1-all-languages-utf-8-only.tar.bz2 1545641
+RMD160 8c21b9450534f674931c3c056c4b0f34a0ba009f phpMyAdmin-2.9.1.1-all-languages-utf-8-only.tar.bz2 1545641
+SHA256 2a4b8379f0fbcdef6bbc3112be13fa19de67a564196456fda77e13642f7ac0e5 phpMyAdmin-2.9.1.1-all-languages-utf-8-only.tar.bz2 1545641
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.9.1.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.9.1.1.ebuild
new file mode 100644
index 000000000000..a0b547bea7cd
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.9.1.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.9.1.1.ebuild,v 1.1 2006/11/19 21:06:19 rl03 Exp $
+
+inherit eutils webapp depend.php
+
+MY_PV=${PV/_/-}
+MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://www.phpmyadmin.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
+	sys-apps/findutils"
+S=${WORKDIR}/${MY_P}
+
+need_php
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if ! PHPCHECKNODIE="yes" require_php_with_use pcre session unicode \
+		|| ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli ; then
+		eerror
+		eerror "${PHP_PKG} needs to be re-installed with all of the following"
+		eerror "USE flags enabled:"
+		eerror
+		eerror "pcre session unicode"
+		eerror
+		eerror "as well as any of the following USE flags enabled:"
+		eerror
+		eerror "mysql or mysqli if using dev-lang/php-5"
+		eerror "mysql if using dev-lang/php-4"
+		eerror
+		die "Re-install ${PHP_PKG}"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/config.default.php-2.8.0.patch
+	# bug 152933
+	cd libraries && epatch ${FILESDIR}/common.lib.php.diff
+	cd ..
+
+	# Remove .cvs* files and CVS directories
+	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
+}
+
+src_compile() {
+	einfo "Setting random user/password details for the controluser"
+
+	local pmapass="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
+	sed -e "s/@pmapass@/${pmapass}/g" -i libraries/config.default.php
+	sed -e "s/@pmapass@/${pmapass}/g" \
+		${FILESDIR}/mysql-setup.sql.in-2.5.6 > ${T}/mysql-setup.sql
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog"
+
+	# 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
+
+	dodoc ${docs}
+	dohtml Documentation.html
+
+	# Copy the app's main files
+
+	einfo "Installing main files"
+	cp -r . ${D}${MY_HTDOCSDIR}
+
+	webapp_configfile ${MY_HTDOCSDIR}/libraries/config.default.php
+	webapp_serverowned ${MY_HTDOCSDIR}/libraries/config.default.php
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-2.8.0.txt
+	webapp_hook_script ${FILESDIR}/reconfig-2.8
+	webapp_src_install
+	# bug #88831, make sure the create script is world-readable.
+	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
+}