summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorAlex Legler <a3li@gentoo.org>2009-10-13 16:41:09 +0000
committerAlex Legler <a3li@gentoo.org>2009-10-13 16:41:09 +0000
commit2f3b7961cc67905d68cab221295346b2a713b483 (patch)
treea09dcd314927fdb4799dd1dcc042bef8f5724da7 /dev-db
parentChange append-ldflags -lpthread to append-flags -pthread wrt #226889 (diff)
downloadhistorical-2f3b7961cc67905d68cab221295346b2a713b483.tar.gz
historical-2f3b7961cc67905d68cab221295346b2a713b483.tar.bz2
historical-2f3b7961cc67905d68cab221295346b2a713b483.zip
Non-maintainer commit: Version bump for security bug 288899. Removing unneded vulnerable versions.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/phpmyadmin/ChangeLog11
-rw-r--r--dev-db/phpmyadmin/Manifest18
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild (renamed from dev-db/phpmyadmin/phpmyadmin-2.11.9.4.ebuild)4
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-3.2.0.1.ebuild59
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild (renamed from dev-db/phpmyadmin/phpmyadmin-3.2.2.ebuild)2
5 files changed, 21 insertions, 73 deletions
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 7d36ce6e64a5..1e2a256a41a5 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for dev-db/phpmyadmin
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.369 2009/09/18 08:28:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.370 2009/10/13 16:41:09 a3li Exp $
+
+*phpmyadmin-3.2.2.1 (13 Oct 2009)
+*phpmyadmin-2.11.9.6 (13 Oct 2009)
+
+ 13 Oct 2009; Alex Legler <a3li@gentoo.org> -phpmyadmin-2.11.9.4.ebuild,
+ +phpmyadmin-2.11.9.6.ebuild, -phpmyadmin-3.2.0.1.ebuild,
+ -phpmyadmin-3.2.2.ebuild, +phpmyadmin-3.2.2.1.ebuild:
+ Non-maintainer commit: Version bump for security bug 288899. Removing
+ unneded vulnerable versions.
*phpmyadmin-3.2.2 (18 Sep 2009)
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 33b812d2c28c..1eb963903cae 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -5,20 +5,18 @@ AUX phpmyadmin-2.11.5-custom-cert.patch 1000 RMD160 e8ae7f29c5958e8626c91bf62600
AUX postinstall-en-2.8.0.txt 1117 RMD160 09838ab10f2f2cc44ca6154d182ddb573905f12c SHA1 c0c08a1ca71c54a1c900221a5bfd1fd12ecbb04a SHA256 b353e94a59c71131bc617f2e2c2b8d659c67d9277c86d20545da6b26bb08d12d
AUX postinstall-en-3.1.txt 1106 RMD160 75302bc9009db38cd7564feb5f48a776ab6457e8 SHA1 fab327c0a7212c85e283632a83d3899aa4388f2c SHA256 80296f8df3e1c7740f205bd876c841dd5712a262c4d903034f5db6fb8f26448a
AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612
-DIST phpMyAdmin-2.11.9.4-all-languages-utf-8-only.tar.bz2 2243244 RMD160 dff596b0ecd38d461650662cb6542aa868e64302 SHA1 469a15667a53f962ddd89e2b5c0b2a76fe197be4 SHA256 fbbb5a7d87df3d0ca13b8b7758cef46d4570b2ecb1776a4f26009ac2f76f320a
DIST phpMyAdmin-2.11.9.5-all-languages-utf-8-only.tar.bz2 2243708 RMD160 10e64ed0dde29272aee98997d99b486e8619fed2 SHA1 fbe83d0969b998f04809b41f4e33d717f93b3967 SHA256 9779e82d003da0e5e3a3875d0bf1a31ffb2f57bbd99230ae4ab91ad080b3daa3
-DIST phpMyAdmin-3.2.0.1-all-languages.tar.bz2 2688216 RMD160 5f255e23849e909fecc23cc5ca92071178c1b613 SHA1 7b1e9444fcb332b792999ac2f4bd57f3722e8531 SHA256 222bf89da5bf58fd6abe0781c9a358f71baa473026fb0866ee24d3d720fb7132
-DIST phpMyAdmin-3.2.2-all-languages.tar.bz2 2741508 RMD160 a08f00ec98bd1004ce4c5eb22c78a5e15ba838bb SHA1 271af738ac2798540fc395745c3a6fe5d5fc9f4e SHA256 98871c8ee9fc96925e5e89b32ed6afd75cb53a9a9b1515c42b91d8e45e1eebf4
-EBUILD phpmyadmin-2.11.9.4.ebuild 1744 RMD160 16e704cd7dd248a0cc81db0c2d57908c4bc67009 SHA1 f74e793c9dbb5a1f641d2dadfa1ee049a1f78f05 SHA256 45ea5b16854dfe2183f3ff0ede4e0af5d0aa1d3be8b89db1ccac89a3c990b7ff
+DIST phpMyAdmin-2.11.9.6-all-languages-utf-8-only.tar.bz2 2223389 RMD160 09b28c9d35f3303d5764edd1045a8cf4bac2dca0 SHA1 c5f8967054bd6155f9282bff2cf7f2a558c17267 SHA256 d044bd0184b96d215eae2c34f0d51337a96889e72fbb0f54d58c66184091694e
+DIST phpMyAdmin-3.2.2.1-all-languages.tar.bz2 2741815 RMD160 5771f205d5ab8683cc81a961f8d587defe546f55 SHA1 71bdc795147b54c219f87fa63e7430779cef786b SHA256 35137e126e0d21089ae50e926a0bad363acb2ce1271fea34a94f143e4cb677dd
EBUILD phpmyadmin-2.11.9.5.ebuild 1744 RMD160 e694bf235ab7f1a64eb0bb0b9f9501e9fd3d1b72 SHA1 0a65f104680e04a40307f76a09717d8c503f8771 SHA256 4d0831e05c3a7c37e829a06e760040301216a7f3ea9505564b4674d271ffea0d
-EBUILD phpmyadmin-3.2.0.1.ebuild 1692 RMD160 8191b1b15548430c06dec269bd889f7e7402282b SHA1 ff50f7139fbaf04fe0b0027c1614b2495d8e4e2f SHA256 a76979f11d947018f2aa8ccd3c279a9d5865c73748a318dd03bd6c6ff5bf1e92
-EBUILD phpmyadmin-3.2.2.ebuild 1321 RMD160 7568abe9f866779f5c25e56675b137d1ae7b1514 SHA1 d6e06e26cb522a45d899f5b1c2c25281cb3088fb SHA256 8ef410c1f4330d42be4610e2a267eb45d330412e75155ca31538ffe1eccfdb03
-MISC ChangeLog 50514 RMD160 37c4c80cf85a99e9358b7fc64362e76825a5eef2 SHA1 912ad848f5f4660952befe1ac6b939f39b8c7843 SHA256 53eaf6b983cab603ae3b2119f10e3e6f8337c86cbefacb2250c025b711fd8140
+EBUILD phpmyadmin-2.11.9.6.ebuild 1748 RMD160 79107111705eadf38099e1f7ea238e95dfad081b SHA1 954a35be7c9f06545eb5fdd9c844bdf3b1cb0386 SHA256 4a0b3cff5e5767a0a5f923a53554ec7d0850b33e77cf751aca9ed66d7620ece7
+EBUILD phpmyadmin-3.2.2.1.ebuild 1318 RMD160 537818cdc554acf084c29ea2c3e704cf93f321e3 SHA1 117d2a42bed8ebed7f81433cb26f1de8b54db6ce SHA256 0b786bac30c3bcf658b776d6e75c8bfa008e3373fd6b73f317bb22d491dae0b5
+MISC ChangeLog 50872 RMD160 f7db94687bed1b9d3aa6b5534754049b351eb519 SHA1 585e779a7357889af5d45dab5a007eef2ce3f233 SHA256 3b4d5b995724c51a1e3405564723544940604486b4df9c062d7d6d4c84636d68
MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkqzRNIACgkQHB6c3gNBRYcJ5gCglSVgFChvC3N5oroLSuXbA9Vv
-ejUAoK0tO7HV6FHnmM4y2ADLiq2eeECB
-=b+W8
+iEYEARECAAYFAkrUrYQACgkQaGsKqSU7eCSt9gCgr8DBhL9z8sIwoWGoyo6C1amc
++HAAnA19B7Z1RtJNdJ8dX0AzHF9PCXkk
+=pUgx
-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.9.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild
index 7e77577c1090..ae81f26ca4b2 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.9.4.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.9.4.ebuild,v 1.8 2009/01/05 17:31:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.9.6.ebuild,v 1.1 2009/10/13 16:41:09 a3li Exp $
inherit eutils webapp depend.php
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
need_httpd_cgi
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.2.0.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.2.0.1.ebuild
deleted file mode 100644
index 1e3eb7a24c45..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-3.2.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.2.0.1.ebuild,v 1.1 2009/08/01 12:45:19 a3li Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-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=""
-
-RDEPEND=">=virtual/mysql-5.0"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
- webapp_pkg_setup
-
- if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype filter pcre session spl 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 "crypt ctype filter pcre session spl 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
- 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-3.1.txt
- webapp_hook_script "${FILESDIR}"/reconfig-2.8
- webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.2.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild
index e1c97abbfa10..1f22d6a65b81 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.2.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.2.2.ebuild,v 1.1 2009/09/18 08:28:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.2.2.1.ebuild,v 1.1 2009/10/13 16:41:09 a3li Exp $
EAPI="2"