Non-maintainer version bump, security bug #317299.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index 3d09f9cff141ea779cc2ea29c59d3e8e921d04e3..ea67b1d49106ef0526ad6795ea1258b22f882351 100644 (file)
--- a/www-apps/joomla/ChangeLog
+++ b/www-apps/joomla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/joomla
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.36 2010/04/26 07:43:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.37 2010/05/03 11:22:17 keytoaster Exp $
+
+*joomla-1.5.17 (03 May 2010)
+
+  03 May 2010; Tobias Heinlein <keytoaster@gentoo.org>
+  -joomla-1.5.15.ebuild, -joomla-1.5.16.ebuild, +joomla-1.5.17.ebuild:
+  Non-maintainer version bump, security bug #317299.
 
 *joomla-1.5.16 (26 Apr 2010)
 

diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index 914370037ffc424d8eeb8be1bf23821f80ffc88b..a131e6112ff730eb438b7e4e8e0686223610ef18 100644 (file)
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA1
 
 AUX postinstall-en.txt 754 RMD160 ebc0e7808af410d94fb6fa1b7296ecee1ffa15ec SHA1 bc1c99b4edaaee5d97826543f47c6efcf134df2d SHA256 36261f2301653a1c715a9edf43d0ad89fd0721e3a6c4e55ad4d4b7f1b5adf28c
-DIST Joomla_1.5.15-Stable-Full_Package.zip 6778161 RMD160 231bf141242a2bbbb348660001681219ab0bf228 SHA1 bb11bca6562b08443fcb669d47b238e1859672a8 SHA256 9f71a88210978e02dd0c191cb778608c5f3bf837767bf2fe5cd3c104ecdef941
-DIST Joomla_1.5.16-Stable-Full_Package.zip 6800546 RMD160 8850d7c7a7859ef6650493acf1511f3924c20b8a SHA1 7995a18301022773366a15a6d97fe99a395c0f31 SHA256 5b6d4e92254a281989514ca3bf79e209a660245b7c980c6d08733a6f288b1f78
-EBUILD joomla-1.5.15.ebuild 1522 RMD160 243831d677e135f48b3b98b7748e9ded6094e02f SHA1 db9d5e29490bc117de51ea3b3a527f75f074413c SHA256 f68e34be2b89a743b92a18a1ede89364a1e9473cabcc73e0bcf354a02ded26f7
-EBUILD joomla-1.5.16.ebuild 1522 RMD160 0383754868e30869387dad3569dc0ef90c45534d SHA1 82156da092df1e7086e83294871f094b38607d6d SHA256 3398e79a687458da83691c9f3c4947ac8f0b0556c012e7e23c929e403dc7faf1
-MISC ChangeLog 5668 RMD160 480d04d7d5650666797bf0ab147839c6a71b20b1 SHA1 41aa329b524fb4576f1ec1638fc911cf47171c65 SHA256 9e9cfd517170c4c450265e49716b4cd418545b02097b2c59f559e2490f5638b9
+DIST Joomla_1.5.17-Stable-Full_Package.zip 6898964 RMD160 478578ee854107b98651baf0ac6e2c771081fa57 SHA1 7c550ca88667d4a1f155dd0310b5f01a7c6152ad SHA256 71bdcb834d96564002d3deb70e645f473f1adbb1af2f341c6b28ff97c490d3d7
+EBUILD joomla-1.5.17.ebuild 1527 RMD160 d7a7ae46c5b9b3bbc2576fd05d8b7f6e65c9eb31 SHA1 2780fd4e197eacba08bc2bde59c5dfe7db482e75 SHA256 ec1ec89f56cc986b634841802098c377fa9ad501abde68980d46a8a01636308b
+MISC ChangeLog 5883 RMD160 fbb0d3d0e550d15d3bcdd2ad4c85e58836d31c56 SHA1 7a443ffdf02f77c0b820227e97dc23b61e75e3ff SHA256 096a26b4910ea96667f6cad9683c9ecb55f787bdf57de644aa189a9e860673c0
 MISC metadata.xml 370 RMD160 813b0609248db59832046ee34292a97a852d7fad SHA1 e5d144968f32af8cfd40e634b2b2c46cc15d9201 SHA256 59f1025ef78a8d3ff7d8fff822b627650ae9c3bab801d3e12703e4240ff064cd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvVRCsACgkQNQqtfCuFneNMjACdEmoGXGvwvtQi5Eo9K6lHcQrh
