Version bump (#79348). Fixes XML_RPC vulnerability (#97399).

Package-Manager: portage-2.0.51.22-r1

11 files changed, 30 insertions, 366 deletions

diff --git a/www-apps/xoops/ChangeLog b/www-apps/xoops/ChangeLog
index 921cd31f1c5b..a64249a8d9bc 100644
--- a/www-apps/xoops/ChangeLog
+++ b/www-apps/xoops/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/xoops
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/ChangeLog,v 1.5 2005/06/30 19:09:48 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/ChangeLog,v 1.6 2005/07/03 02:24:02 rl03 Exp $
+
+*xoops-2.0.13 (03 Jul 2005)
+
+  03 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  -files/xoops-2.0.9.2-fix-file-ext-validation.diff,
+  files/postinstall-en.txt, -xoops-2.0.7.3.ebuild, -xoops-2.0.9.2.ebuild,
+  -xoops-2.0.12a.ebuild, +xoops-2.0.13.ebuild:
+  Version bump (#79348). Fixes XML_RPC vulnerability (#97399).
 
 *xoops-2.0.12a (30 Jun 2005)
 
diff --git a/www-apps/xoops/Manifest b/www-apps/xoops/Manifest
index d89fbeab912f..9362d9547fd5 100644
--- a/www-apps/xoops/Manifest
+++ b/www-apps/xoops/Manifest
@@ -1,20 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ed8744e6206d371498a43399e70534ce xoops-2.0.12a.ebuild 1078
-MD5 7f4cff833f3178dd76e7028238fbea77 xoops-2.0.9.2.ebuild 1132
-MD5 e21aa1fae16c30b648e13f62bda93760 xoops-2.0.7.3.ebuild 1045
-MD5 047c3721bd017c7f15d84a66ab7ef336 ChangeLog 1041
+MD5 dfcb8d12632714100b8232d3497620e6 xoops-2.0.13.ebuild 1069
+MD5 ce16ae006311fcdf66a397babfc58051 ChangeLog 1351
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 5e4fc169f3bd7008c2fb1ac862675cae files/postinstall-en.txt 227
-MD5 a9ba3f7c610e345bd07f5c8b6964dc33 files/xoops-2.0.9.2-fix-file-ext-validation.diff 9322
-MD5 57b466ed6f1639c9e7ddf9ddbdd02631 files/digest-xoops-2.0.12a 66
-MD5 9b1db386f585147b9692a8c6b62dc574 files/digest-xoops-2.0.7.3 63
-MD5 b764bcab4a4628d34a4bc65f693f35bc files/digest-xoops-2.0.9.2 66
+MD5 9d3f6311f54b87c63103b72dcef932a3 files/postinstall-en.txt 311
+MD5 324536cbf2f1b6fd03aeea0705783734 files/digest-xoops-2.0.13 65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCxEOZEZCkKN40op4RAl5VAKCDRmOF7pKQ7+Q87DPsfxLNTfrGEQCeMMDS
-xGKtFyL2aTVnAAckKykh+/E=
-=mR3T
+iD8DBQFCx0xLEzitwsaoONoRAhRjAJ9Fg4LuM0JkzemPg5tppHyqIVGN6QCeK8PI
+HNXulxfmii5dRMe5QnQ1UkY=
+=9DZj
 -----END PGP SIGNATURE-----
diff --git a/www-apps/xoops/files/digest-xoops-2.0.12a b/www-apps/xoops/files/digest-xoops-2.0.12a
deleted file mode 100644
index f52ac37f2376..000000000000
--- a/www-apps/xoops/files/digest-xoops-2.0.12a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46e9d4a42371cdb07ca7183438aab96b Xoops-2.0.12a.tar.gz 1088705
diff --git a/www-apps/xoops/files/digest-xoops-2.0.13 b/www-apps/xoops/files/digest-xoops-2.0.13
new file mode 100644
index 000000000000..36216414236f
--- /dev/null
+++ b/www-apps/xoops/files/digest-xoops-2.0.13
@@ -0,0 +1 @@
+MD5 fbccac3b7ac2003caed8c1125b3d6180 Xoops-2.0.13.tar.gz 1088620
diff --git a/www-apps/xoops/files/digest-xoops-2.0.7.3 b/www-apps/xoops/files/digest-xoops-2.0.7.3
deleted file mode 100644
index 76c66e5b7d31..000000000000
--- a/www-apps/xoops/files/digest-xoops-2.0.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef2bc7f3ee20a940753df6cf51f97cc7 xoops-2.0.7.3.tgz 1107235
diff --git a/www-apps/xoops/files/digest-xoops-2.0.9.2 b/www-apps/xoops/files/digest-xoops-2.0.9.2
deleted file mode 100644
index 2381276bf7f5..000000000000
--- a/www-apps/xoops/files/digest-xoops-2.0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10c620da751aa1b709b2b6f7985021c2 xoops-2.0.9.2.tar.gz 1118423
diff --git a/www-apps/xoops/files/postinstall-en.txt b/www-apps/xoops/files/postinstall-en.txt
index c7b9ce00ba91..359bc730d7ff 100644
--- a/www-apps/xoops/files/postinstall-en.txt
+++ b/www-apps/xoops/files/postinstall-en.txt
@@ -1,6 +1,12 @@
 Now create a database for Xoops to use (consult your MySQL manual if you don't
 know how.
-Then browse to http://yourhost/xoops
+You will need to
+ 
+ chmod 666 ${MY_INSTALLDIR}/mainfile.php
 
-When you are done with the installer, remove the install/ directory, and chmod
-mainfile.php to 444.
+Then browse to http://${VHOST_HOSTNAME}/xoops
+
+When you are done with the installer:
+ 
+ rm -rf ${MY_INSTALLDIR}/install
+ chmod 444 ${MY_INSTALLDIR}/mainfile.php
diff --git a/www-apps/xoops/files/xoops-2.0.9.2-fix-file-ext-validation.diff b/www-apps/xoops/files/xoops-2.0.9.2-fix-file-ext-validation.diff
deleted file mode 100644
index 3e3335fc574e..000000000000
--- a/www-apps/xoops/files/xoops-2.0.9.2-fix-file-ext-validation.diff
+++ /dev/null
@@ -1,273 +0,0 @@
-diff --exclude='*~' -urN xoops-2.0.9.2.orig/html/class/mimetypes.inc.php xoops-2.0.9.2/html/class/mimetypes.inc.php
---- xoops-2.0.9.2.orig/html/class/mimetypes.inc.php	1969-12-31 19:00:00.000000000 -0500
-+++ xoops-2.0.9.2/html/class/mimetypes.inc.php	2005-03-11 12:37:12.081298241 -0500
-@@ -0,0 +1,117 @@
-+<?php
-+/**
-+* Extension to mimetype lookup table
-+*
-+* This file is provided as an helper for objects who need to perform filename to mimetype translations.
-+* Common types have been provided, but feel free to add your own one if you need it.
-+* <br /><br />
-+* See the enclosed file LICENSE for licensing information.
-+* If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
-+*
-+* @copyright    The Xoops project http://www.xoops.org/
-+* @license      http://www.fsf.org/copyleft/gpl.html GNU public license
-+* @author       Skalpa Keo <skalpa@xoops.org>
-+* @since        2.0.9.3
-+*/
-+return array(
-+     "hqx"		=> "application/mac-binhex40",
-+     "doc"		=> "application/msword",
-+     "dot"		=> "application/msword",
-+     "bin"		=> "application/octet-stream",
-+     "lha"		=> "application/octet-stream",
-+     "lzh"		=> "application/octet-stream",
-+     "exe"		=> "application/octet-stream",
-+     "class"	=> "application/octet-stream",
-+     "so"		=> "application/octet-stream",
-+     "dll"		=> "application/octet-stream",
-+     "pdf"		=> "application/pdf",
-+     "ai"		=> "application/postscript",
-+     "eps"		=> "application/postscript",
-+     "ps"		=> "application/postscript",
-+     "smi"		=> "application/smil",
-+     "smil"		=> "application/smil",
-+     "wbxml"	=> "application/vnd.wap.wbxml",
-+     "wmlc"		=> "application/vnd.wap.wmlc",
-+     "wmlsc"	=> "application/vnd.wap.wmlscriptc",
-+     "xla"		=> "application/vnd.ms-excel",
-+     "xls"		=> "application/vnd.ms-excel",
-+     "xlt"		=> "application/vnd.ms-excel",
-+     "ppt"		=> "application/vnd.ms-powerpoint",
-+     "csh"		=> "application/x-csh",
-+     "dcr"		=> "application/x-director",
-+     "dir"		=> "application/x-director",
-+     "dxr"		=> "application/x-director",
-+     "spl"		=> "application/x-futuresplash",
-+     "gtar"		=> "application/x-gtar",
-+     "php"		=> "application/x-httpd-php",
-+     "php3"		=> "application/x-httpd-php",
-+     "php5"		=> "application/x-httpd-php",
-+     "phtml"	=> "application/x-httpd-php",
-+     "js"		=> "application/x-javascript",
-+     "sh"		=> "application/x-sh",
-+     "swf"		=> "application/x-shockwave-flash",
-+     "sit"		=> "application/x-stuffit",
-+     "tar"		=> "application/x-tar",
-+     "tcl"		=> "application/x-tcl",
-+     "xhtml"	=> "application/xhtml+xml",
-+     "xht"		=> "application/xhtml+xml",
-+     "xhtml"	=> "application/xml",
-+     "ent"		=> "application/xml-external-parsed-entity",
-+     "dtd"		=> "application/xml-dtd",
-+     "mod"		=> "application/xml-dtd",
-+     "gz"		=> "application/x-gzip",
-+     "zip"		=> "application/zip",
-+     "au"		=> "audio/basic",
-+     "snd"		=> "audio/basic",
-+     "mid"		=> "audio/midi",
-+     "midi"		=> "audio/midi",
-+     "kar"		=> "audio/midi",
-+     "mp1"		=> "audio/mpeg",
-+     "mp2"		=> "audio/mpeg",
-+     "mp3"		=> "audio/mpeg",
-+     "aif"		=> "audio/x-aiff",
-+     "aiff"		=> "audio/x-aiff",
-+     "m3u"		=> "audio/x-mpegurl",
-+     "ram"		=> "audio/x-pn-realaudio",
-+     "rm"		=> "audio/x-pn-realaudio",
-+     "rpm"		=> "audio/x-pn-realaudio-plugin",
-+     "ra"		=> "audio/x-realaudio",
-+     "wav"		=> "audio/x-wav",
-+     "bmp"		=> "image/bmp",
-+     "gif"		=> "image/gif",
-+     "jpeg"		=> "image/jpeg",
-+     "jpg"		=> "image/jpeg",
-+     "jpe"		=> "image/jpeg",
-+     "png"		=> "image/png",
-+     "tiff"		=> "image/tiff",
-+     "tif"		=> "image/tif",
-+     "wbmp"		=> "image/vnd.wap.wbmp",
-+     "pnm"		=> "image/x-portable-anymap",
-+     "pbm"		=> "image/x-portable-bitmap",
-+     "pgm"		=> "image/x-portable-graymap",
-+     "ppm"		=> "image/x-portable-pixmap",
-+     "xbm"		=> "image/x-xbitmap",
-+     "xpm"		=> "image/x-xpixmap",
-+	 "ics"		=> "text/calendar",
-+	 "ifb"		=> "text/calendar",
-+     "css"		=> "text/css",
-+     "html"		=> "text/html",
-+     "htm"		=> "text/html",
-+     "asc"		=> "text/plain",
-+     "txt"		=> "text/plain",
-+     "rtf"		=> "text/rtf",
-+     "sgml"		=> "text/x-sgml",
-+     "sgm"		=> "text/x-sgml",
-+     "tsv"		=> "text/tab-seperated-values",
-+     "wml"		=> "text/vnd.wap.wml",
-+     "wmls"		=> "text/vnd.wap.wmlscript",
-+     "xsl"		=> "text/xml",
-+     "mpeg"		=> "video/mpeg",
-+     "mpg"		=> "video/mpeg",
-+     "mpe"		=> "video/mpeg",
-+     "qt"		=> "video/quicktime",
-+     "mov"		=> "video/quicktime",
-+     "avi"		=> "video/x-msvideo",
-+);
-+
-+?>
-diff --exclude='*~' -urN xoops-2.0.9.2.orig/html/class/uploader.php xoops-2.0.9.2/html/class/uploader.php
---- xoops-2.0.9.2.orig/html/class/uploader.php	2005-03-11 12:34:09.527394373 -0500
-+++ xoops-2.0.9.2/html/class/uploader.php	2005-03-11 12:38:27.795812193 -0500
-@@ -84,11 +84,17 @@
-  */

- class XoopsMediaUploader

- {

-+	/**

-+	* Flag indicating if unrecognized mimetypes should be allowed (use with precaution ! may lead to security issues )

-+	**/

-+ 	var $allowUnknownTypes = false;

-+

-     var $mediaName;

-     var $mediaType;

-     var $mediaSize;

-     var $mediaTmpName;

-     var $mediaError;

-+    var $mediaRealType = '';

- 

-     var $uploadDir = '';

- 

-@@ -97,7 +103,7 @@
-     var $maxFileSize = 0;

-     var $maxWidth;

-     var $maxHeight;

--    

-+

-     var $targetFileName;

- 

-     var $prefix;

-@@ -108,9 +114,12 @@
- 

-     var $savedFileName;

- 

-+

-+	var $extensionToMime = array();

-+

-     /**

-      * Constructor

--     * 

-+     *

-      * @param   string  $uploadDir

-      * @param   array   $allowedMimeTypes

-      * @param   int     $maxFileSize

-@@ -118,8 +127,13 @@
-      * @param   int     $maxHeight

-      * @param   int     $cmodvalue

-      **/

--    function XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth=null, $maxHeight=null)

-+    function XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize=0, $maxWidth=null, $maxHeight=null)

-     {

-+		@$this->extensionToMime = include( XOOPS_ROOT_PATH . '/class/mimetypes.inc.php' );

-+		if ( !is_array( $this->extensionToMime ) ) {

-+		 	$this->extensionToMime = array();

-+			return false;

-+		}

-         if (is_array($allowedMimeTypes)) {

-             $this->allowedMimeTypes =& $allowedMimeTypes;

-         }

-@@ -135,14 +149,18 @@
- 

-     /**

-      * Fetch the uploaded file

--     * 

-+     *

-      * @param   string  $media_name Name of the file field

-      * @param   int     $index      Index of the file (if more than one uploaded under that name)

-      * @return  bool

-      **/

-     function fetchMedia($media_name, $index = null)

-     {

--        if (!isset($_FILES[$media_name])) {

-+		if ( empty( $this->extensionToMime ) ) {

-+			$this->setErrors( 'Error loading mimetypes definition' );

-+			return false;

-+		}

-+		if (!isset($_FILES[$media_name])) {

-             $this->setErrors('File not found');

-             return false;

-         } elseif (is_array($_FILES[$media_name]['name']) && isset($index)) {

-@@ -161,6 +179,14 @@
-             $this->mediaTmpName = $media_name['tmp_name'];

-             $this->mediaError = !empty($media_name['error']) ? $media_name['error'] : 0;

-         }

-+		if ( ($ext = strrpos( $this->mediaName, '.' )) !== false ) {

-+			$ext = substr( $this->mediaName, $ext + 1 );

-+			if ( isset( $this->extensionToMime[$ext] ) ) {

-+				$this->mediaRealType = $this->extensionToMime[$ext];

-+				trigger_error( "XoopsMediaUploader: Set mediaRealType to {$this->mediaRealType} (file extension is $ext)", E_USER_NOTICE );

-+			}

-+		}

-+

-         $this->errors = array();

-         if (intval($this->mediaSize) < 0) {

-             $this->setErrors('Invalid File Size');

-@@ -170,10 +196,6 @@
-             $this->setErrors('Filename Is Empty');

-             return false;

-         }

--        if ( preg_match( '/\.(php|cgi|pl|py|asp)$/i', $this->mediaName ) ) {

--            $this->setErrors('Filename rejected');

--            return false;

--		}

-         if ($this->mediaTmpName == 'none' || !is_uploaded_file($this->mediaTmpName)) {

-             $this->setErrors('No file uploaded');

-             return false;

-@@ -380,20 +402,19 @@
-     }

- 

-     /**

--     * Is the file the right Mime type 

--     * 

--     * (is there a right type of mime? ;-)

--     * 

-+     * Check whether or not the uploaded file type is allowed

-+     *

-      * @return  bool

-      **/

-     function checkMimeType()

-     {

--        if (count($this->allowedMimeTypes) > 0 && !in_array($this->mediaType, $this->allowedMimeTypes)) {

--            return false;

--        } else {

--            return true;

--        }

--    }

-+		if ( empty( $this->mediaRealType ) && !$this->allowUnknownTypes ) {

-+			$this->setErrors( 'Unknown filetype rejected' );

-+			return false;

-+		}

-+

-+		return ( empty($this->allowedMimeTypes) || in_array($this->mediaRealType, $this->allowedMimeTypes) );

-+	}

- 

-     /**

-      * Add an error

-@@ -407,7 +428,7 @@
- 

-     /**

-      * Get generated errors

--     * 

-+     *

-      * @param    bool    $ashtml Format using HTML?

-      * 

-      * @return    array|string    Array of array messages OR HTML string

-@@ -428,4 +449,4 @@
-         }

-     }

- }

--?>
-\ No newline at end of file
-+?>

diff --git a/www-apps/xoops/xoops-2.0.12a.ebuild b/www-apps/xoops/xoops-2.0.13.ebuild
index 03d05d2f2b26..85a6afbeef88 100644
--- a/www-apps/xoops/xoops-2.0.12a.ebuild
+++ b/www-apps/xoops/xoops-2.0.13.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/xoops-2.0.12a.ebuild,v 1.1 2005/06/30 19:09:48 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/xoops-2.0.13.ebuild,v 1.1 2005/07/03 02:24:02 rl03 Exp $
 
 inherit webapp eutils
 
-MY_P="${PN/x/X}-${PV}"
+MY_P="${P/x/X}"
 DESCRIPTION="eXtensible Object Oriented Portal System (xoops) is an open-source Content Management System, including various portal features and supplemental modules."
 HOMEPAGE="http://www.xoops.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
@@ -22,13 +22,13 @@ src_install() {
 	webapp_src_preinst
 	dodoc docs/CHANGES.txt
 	dohtml docs/INSTALL.html
-	mv docs/images ${D}/usr/share/doc/${PF}/html
+	cp -R docs/images ${D}/usr/share/doc/${PF}/html
 
 	cp -a html/* "${D}/${MY_HTDOCSDIR}"
 	webapp_serverowned ${MY_HTDOCSDIR}/uploads
 	webapp_serverowned ${MY_HTDOCSDIR}/cache
 	webapp_serverowned ${MY_HTDOCSDIR}/templates_c
-	webapp_serverowned ${MY_HTDOCSDIR}/mainfile.php
+	webapp_configfile ${MY_HTDOCSDIR}/mainfile.php
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
 	webapp_src_install
 }
diff --git a/www-apps/xoops/xoops-2.0.7.3.ebuild b/www-apps/xoops/xoops-2.0.7.3.ebuild
deleted file mode 100644
index cef11c20403b..000000000000
--- a/www-apps/xoops/xoops-2.0.7.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/xoops-2.0.7.3.ebuild,v 1.3 2005/03/11 22:22:02 luckyduck Exp $
-
-inherit webapp
-
-DESCRIPTION="eXtensible Object Oriented Portal System (xoops) is an open-source Content Management System, including various portal features and supplemental modules."
-HOMEPAGE="http://www.xoops.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-RDEPEND=">=virtual/php-4.1.1
-	net-www/apache
-	>=dev-db/mysql-3.23"
-
-S=${WORKDIR}/${P}/${P}
-
-src_install() {
-	webapp_src_preinst
-	dodoc docs/CHANGES.txt
-	dohtml docs/INSTALL.html
-	mv docs/images ${D}/usr/share/doc/${PF}/html
-
-	cp -a html/* "${D}/${MY_HTDOCSDIR}"
-	webapp_serverowned ${MY_HTDOCSDIR}/uploads
-	webapp_serverowned ${MY_HTDOCSDIR}/cache
-	webapp_serverowned ${MY_HTDOCSDIR}/templates_c
-	webapp_serverowned ${MY_HTDOCSDIR}/mainfile.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/xoops/xoops-2.0.9.2.ebuild b/www-apps/xoops/xoops-2.0.9.2.ebuild
deleted file mode 100644
index fe2afe321130..000000000000
--- a/www-apps/xoops/xoops-2.0.9.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xoops/xoops-2.0.9.2.ebuild,v 1.2 2005/03/11 22:22:02 luckyduck Exp $
-
-inherit webapp eutils
-
-DESCRIPTION="eXtensible Object Oriented Portal System (xoops) is an open-source Content Management System, including various portal features and supplemental modules."
-HOMEPAGE="http://www.xoops.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-RDEPEND=">=virtual/php-4.1.1
-	net-www/apache
-	>=dev-db/mysql-3.23"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fix-file-ext-validation.diff
-}
-
-src_install() {
-	webapp_src_preinst
-	dodoc docs/CHANGES.txt
-	dohtml docs/INSTALL.html
-	mv docs/images ${D}/usr/share/doc/${PF}/html
-
-	cp -a html/* "${D}/${MY_HTDOCSDIR}"
-	webapp_serverowned ${MY_HTDOCSDIR}/uploads
-	webapp_serverowned ${MY_HTDOCSDIR}/cache
-	webapp_serverowned ${MY_HTDOCSDIR}/templates_c
-	webapp_serverowned ${MY_HTDOCSDIR}/mainfile.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_src_install
-}