# ChangeLog for dev-db/phpmyadmin
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.295 2008/03/04 20:54:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.296 2008/03/06 15:40:21 hollow Exp $
+
+*phpmyadmin-2.11.5-r1 (06 Mar 2008)
+
+ 06 Mar 2008; Benedikt Böhm <hollow@gentoo.org>
+ files/postinstall-en-2.8.0.txt,
+ +files/phpmyadmin-2.11.5-custom-cert.patch, -phpmyadmin-2.11.2.2.ebuild,
+ -phpmyadmin-2.11.4.ebuild, +phpmyadmin-2.11.5-r1.ebuild:
+ add patch for custom connection certificates; fix postinstall instructions
+ wrt #212117; remove vulnerable versions wrt #212000
04 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
phpmyadmin-2.11.5.ebuild:
-AUX postinstall-en-2.8.0.txt 1146 RMD160 bf699b21596c24f8f08be4eb53c18a3154be39a9 SHA1 f61856930f39872a3af08a43f06583468024c221 SHA256 93836b091c71c0316744b3a4b601e465a2d98d9e7b74cfa98c17aa66d4fb31d7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX phpmyadmin-2.11.5-custom-cert.patch 1000 RMD160 e8ae7f29c5958e8626c91bf626008ec79c77ae8c SHA1 90f8e5d61a0620a6855a47097124e0b9adca5e0f SHA256 68eda0cf9dc0bdd90f59f334842483906e8330400e314c40ddbad2f7f97981c6
+AUX postinstall-en-2.8.0.txt 1117 RMD160 09838ab10f2f2cc44ca6154d182ddb573905f12c SHA1 c0c08a1ca71c54a1c900221a5bfd1fd12ecbb04a SHA256 b353e94a59c71131bc617f2e2c2b8d659c67d9277c86d20545da6b26bb08d12d
AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612
-DIST phpMyAdmin-2.11.2.2-all-languages-utf-8-only.tar.bz2 2238832 RMD160 d1378ab1eef322800866faf9d940260a76af5422 SHA1 21f487dd1a00d17596d85ad415f1e93ad2c77e58 SHA256 a18a59a39088d1ea79f0245f765c7567256bbe4786ca2eddaa6d753d4223f601
-DIST phpMyAdmin-2.11.4-all-languages-utf-8-only.tar.bz2 2241351 RMD160 f8a722b279d194c39bfeaf57a5969504ef316a50 SHA1 e8e4d2d10e34413a0004711eed17543d36e2b803 SHA256 7566ab1f2257648bf1c5c9e4152d638b42ded7be2594975cfcff20b96d04992d
DIST phpMyAdmin-2.11.5-all-languages-utf-8-only.tar.bz2 2243629 RMD160 510e64bc8e0dc42ce888882f2eb4aaca8f5870f7 SHA1 5dc42d057b6682a9de4ae0bf9ef5536ec1ad7138 SHA256 72741558abe60d5f0e721c86a7b70c164ff4015b0cbb63920f311396aefb7f10
-EBUILD phpmyadmin-2.11.2.2.ebuild 1690 RMD160 181426ccc19e8904ab0a5d0790a749a216129102 SHA1 a677912f6d75f33f7af2580904cb6e896fefce46 SHA256 05758e071ffb98e3037c3ebaa5c46a274766ade1ed07320c7354988637889892
-EBUILD phpmyadmin-2.11.4.ebuild 1695 RMD160 946bf9da36071e017e9c20c8c8bfa32a3246668e SHA1 b60ab7d0651b0d447b7d07d5b992fe72308673dd SHA256 c31e48a0a3c1554adf74d08b6a59889a700a271aadc99acec5038e0eb7b457ae
+EBUILD phpmyadmin-2.11.5-r1.ebuild 1786 RMD160 14393a40d3329b4d32720d110a41731d9e1611b7 SHA1 f42d40e798dfff38c0caf7fecc56be207e2deb27 SHA256 c3083f3a6275c42a33d791cd8ff25fc9db645553e241a4d3c07c6c5e069bf66f
EBUILD phpmyadmin-2.11.5.ebuild 1685 RMD160 64b2e4e2460011d7211a6bdaf72101c229f729ac SHA1 b85112d991989778e76cf3abbfc3810b3a33dfef SHA256 b658522d3be6a581b2763100b3abaff310a8db1e6d8a8b8b551d8e96753124ce
-MISC ChangeLog 39919 RMD160 7ba50e6aba8152c84851b7a75ed59a09a5b03917 SHA1 920cc4f73b6ccd894f802fa988d42f5a56588a12 SHA256 9707046026346fd4ebe9dceae741bc708ac01894810c63f70def0d35e5620b3f
+MISC ChangeLog 40302 RMD160 35f611e5896f5a3994ca444de499ba8934e0dcca SHA1 a9c93504c7f961fc63ddd5cdf5f24052c54520cf SHA256 db32c51d50380c0c2fbe66a90048513122aaf619ec411b0baef74ec4d3de0cbf
MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfQEG8ACgkQmPFBzbX68WHFCACfWRvYXc+y+95BqNGjktLHfG2e
+9KAAnig/DAlbJqQkd2vPlLuoixVKaoHE
+=hGbD
+-----END PGP SIGNATURE-----
--- /dev/null
+Index: phpMyAdmin-2.11.5-all-languages-utf-8-only/libraries/dbi/mysqli.dbi.lib.php
+===================================================================
+--- phpMyAdmin-2.11.5-all-languages-utf-8-only.orig/libraries/dbi/mysqli.dbi.lib.php
++++ phpMyAdmin-2.11.5-all-languages-utf-8-only/libraries/dbi/mysqli.dbi.lib.php
+@@ -97,6 +97,9 @@ function PMA_DBI_connect($user, $passwor
+ /* Optionally enable SSL */
+ if ($GLOBALS['cfg']['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) {
+ $client_flags |= MYSQLI_CLIENT_SSL;
++ if ($GLOBALS['cfg']['Server']['ssl-key'] && $GLOBALS['cfg']['Server']['ssl-cert'] && $GLOBALS['cfg']['Server']['ssl-ca']) {
++ mysqli_ssl_set($link, $GLOBALS['cfg']['Server']['ssl-key'], $GLOBALS['cfg']['Server']['ssl-cert'], $GLOBALS['cfg']['Server']['ssl-ca'], null, null);
++ }
+ }
+
+ $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags);
1. Configure ${PN}:
- a) Create config.inc.php. You can use the web-based installer:
+a) Create config.inc.php. You can use the web-based installer:
- http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/scripts/setup.php
+ mkdir ${MY_INSTALLDIR}/config
+ chown ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config
- b) Alternatively, use an existing configuration:
+ then go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/scripts/setup.php
- mkdir ${MY_INSTALLDIR}/config
- chmod o+rw ${MY_INSTALLDIR}/config
- cp <path to existing config.inc.php file>/config.inc.php ${MY_INSTALLDIR}/config/
- chown -R ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config
+ once you've saved the configuration:
- C) Alternatively, use the default config file in libraries/config.default.php
+ cp ${MY_INSTALLDIR}/config/config.inc.php ${MY_INSTALLDIR}/config.inc.php
+ rm -rf ${MY_INSTALLDIR}/config
- mkdir ${MY_INSTALLDIR}/config
- chmod o+rw ${MY_INSTALLDIR}/config
- cp ${MY_INSTALLDIR}/libraries/config.default.php ${MY_INSTALLDIR}/config/
- chown -R ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config
+b) Alternatively, use an existing configuration:
+
+ cp <path to existing config.inc.php file> ${MY_INSTALLDIR}/
+
+c) Alternatively, use the sample config file:
+
+ cp ${MY_INSTALLDIR}/config.sample.inc.php ${MY_INSTALLDIR}/config.inc.php
2. Be sure that the libraries/ directory is not visible. You can use the
-provided .htaccess file.
+ provided .htaccess file.
-===============
+=================================================================
If you are upgrading from an earlier version:
-1. If you are using ${PN}'s features for master/foreign tables, be sure to read
- http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/Documentation.html#col_com
-You will need to perform the ALTER TABLE step yourself.
+1. If you are using ${PN}'s features for master/foreign tables, be sure to read
+ http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/Documentation.html#col_com
+
+ You will need to perform the ALTER TABLE step yourself.
+++ /dev/null
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.2.2.ebuild,v 1.8 2008/02/19 13:35:21 hollow 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=""
-RDEPEND=""
-
-S="${WORKDIR}"/${MY_P}
-
-need_php_httpd
-
-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_install() {
- webapp_src_preinst
-
- dodoc CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog
- rm -f LICENSE CREDITS INSTALL README RELEASE-DATE-${MY_PV} TODO
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
-
- 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
-}
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.4.ebuild,v 1.1 2008/02/19 13:35:21 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.5-r1.ebuild,v 1.1 2008/03/06 15:40:21 hollow Exp $
inherit eutils webapp depend.php
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
-DEPEND=""
-RDEPEND=""
+need_httpd_cgi
+need_php_httpd
S="${WORKDIR}"/${MY_P}
-need_php_httpd
-
pkg_setup() {
webapp_pkg_setup
fi
}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${PN}-2.11.5-custom-cert.patch
+}
+
src_install() {
webapp_src_preinst
projects / gentoo.git / commitdiff