-IcAAn2vIznzB0/R+vuL2do9SLCIEYVhJ
-=XvN9
+iEYEARECAAYFAkvesfEACgkQt3UOBHx+2m84NgCePumwm+mYZOJExcPCc6JhZyeX
+kVAAnj8srcKDJY2QeAoj1lELqdyLpR6C
+=m3c2
 -----END PGP SIGNATURE-----

diff --git a/www-apps/joomla/joomla-1.5.16.ebuild b/www-apps/joomla/joomla-1.5.16.ebuild
deleted file mode 100644 (file)
index b09133d..0000000
--- a/www-apps/joomla/joomla-1.5.16.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.5.16.ebuild,v 1.1 2010/04/26 07:43:29 fauli Exp $
-
-inherit webapp depend.php
-
-DESCRIPTION="Joomla is a powerful Open Source Content Management System."
-HOMEPAGE="http://www.joomla.org/"
-SRC_URI="http://joomlacode.org/gf/download/frsrelease/12153/49329/Joomla_${PV}-Stable-Full_Package.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"
-
-DEPEND="${DEPEND}
-       app-arch/unzip"
-RDEPEND=""
-
-pkg_setup () {
-       webapp_pkg_setup
-       require_php_with_use mysql zlib xml
-}
-
-src_install () {
-       webapp_src_preinst
-
-       dodoc CHANGELOG.php INSTALL.php
-
-       touch configuration.php
-       insinto "${MY_HTDOCSDIR}"
-       doins -r .
-
-       local files="administrator/backups administrator/cache
-       administrator/components administrator/language administrator/language/en-GB
-       administrator/modules administrator/templates cache components images
-       images/banners images/stories language language/en-GB language/pdf_fonts
-       media modules plugins plugins/content plugins/editors plugins/editors-xtd
-       plugins/search plugins/system plugins/user plugins/xmlrpc tmp templates"
-
-       for file in ${files}; do
-               webapp_serverowned "${MY_HTDOCSDIR}"/${file}
-       done
-
-       webapp_configfile "${MY_HTDOCSDIR}"/configuration.php
-       webapp_serverowned "${MY_HTDOCSDIR}"/configuration.php
-
-       webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-       webapp_src_install
-}

diff --git a/www-apps/joomla/joomla-1.5.15.ebuild b/www-apps/joomla/joomla-1.5.17.ebuild
similarity index 85%
rename from www-apps/joomla/joomla-1.5.15.ebuild
rename to www-apps/joomla/joomla-1.5.17.ebuild
index c56b1814faf750af9f579ea37d28ba1c39071112..92b267303ce774845e667e4a0e16515886764a7e 100644 (file)
--- a/www-apps/joomla/joomla-1.5.15.ebuild
+++ b/www-apps/joomla/joomla-1.5.17.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.5.15.ebuild,v 1.1 2009/12/25 00:37:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.5.17.ebuild,v 1.1 2010/05/03 11:22:17 keytoaster Exp $
 
 inherit webapp depend.php
 
 DESCRIPTION="Joomla is a powerful Open Source Content Management System."
 HOMEPAGE="http://www.joomla.org/"
-SRC_URI="http://joomlacode.org/gf/download/frsrelease/11396/45610/Joomla_${PV}-Stable-Full_Package.zip"
+SRC_URI="http://joomlacode.org/gf/download/frsrelease/12193/49780/Joomla_${PV}-Stable-Full_Package.zip"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"