From: Tobias Heinlein <keytoaster@gentoo.org>
Date: Thu, 3 Jun 2010 12:46:47 +0000 (+0000)
Subject: Non-maintainer version bump, security bug #321917.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18ad64c35882ddbb7967ccda97b92bf6fce7f7cb;p=gentoo.git

Non-maintainer version bump, security bug #321917.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index ea67b1d49106..e896246744d4 100644
--- 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.37 2010/05/03 11:22:17 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.38 2010/06/03 12:46:47 keytoaster Exp $
+
+*joomla-1.5.18 (03 Jun 2010)
+
+  03 Jun 2010; Tobias Heinlein <keytoaster@gentoo.org>
+  +joomla-1.5.18.ebuild:
+  Non-maintainer version bump, security bug #321917.
 
 *joomla-1.5.17 (03 May 2010)
 
diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index a131e6112ff7..1fc5e6c1c282 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -3,13 +3,15 @@ Hash: SHA1
 
 AUX postinstall-en.txt 754 RMD160 ebc0e7808af410d94fb6fa1b7296ecee1ffa15ec SHA1 bc1c99b4edaaee5d97826543f47c6efcf134df2d SHA256 36261f2301653a1c715a9edf43d0ad89fd0721e3a6c4e55ad4d4b7f1b5adf28c
 DIST Joomla_1.5.17-Stable-Full_Package.zip 6898964 RMD160 478578ee854107b98651baf0ac6e2c771081fa57 SHA1 7c550ca88667d4a1f155dd0310b5f01a7c6152ad SHA256 71bdcb834d96564002d3deb70e645f473f1adbb1af2f341c6b28ff97c490d3d7
+DIST Joomla_1.5.18-Stable-Full_Package.zip 6809461 RMD160 be4d83c30345353de4e4d2c6d8d647432dd7b447 SHA1 3020a5cbce10b2880c2f37b03254decf1f09afa1 SHA256 74c839f69dd8e3502a033b95ab2eba4e84a6bf78bcc50b9bef0999499e327ceb
 EBUILD joomla-1.5.17.ebuild 1527 RMD160 d7a7ae46c5b9b3bbc2576fd05d8b7f6e65c9eb31 SHA1 2780fd4e197eacba08bc2bde59c5dfe7db482e75 SHA256 ec1ec89f56cc986b634841802098c377fa9ad501abde68980d46a8a01636308b
-MISC ChangeLog 5883 RMD160 fbb0d3d0e550d15d3bcdd2ad4c85e58836d31c56 SHA1 7a443ffdf02f77c0b820227e97dc23b61e75e3ff SHA256 096a26b4910ea96667f6cad9683c9ecb55f787bdf57de644aa189a9e860673c0
+EBUILD joomla-1.5.18.ebuild 1527 RMD160 75d341d2715fdba111eb72876e41e2971f024913 SHA1 98f1785f4a8a712eb3c7f78f231168b8b0e8dff7 SHA256 ca5401f9ab3d410965e49ba39b2d8517544ea942dc820fe9cea72d7b9af517e5
+MISC ChangeLog 6047 RMD160 c9b82c6b233f952de966cc6ca7d0798b84203296 SHA1 f8ec5e023babbe4c1fa7e214a3006ba8f99ffaf1 SHA256 35974ec3404bb29ffc94a6f865c53f5065343dfd8e0fe8e6457f4ebf6e733a27
 MISC metadata.xml 370 RMD160 813b0609248db59832046ee34292a97a852d7fad SHA1 e5d144968f32af8cfd40e634b2b2c46cc15d9201 SHA256 59f1025ef78a8d3ff7d8fff822b627650ae9c3bab801d3e12703e4240ff064cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvesfEACgkQt3UOBHx+2m84NgCePumwm+mYZOJExcPCc6JhZyeX
-kVAAnj8srcKDJY2QeAoj1lELqdyLpR6C
-=m3c2
+iEYEARECAAYFAkwHpEQACgkQt3UOBHx+2m/IiACfd7eNFqCAQTaR1E/hojbzzoO4
+sEQAoIFO+ClS+m4iiNZGbWRn7TnIhUke
+=4YlC
 -----END PGP SIGNATURE-----
diff --git a/www-apps/joomla/joomla-1.5.18.ebuild b/www-apps/joomla/joomla-1.5.18.ebuild
new file mode 100644
index 000000000000..89f72b9fcdc7
--- /dev/null
+++ b/www-apps/joomla/joomla-1.5.18.ebuild
@@ -0,0 +1,54 @@
+# 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.18.ebuild,v 1.1 2010/06/03 12:46:47 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/12350/51111/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
+}