Added patched 2.11.1 to the tree. See sec issue #195707.

(Portage version: 2.1.3.12)

4 files changed, 105 insertions, 1 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 9371d95794f2..80a30048dbad 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.263 2007/06/02 05:16:15 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.264 2007/10/14 06:30:19 wrobel Exp $
+
+*phpmyadmin-2.11.1 (14 Oct 2007)
+
+  14 Oct 2007; <wrobel@gentoo.org>
+  +files/phpmyadmin-2.11.1-issue_195707.patch, +phpmyadmin-2.11.1.ebuild:
+  Added patched 2.11.1 to the tree. See sec issue #195707.
 
   02 Jun 2007; Renat Lumpau <rl03@gentoo.org>
   -files/mysql-setup.sql.in-2.5.6, -files/config.default.php-2.9.2.patch,
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.11.1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.11.1
new file mode 100644
index 000000000000..bd6a7838fcdd
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.11.1
@@ -0,0 +1,3 @@
+MD5 6a176398832474c30d816d1de2431459 phpMyAdmin-2.11.1-all-languages-utf-8-only.tar.bz2 2227182
+RMD160 f3d348f820afb745cb2bd0a6d775023016398586 phpMyAdmin-2.11.1-all-languages-utf-8-only.tar.bz2 2227182
+SHA256 2ece0e6327a471068947b5b8905185285d49c4ac037e47f37dde25a45483219a phpMyAdmin-2.11.1-all-languages-utf-8-only.tar.bz2 2227182
diff --git a/dev-db/phpmyadmin/files/phpmyadmin-2.11.1-issue_195707.patch b/dev-db/phpmyadmin/files/phpmyadmin-2.11.1-issue_195707.patch
new file mode 100644
index 000000000000..d9fafb8a38ec
--- /dev/null
+++ b/dev-db/phpmyadmin/files/phpmyadmin-2.11.1-issue_195707.patch
@@ -0,0 +1,29 @@
+--- trunk/phpMyAdmin/scripts/setup.php	2007/06/03 23:30:40	10420
++++ trunk/phpMyAdmin/scripts/setup.php	2007/10/10 07:30:59	10748
+@@ -1395,7 +1395,7 @@
+                         } else {
+                             mysql_close($conn);
+                         }
+-                    } else { 
++                    } else {
+                         $socket = empty($new_server['socket']) || $new_server['connect_type'] == 'tcp' ? NULL : $new_server['socket'];
+                         $port = empty($new_server['port']) || $new_server['connect_type'] == 'socket' ? NULL : $new_server['port'];
+                         $conn = @mysqli_connect($new_server['host'], $new_server['controluser'], $new_server['controlpass'], NULL, $port, $socket);
+@@ -1951,12 +1951,16 @@
+             if (empty($_SERVER['REQUEST_URI']) || empty($_SERVER['HTTP_HOST'])) {
+                 $redir = '';
+             } else {
+-                $redir = ' If your server is also configured to accept HTTPS request follow <a href="https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . '">this link</a> to use secure connection.';
++                $redir = ' If your server is also configured to accept HTTPS request'
++                    . ' follow <a href="https://'
++                    . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'])
++                    . '">this link</a> to use secure connection.';
+             }
+             message('warning', 'You are not using secure connection, all data (including sensitive, like passwords) are transfered unencrypted!' . $redir, 'Not secure connection');
+         }
+         break;
+ }
++echo $_SERVER['REQUEST_URI'];
+ 
+ // Should we show information?
+ if ($show_info) {
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.1.ebuild
new file mode 100644
index 000000000000..780d4b94a070
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.1.ebuild,v 1.1 2007/10/14 06:30:19 wrobel 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="sys-apps/findutils"
+S=${WORKDIR}/${MY_P}
+
+need_php
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype 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 "ctype 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}"
+	# Remove .cvs* files and CVS directories
+	find "${S}" -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
+
+	# patch security issue #195707
+	epatch "${FILESDIR}"/${P}-issue_195707.patch || die "Patching failed!"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog"
+
+	dodoc ${docs}
+	dohtml Documentation.html
+
+	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
+}