Version bump, security bug #155468.

Package-Manager: portage-2.1.2_rc1-r5

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index f4721ef3a34a4301a30000fbdb4dca510ad1ac73..324856336a713466f9228cc48a466610cb0bb6df 100644 (file)
--- 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/Manifest b/dev-db/phpmyadmin/Manifest
index 9d66a925b32441c4c78035da80848069dbd7e81d..cb79b357e55f05b075f679a1e8338146d17a580c 100644 (file)
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -23,18 +23,23 @@ RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 files/reconfig-2.8 329
 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612 files/reconfig-2.8 329
 DIST phpMyAdmin-2.9.0.3-all-languages-utf-8-only.tar.bz2 1542886 RMD160 522c932bd1020652d1923e0c98118fa26cc02986 SHA1 45c11c5de79138cb472ca24f763e266797dd1cd2 SHA256 08e2e7997cd8e9c3123e22a7fc90ba0363928231edbd79e41651316b0c42669e
 DIST phpMyAdmin-2.9.1-all-languages-utf-8-only.tar.bz2 1544946 RMD160 0eb4b6acde8ab3a9c35ead3d1a064ce1efbaf565 SHA1 7eda2decf117b644b0e7d22986b4020ddab3f287 SHA256 463a0cf156aab1c32e2a46a1b736f43614b97cf082b45b64147084a6211f7905
+DIST phpMyAdmin-2.9.1.1-all-languages-utf-8-only.tar.bz2 1545641 RMD160 8c21b9450534f674931c3c056c4b0f34a0ba009f SHA1 12eb273ce3a91e0dcf5ba84b42acbd1f564233f8 SHA256 2a4b8379f0fbcdef6bbc3112be13fa19de67a564196456fda77e13642f7ac0e5
 EBUILD phpmyadmin-2.9.0.3.ebuild 2663 RMD160 949a8120f34dccd81a574e9592de558b2e393b2d SHA1 fb91ac035f80eadfede25ec36f1b70d573571cee SHA256 1f53a10ae64c95171817256bfa4f92edf34f8f05fc4b4a9a678f3114bb0782be
 MD5 93ebc2700e48feb8a6b1cf43daf440cd phpmyadmin-2.9.0.3.ebuild 2663
 RMD160 949a8120f34dccd81a574e9592de558b2e393b2d phpmyadmin-2.9.0.3.ebuild 2663
 SHA256 1f53a10ae64c95171817256bfa4f92edf34f8f05fc4b4a9a678f3114bb0782be phpmyadmin-2.9.0.3.ebuild 2663
+EBUILD phpmyadmin-2.9.1.1.ebuild 2667 RMD160 300180bcd4df0c9c520e250b961e92d5f90783a1 SHA1 ce2b270f30867fd7d7dc6189b09196fecfb26723 SHA256 6e23958e7cd28405b3b46a41d64c568fd08215552dc522bb2a55ee39f9059062
+MD5 0c7a8a970464f93392bf62b1b6df40e8 phpmyadmin-2.9.1.1.ebuild 2667
+RMD160 300180bcd4df0c9c520e250b961e92d5f90783a1 phpmyadmin-2.9.1.1.ebuild 2667
+SHA256 6e23958e7cd28405b3b46a41d64c568fd08215552dc522bb2a55ee39f9059062 phpmyadmin-2.9.1.1.ebuild 2667
 EBUILD phpmyadmin-2.9.1.ebuild 2665 RMD160 a6e8774e5298324e1d8203f39da4994acbcf9488 SHA1 2f7f9e3ca5eadfe14b8bdeef208dfa65db1f9757 SHA256 2a7fb406aa8c5e62a41354ff0335da90d5ecc2dea02551a3a46957c3a70e61c0
 MD5 8fd145f4cb4f4dfb1b33ef48a99165c9 phpmyadmin-2.9.1.ebuild 2665
 RMD160 a6e8774e5298324e1d8203f39da4994acbcf9488 phpmyadmin-2.9.1.ebuild 2665
 SHA256 2a7fb406aa8c5e62a41354ff0335da90d5ecc2dea02551a3a46957c3a70e61c0 phpmyadmin-2.9.1.ebuild 2665
-MISC ChangeLog 30173 RMD160 f4935b8f1072e09a3c7729298ff77222692674cd SHA1 005f3fd4b94a3e06f96636cc7e99a9a7e1e47a98 SHA256 a7bb05bceaf35dc78af3037dfa721312977918e8220fc77a0f8c1843a750b25b
-MD5 d27cf5a9a79f25a7c65bd708daf121e3 ChangeLog 30173
-RMD160 f4935b8f1072e09a3c7729298ff77222692674cd ChangeLog 30173
-SHA256 a7bb05bceaf35dc78af3037dfa721312977918e8220fc77a0f8c1843a750b25b ChangeLog 30173
+MISC ChangeLog 30321 RMD160 37d0926cbc457fab0e3496366c30f9fc35a86175 SHA1 2ca95297f3d15127bf30406db83a6ae1c264c839 SHA256 f1376617d9ce1ba49119222bcf099407140dba1ccde83878315a2a5a49e2f097
+MD5 4852e9807bfa81e194384b0cb5ecd353 ChangeLog 30321
+RMD160 37d0926cbc457fab0e3496366c30f9fc35a86175 ChangeLog 30321
+SHA256 f1376617d9ce1ba49119222bcf099407140dba1ccde83878315a2a5a49e2f097 ChangeLog 30321
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
@@ -45,10 +50,13 @@ SHA256 63bb1c6023a04ce4c8fef070f82ec27fabe31b65a2657aad96ea21c69b15bfc9 files/di
 MD5 88174fc3a7299617336e581c9ceb5ee1 files/digest-phpmyadmin-2.9.1 331
 RMD160 51af71b750395cce38faafdee935139878e58b7c files/digest-phpmyadmin-2.9.1 331
 SHA256 07251dbec6a4f709faa0082f8cb03f995fccb71e4f3917e9ef90f5403a870bb1 files/digest-phpmyadmin-2.9.1 331
+MD5 bf0d666ad3ebeb9629500545aff539dd files/digest-phpmyadmin-2.9.1.1 337
+RMD160 f8e6770d06ab77da4066dce624fde52f52122e52 files/digest-phpmyadmin-2.9.1.1 337
+SHA256 439b479648f77327d77f2e01224bdaf5a9d280dd23beb5a12b46b3c6319334f1 files/digest-phpmyadmin-2.9.1.1 337
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFU6pREzitwsaoONoRAgksAJ9aYaAdisb8GqJfc5ZY2C2w9tA4XQCg2omX
-0aoEjF7aOLHzbR/IeDWUl/w=
-=Uz08
+iD8DBQFFYMdUEzitwsaoONoRAghlAJ9ArMpaKGECWRRb8lFxpd+UN6MFnQCg1beV
+m7d68WDpYnQi67W26b4LDQc=
+=sprW
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..7dd465a
--- /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 (file)
index 0000000..a0b547b
--- /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
+}