version bump; fixes #210225 and security #204335; remove vulnerable version

Package-Manager: portage-2.1.4.4

diff --git a/www-apps/joomla/ChangeLog b/www-apps/joomla/ChangeLog
index 486549e0a0b5f08c31a4756ee9a944dbd01ae89c..fcfd1b324133e5872a23978ca81a11ae2fc27f7a 100644 (file)
--- a/www-apps/joomla/ChangeLog
+++ b/www-apps/joomla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/joomla
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.17 2008/01/23 09:29:55 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/ChangeLog,v 1.18 2008/02/23 11:21:31 hollow Exp $
+
+*joomla-1.5.1 (23 Feb 2008)
+
+  23 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  -joomla-1.5.0.ebuild, +joomla-1.5.1.ebuild:
+  version bump; fixes #210225 and security #204335; remove vulnerable version
 
 *joomla-1.5.0 (23 Jan 2008)
 

diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index 4fa68413797d1a999986f9e6de9cc4a32e9a98dc..6dc8516f4c83bd9618d9f9e2fcd6129846524b81 100644 (file)
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 754 RMD160 ebc0e7808af410d94fb6fa1b7296ecee1ffa15ec SHA1 bc1c99b4edaaee5d97826543f47c6efcf134df2d SHA256 36261f2301653a1c715a9edf43d0ad89fd0721e3a6c4e55ad4d4b7f1b5adf28c
-DIST Joomla-1.5.0.tar.bz2 3255672 RMD160 cf1c6a9da3d1ae5f125916d347a224a96f7082f5 SHA1 80da606ea6d4cb3d9a1ffce1dfc6ad0f5702d9a6 SHA256 56fb0ac8910ff33732efaf48a5ef12e6aefc52219bede34ad5c1a911d4198eef
-EBUILD joomla-1.5.0.ebuild 1340 RMD160 7de8e84594bff5012a025556f9ec93408a89ce68 SHA1 bfda05188b22cf706d6441c19a44c41657ea3c9a SHA256 c685e71d54664c98071cbea5a00549038df9dc6f9efb67140c5491f1d9397605
-MISC ChangeLog 2724 RMD160 ea44c5db57c3fdcf4c2206127a2915a04700f026 SHA1 60f9eb90fe6cacc18174b59ebe544f4b88054320 SHA256 931f07ff58e7db6322180c491db21f6f3f48f2371c4084d3a0602bd45859cb93
-MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+DIST Joomla_1.5.1-Stable-Full_Package.tar.bz2 3261542 RMD160 df1ce879da32d2b4859c0ee6a38e4abc16ce66bc SHA1 0db6eedc22ff510f60e5a686062291e947263a96 SHA256 28ece08ab0d26f3b1ff80f02641fb0086ddb4c629c32e791c10aacf14c43305e
+EBUILD joomla-1.5.1.ebuild 1436 RMD160 22e96ab1c9b297ef1ab13e4d2fcbd0899c8fe1e9 SHA1 914e75e7a916660b2ef6e367b1f230d6b8a267a2 SHA256 d35edd08886b0078e41163a645510e706d736ea582d259f8de3d5bc578e9d805
+MISC ChangeLog 2942 RMD160 16ffac43cde024793bc255bd40bd036f1603fe58 SHA1 9a7483489bd88c66c28d3fa81ebfaaebf23fd270 SHA256 cf882305f90e8ae7ae4be17e499b7c7b3a8d2c4e778ad52374b67a50d1d09b58
+MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfAAcUACgkQmPFBzbX68WFZtQCeMLquZhVz2y+SyY1G2b23tQps
+VuoAnj9xJlSwd8BvxyEQYOH2TIyZkW3K
+=oLvf
+-----END PGP SIGNATURE-----

diff --git a/www-apps/joomla/joomla-1.5.0.ebuild b/www-apps/joomla/joomla-1.5.0.ebuild
deleted file mode 100644 (file)
index 426d8d8..0000000
--- a/www-apps/joomla/joomla-1.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.5.0.ebuild,v 1.1 2008/01/23 09:29:55 wrobel Exp $
-
-inherit webapp depend.php
-
-MY_PN=${PN/j/J}
-
-DESCRIPTION="Joomla is one of the most powerful Open Source Content Management Systems on the planet."
-HOMEPAGE="http://www.joomla.org/"
-SRC_URI="http://joomlacode.org/gf/download/frsrelease/5078/21063/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-S="${WORKDIR}"
-
-IUSE=""
-
-RDEPEND="virtual/httpd-cgi"
-
-need_php
-
-pkg_setup () {
-       webapp_pkg_setup
-       require_php_with_use mysql zlib
-}
-
-src_install () {
-       webapp_src_preinst
-       local files="administrator/backups administrator/components
-       administrator/modules administrator/templates cache components
-       images images/banners images/stories language
-       media modules templates configuration.php"
-
-       dodoc CHANGELOG.php INSTALL.php
-
-       cp -R . "${D}/${MY_HTDOCSDIR}"
-
-       # Create an empty configuration file that will be writeable
-       #to the web server
-       touch "${D}/${MY_HTDOCSDIR}/configuration.php"
-
-       for file in ${files}; do
-               webapp_serverowned "${MY_HTDOCSDIR}/${file}"
-       done
-
-       webapp_configfile "${MY_HTDOCSDIR}/configuration.php"
-
-       webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-
-       webapp_src_install
-}

diff --git a/www-apps/joomla/joomla-1.5.1.ebuild b/www-apps/joomla/joomla-1.5.1.ebuild
new file mode 100644 (file)
index 0000000..f04c7a1
--- /dev/null
+++ b/www-apps/joomla/joomla-1.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/joomla/joomla-1.5.1.ebuild,v 1.1 2008/02/23 11:21:31 hollow Exp $
+
+inherit webapp depend.php
+
+DESCRIPTION="Joomla is a powerful Open Source Content Management System."
+HOMEPAGE="http://www.joomla.org/"
+SRC_URI="http://downloads.joomlacode.org/frsrelease/2/2/0/22005/Joomla_${PV}-Stable-Full_Package.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"
+
+pkg_setup () {
+       webapp_pkg_setup
+       require_php_with_use mysql zlib
+}
+
+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
+       configuration.php"
+
+       for file in ${files}; do
+               webapp_serverowned "${MY_HTDOCSDIR}"/${file}
+       done
+
+       webapp_configfile "${MY_HTDOCSDIR}"/configuration.php
+
+       webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+       webapp_src_install
+}

diff --git a/www-apps/joomla/metadata.xml b/www-apps/joomla/metadata.xml
index 95c06f0095bb5e1cb1425260446652b686ec5c8f..6632069b5affe97b4a3e8c8a10c3fef22951c014 100644 (file)
--- a/www-apps/joomla/metadata.xml
+++ b/www-apps/joomla/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+       <herd>web-apps</herd>
 </pkgmetadata>