diff options
| author |   Renat Lumpau <rl03@gentoo.org> | 2005-11-10 14:00:51 +0000 |
|---|---|---|
| committer | Renat Lumpau <rl03@gentoo.org> | 2005-11-10 14:00:51 +0000 |
| commit | 2891c04d2f4fcc066eaa735f91db373ae9346063 (patch) | |
| tree | fb0de7d366cfc961248b5bd075c163ef7dc2f343 /dev-db | |
| parent | version bump: v1.23HotFix1 (job lost on some types of printer errors) (diff) | |
| download | gentoo-2-2891c04d2f4fcc066eaa735f91db373ae9346063.tar.gz gentoo-2-2891c04d2f4fcc066eaa735f91db373ae9346063.tar.bz2 gentoo-2-2891c04d2f4fcc066eaa735f91db373ae9346063.zip | |
Fix reconfig hook wrt bug #112021.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/phpmyadmin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/Manifest | 13 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/files/reconfig-2.7 | 16 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild | 4 |
4 files changed, 25 insertions, 14 deletions
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog index d0b8a252e79e..4b7c46d42aa4 100644 --- a/dev-db/phpmyadmin/ChangeLog +++ b/dev-db/phpmyadmin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/phpmyadmin # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.140 2005/11/09 19:11:36 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.141 2005/11/10 14:00:51 rl03 Exp $ + + 10 Nov 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-2.7, + phpmyadmin-2.7.0_beta1.ebuild: + Fix reconfig hook wrt bug #112021. 09 Nov 2005; Renat Lumpau <rl03@gentoo.org> phpmyadmin-2.7.0_beta1.ebuild: new version should be unstable on x86 diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index 5255e7f5e0e3..8df06573d5c9 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -1,21 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 b4ba6a5f1a3b6aa9056725a253ee6361 phpmyadmin-2.7.0_beta1.ebuild 2063 +MD5 3510e7b065a051cce719ce2b33c1ed46 phpmyadmin-2.7.0_beta1.ebuild 2067 MD5 06ef9cf16f596c7eace1c9a7e6e54725 phpmyadmin-2.6.4_p3.ebuild 2093 MD5 e72efc5c5d19aa05bc4266b32c15fc0e ChangeLog 19553 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162 MD5 0fb913f47fa22640fc0df136df21818c files/digest-phpmyadmin-2.6.4_p3 74 +MD5 03e1c16e02d105f6fcfb56c1bf734f6e files/reconfig-2.7 319 MD5 0cd8fc0cfff0431b90baeaa43ab92365 files/digest-phpmyadmin-2.7.0_beta1 76 MD5 ab6e8b5ecc163d415aebb7d2c42238a3 files/config.default.php-2.7.0.patch 5533 MD5 c9eb06723752a2bcafd88c3164e83ea2 files/postinstall-en.txt 593 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525 MD5 a7201a857705dfcec9502fc7dd3a96db files/reconfig 315 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDcknxEzitwsaoONoRAo/xAJwMXKGy9HVsK1pxLMSkCd8bUwFy6QCfUZ4y -9te26T2Ki40Kw2fktVRkkaA= -=xDot ------END PGP SIGNATURE----- diff --git a/dev-db/phpmyadmin/files/reconfig-2.7 b/dev-db/phpmyadmin/files/reconfig-2.7 new file mode 100644 index 000000000000..84d92c08fe7c --- /dev/null +++ b/dev-db/phpmyadmin/files/reconfig-2.7 @@ -0,0 +1,16 @@ +#!/bin/bash + +die() { + echo "#####" + echo $1 + echo "#####" + exit 1 +} + +if [ $1 = "install" ]; then + cd ${MY_INSTALLDIR} + sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}/${VHOST_APPDIR}';|g" -i config.default.php || die "sed failed" + +elif [ $1 = "clean" ]; then + echo $1 +fi diff --git a/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild index b21a15950e04..5e80b2c51b93 100644 --- a/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild,v 1.2 2005/11/09 19:11:36 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild,v 1.3 2005/11/10 14:00:51 rl03 Exp $ inherit eutils webapp @@ -58,7 +58,7 @@ src_install() { webapp_configfile ${MY_HTDOCSDIR}/config.default.php webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt - webapp_hook_script ${FILESDIR}/reconfig + webapp_hook_script ${FILESDIR}/reconfig-2.7 webapp_src_install fperms 0640 ${MY_HTDOCSDIR}/config.default.php |