From: Tom William Payne Date: Tue, 14 Dec 2004 11:44:05 +0000 (+0000) Subject: Version bump (security fix). Stable on x86. Bug # 74303. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ac72cdb02b1311d60a9511f8cc4e088ae28b224;p=gentoo.git Version bump (security fix). Stable on x86. Bug # 74303. --- diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog index 7285b2649e71..180699c62106 100644 --- a/dev-db/phpmyadmin/ChangeLog +++ b/dev-db/phpmyadmin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/phpmyadmin # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.71 2004/11/24 08:26:11 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.72 2004/12/14 11:44:04 twp Exp $ + +*phpmyadmin-2.6.1_rc1 (14 Dec 2004) + + 14 Dec 2004; Tom Payne +phpmyadmin-2.6.1_rc1.ebuild: + Version bump (security fix). Stable on x86. Bug # 74303. 06 Nov 2004; Joseph Jezak phpmyadmin-2.6.0_p3.ebuild: Marked ppc stable for bug #71819 diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index c08376d69215..cc43b644257c 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -1,11 +1,13 @@ -MD5 f6d72900d421967d2387e6de599701e1 ChangeLog 10272 -MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 MD5 54edd3d479b9db8cbf54f633581265b5 phpmyadmin-2.6.0_p3.ebuild 2572 +MD5 8b6d4eda03bd9c9200f659443dab0a0e phpmyadmin-2.6.1_rc1.ebuild 2610 +MD5 b2fd98836204f5a599848bba678edcb3 ChangeLog 10438 +MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 MD5 a15cc76e0e9d5fe7a990f19c1bca381d phpmyadmin-2.6.0_p2.ebuild 2572 -MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525 -MD5 7507cfb3edae5600142424613b1eb892 files/digest-phpmyadmin-2.6.0_p3 74 MD5 a424f37ca165d4c8e3c7c0c4295902d8 files/digest-phpmyadmin-2.6.0_p2 74 -MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231 +MD5 7507cfb3edae5600142424613b1eb892 files/digest-phpmyadmin-2.6.0_p3 74 +MD5 4badbcc4cd669e6f934d5c993ff9ae4e files/digest-phpmyadmin-2.6.1_rc1 74 +MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506 +MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857 MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712 -MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506 +MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231 diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_rc1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_rc1 new file mode 100644 index 000000000000..fa2dfb8b84a0 --- /dev/null +++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_rc1 @@ -0,0 +1 @@ +MD5 b413cc56b177547a94e387fa0f7d0334 phpMyAdmin-2.6.1-rc1.tar.bz2 1311277 diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild new file mode 100644 index 000000000000..432949837b31 --- /dev/null +++ b/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild,v 1.1 2004/12/14 11:44:05 twp Exp $ + +inherit eutils webapp + +MY_PV=${PV/_p/-pl} +MY_PV=${PV/_rc/-rc} +MY_P=phpMyAdmin-${MY_PV} +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 ~ppc ~hppa ~sparc x86 ~amd64 ~mips" +IUSE="" +DEPEND=">=net-www/apache-1.3 + >=dev-db/mysql-3.23.32 =dev-php/mod_php-4.1.0 + sys-apps/findutils + !<=dev-db/phpmyadmin-2.5.6" +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/config.inc.php-2.5.6.patch + + # 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}" + mv config.inc.php ${T}/config.inc.php + sed -e "s/@pmapass@/${pmapass}/g" \ + ${T}/config.inc.php > config.inc.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="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO ChangeLog LICENSE README" + + # 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 + + # handle documentation files + # + # NOTE that doc files go into /usr/share/doc as normal; they do NOT + # get installed per vhost! + + dodoc ${docs} + for doc in ${docs} INSTALL; do + rm -f ${doc} + done + + # Copy the app's main files + + einfo "Installing main files" + cp -r . ${D}${MY_HTDOCSDIR} + + # Identify the configuration files that this app uses + + webapp_configfile ${MY_HTDOCSDIR}/config.inc.php + + # Identify any script files that need #! headers adding to run under + # a CGI script (such as PHP/CGI) + # + # for phpmyadmin, we *assume* that all .php files that don't end in + # .inc.php need to have CGI/BIN support added + + for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do + webapp_runbycgibin php ${MY_HTDOCSDIR}/$x + done + + # there are no files which need to be owned by the web server + + # add the post-installation instructions + + webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt + + # all done + # + # now we let the eclass strut its stuff ;-) + + webapp_src_install +}