revision bump to fix security issues and include sparch patch; stable on ppc64

(Portage version: 2.0.51.19)

6 files changed, 230 insertions, 18 deletions

diff --git a/dev-php/phpsysinfo/ChangeLog b/dev-php/phpsysinfo/ChangeLog
index a9255378390a..bc8cace4c61e 100644
--- a/dev-php/phpsysinfo/ChangeLog
+++ b/dev-php/phpsysinfo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php/phpsysinfo
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/ChangeLog,v 1.23 2005/03/15 18:27:04 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/ChangeLog,v 1.24 2005/04/01 17:09:08 corsair Exp $
+
+*phpsysinfo-2.3-r2 (01 Apr 2005)
+
+  01 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  +files/phpsysinfo-2.3-sparc.patch, +files/phpsysinfo-2.3-xss-and-path.patch,
+  +phpsysinfo-2.3-r2.ebuild:
+  Revision bump to fix bug #53178 (sparch cpu patch) and bug #86478 (XSS and
+  path disclosure issues); Stable on ppc64
 
 *phpsysinfo-2.3-r1 (15 Mar 2005)
 
diff --git a/dev-php/phpsysinfo/Manifest b/dev-php/phpsysinfo/Manifest
index 844e38c2b76f..9b3eea54e630 100644
--- a/dev-php/phpsysinfo/Manifest
+++ b/dev-php/phpsysinfo/Manifest
@@ -1,25 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 7de6133e285cec29033a1b44aff6659b ChangeLog 3330
+MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
+MD5 90bc9a8436887302085fbba200aac900 phpsysinfo-2.1-r1.ebuild 1425
 MD5 aa15da55376b3faaa7cb58e80eaee9ca phpsysinfo-2.1-r2.ebuild 1545
 MD5 8827892746bd5882799782a7880220d4 phpsysinfo-2.1.ebuild 909
-MD5 2a4787b7359d335ebb9f0430f4bb3e32 phpsysinfo-2.3.ebuild 1069
-MD5 90bc9a8436887302085fbba200aac900 phpsysinfo-2.1-r1.ebuild 1425
 MD5 08c8fc60174ef3ff913eced95d7bb74c phpsysinfo-2.2.ebuild 1085
-MD5 29a920c00a4c6be7bf2adc0e6b92bca0 ChangeLog 3018
-MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
 MD5 b3595c0eebf0d7f02ddf48ca76940a92 phpsysinfo-2.3-r1.ebuild 1077
+MD5 2a4787b7359d335ebb9f0430f4bb3e32 phpsysinfo-2.3.ebuild 1069
+MD5 05dc4ef741c49abb3a0e1ce7932011e8 phpsysinfo-2.3-r2.ebuild 1139
 MD5 dd6e98f9ae29de67bf46f225d4fe3eff files/digest-phpsysinfo-2.1 66
-MD5 90445c68318e8784cc1d594123e06edc files/digest-phpsysinfo-2.2 66
-MD5 30402e91a4759242922f7eecc7337672 files/digest-phpsysinfo-2.3 66
-MD5 7885e7ba5eca949998923dae36e02071 files/fix_memory_display_kernel2.5.diff.gz 1230
 MD5 31e3ac9396a003b09c5f3caf78c361f2 files/digest-phpsysinfo-2.1-r1 133
 MD5 31e3ac9396a003b09c5f3caf78c361f2 files/digest-phpsysinfo-2.1-r2 133
+MD5 90445c68318e8784cc1d594123e06edc files/digest-phpsysinfo-2.2 66
+MD5 30402e91a4759242922f7eecc7337672 files/digest-phpsysinfo-2.3 66
 MD5 30402e91a4759242922f7eecc7337672 files/digest-phpsysinfo-2.3-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCNykaaGfFFLhbXWkRAqj7AKCGjGuaDrD0KdiZpB5zjhNIzCfcYQCgh9fC
-wmc3GeTOet28KhEbxJaLoeY=
-=zQIm
------END PGP SIGNATURE-----
+MD5 7885e7ba5eca949998923dae36e02071 files/fix_memory_display_kernel2.5.diff.gz 1230
+MD5 ca07aa2a3675997e7e9a7a052b3a4dc1 files/phpsysinfo-2.3-sparc.patch 1652
+MD5 af460f4352a8e4538c0da84d2ac42214 files/phpsysinfo-2.3-xss-and-path.patch 5373
+MD5 30402e91a4759242922f7eecc7337672 files/digest-phpsysinfo-2.3-r2 66
diff --git a/dev-php/phpsysinfo/files/digest-phpsysinfo-2.3-r2 b/dev-php/phpsysinfo/files/digest-phpsysinfo-2.3-r2
new file mode 100644
index 000000000000..f8294f0fe31d
--- /dev/null
+++ b/dev-php/phpsysinfo/files/digest-phpsysinfo-2.3-r2
@@ -0,0 +1 @@
+MD5 8e9a2b7a099e26cbd85f140475512ccc phpsysinfo-2.3.tar.gz 163674
diff --git a/dev-php/phpsysinfo/files/phpsysinfo-2.3-sparc.patch b/dev-php/phpsysinfo/files/phpsysinfo-2.3-sparc.patch
new file mode 100644
index 000000000000..f16b420f8bde
--- /dev/null
+++ b/dev-php/phpsysinfo/files/phpsysinfo-2.3-sparc.patch
@@ -0,0 +1,41 @@
+--- phpsysinfo-dev/includes/os/class.Linux.inc.php.orig	2004-06-07 03:06:47.185996319 +0200
++++ phpsysinfo-dev/includes/os/class.Linux.inc.php	2004-06-07 03:07:15.387538984 +0200
+@@ -176,6 +176,38 @@
+       fclose($fd);
+     } 
+ 
++       // sparc64 specific code follows
++       // This adds the ability to display the cache that a CPU has
++       // Originally made by Sven Blumenstein <bazik@gentoo.org> in 2004
++       // Modified by Tom Weustink <freshy98@gmx.net> in 2004
++
++        if ($fd = fopen('/proc/openprom/SUNW,UltraSPARC@0,0/ecache-size', 'r')) {
++           $results['cache'] = base_convert(fgets($fd, 32), 16, 10)/1024 . ' KB';
++           fclose($fd);
++       }
++
++        if ($fd = fopen('/proc/openprom/SUNW,UltraSPARC-II@0,0/ecache-size', 'r')) {
++           $results['cache'] = base_convert(fgets($fd, 32), 16, 10)/1024 . ' KB';
++           fclose($fd);
++       }
++
++        if ($fd = fopen('/proc/openprom/SUNW,UltraSPARC@1c,0/ecache-size', 'r')) {
++           $results['cache'] = base_convert(fgets($fd, 32), 16, 10)/1024 . ' KB';
++           fclose($fd);
++       }
++
++        if ($fd = fopen('/proc/openprom/SUNW,UltraSPARC-IIi@1c,0/ecache-size', 'r')) {
++           $results['cache'] = base_convert(fgets($fd, 32), 16, 10)/1024 . ' KB';
++           fclose($fd);
++       }
++
++        if ($fd = fopen('/proc/openprom/SUNW,UltraSPARC-II@1c,0/ecache-size', 'r')) {
++           $results['cache'] = base_convert(fgets($fd, 32), 16, 10)/1024 . ' KB';
++           fclose($fd);
++       }
++
++       // sparc64 specific code ends
++
+     $keys = array_keys($results);
+     $keys2be = array('model', 'mhz', 'cache', 'bogomips', 'cpus');
+ 
diff --git a/dev-php/phpsysinfo/files/phpsysinfo-2.3-xss-and-path.patch b/dev-php/phpsysinfo/files/phpsysinfo-2.3-xss-and-path.patch
new file mode 100644
index 000000000000..277bb8ca0a67
--- /dev/null
+++ b/dev-php/phpsysinfo/files/phpsysinfo-2.3-xss-and-path.patch
@@ -0,0 +1,128 @@
+diff -ruN phpsysinfo-dev-orig/includes/XPath.class.php phpsysinfo-dev/includes/XPath.class.php
+--- phpsysinfo-dev-orig/includes/XPath.class.php	2005-04-01 16:19:55.684942096 +0000
++++ phpsysinfo-dev/includes/XPath.class.php	2005-03-23 16:27:33.000000000 +0000
+@@ -4969,7 +4969,7 @@
+       $pos += $afterText ? 1 : 0;
+       $parentNode['textParts'] = array_merge(
+                                    array_slice($parentNode['textParts'], 0, $pos),
+-                                   '',
++                                   array(''),
+                                    array_slice($parentNode['textParts'], $pos)
+                                  );
+       
+@@ -5051,7 +5051,7 @@
+       $pos -= $afterText ? 0 : 1;
+       $parentNode['textParts'] = array_merge(
+                                    array_slice($parentNode['textParts'], 0, $pos),
+-                                   '',
++                                   array(''),
+                                    array_slice($parentNode['textParts'], $pos)
+                                  );
+       // We are going from bottom to top, but the user will want results from top to bottom.
+diff -ruN phpsysinfo-dev-orig/includes/os/class.Darwin.inc.php phpsysinfo-dev/includes/os/class.Darwin.inc.php
+--- phpsysinfo-dev-orig/includes/os/class.Darwin.inc.php	2005-04-01 16:19:55.685941944 +0000
++++ phpsysinfo-dev/includes/os/class.Darwin.inc.php	2005-03-23 16:40:36.000000000 +0000
+@@ -19,8 +19,13 @@
+ 
+ // $Id: class.Darwin.inc.php,v 1.16 2004/06/26 23:46:36 webbie Exp $
+ 
++if(!file_exists('./includes/os/class.BSD.common.inc.php')) {
++    exit;
++}
++
+ require('./includes/os/class.BSD.common.inc.php');
+ 
++
+ echo "<p align=center><b>Note: The Darwin version of phpSysInfo is work in progress, some things currently don't work</b></p>";
+ 
+ class sysinfo extends bsd_common {
+diff -ruN phpsysinfo-dev-orig/includes/os/class.FreeBSD.inc.php phpsysinfo-dev/includes/os/class.FreeBSD.inc.php
+--- phpsysinfo-dev-orig/includes/os/class.FreeBSD.inc.php	2005-04-01 16:19:55.685941944 +0000
++++ phpsysinfo-dev/includes/os/class.FreeBSD.inc.php	2005-03-23 16:41:02.000000000 +0000
+@@ -19,6 +19,10 @@
+ 
+ // $Id: class.FreeBSD.inc.php,v 1.10 2004/06/26 23:46:36 webbie Exp $
+ 
++if(!file_exists('./includes/os/class.BSD.common.inc.php')) {
++    exit;
++}
++
+ require('./includes/os/class.BSD.common.inc.php');
+ 
+ class sysinfo extends bsd_common {
+diff -ruN phpsysinfo-dev-orig/includes/os/class.NetBSD.inc.php phpsysinfo-dev/includes/os/class.NetBSD.inc.php
+--- phpsysinfo-dev-orig/includes/os/class.NetBSD.inc.php	2005-04-01 16:19:55.685941944 +0000
++++ phpsysinfo-dev/includes/os/class.NetBSD.inc.php	2005-03-23 16:41:25.000000000 +0000
+@@ -19,8 +19,13 @@
+ 
+ // $Id: class.NetBSD.inc.php,v 1.11 2004/06/26 23:46:36 webbie Exp $
+ 
++if(!file_exists('./includes/os/class.BSD.common.inc.php')) {
++    exit;
++}
++
+ require('./includes/os/class.BSD.common.inc.php');
+ 
++
+ class sysinfo extends bsd_common {
+   var $cpu_regexp;
+   var $scsi_regexp; 
+diff -ruN phpsysinfo-dev-orig/includes/os/class.OpenBSD.inc.php phpsysinfo-dev/includes/os/class.OpenBSD.inc.php
+--- phpsysinfo-dev-orig/includes/os/class.OpenBSD.inc.php	2005-04-01 16:19:55.686941792 +0000
++++ phpsysinfo-dev/includes/os/class.OpenBSD.inc.php	2005-03-23 16:41:19.000000000 +0000
+@@ -19,8 +19,13 @@
+ 
+ // $Id: class.OpenBSD.inc.php,v 1.14 2004/07/02 02:33:16 webbie Exp $
+ 
++if(!file_exists('./includes/os/class.BSD.common.inc.php')) {
++    exit;
++}
++
+ require('./includes/os/class.BSD.common.inc.php');
+ 
++
+ class sysinfo extends bsd_common {
+   var $cpu_regexp;
+   var $scsi_regexp; 
+diff -ruN phpsysinfo-dev-orig/includes/system_footer.php phpsysinfo-dev/includes/system_footer.php
+--- phpsysinfo-dev-orig/includes/system_footer.php	2005-04-01 16:19:55.687941640 +0000
++++ phpsysinfo-dev/includes/system_footer.php	2005-03-23 16:33:59.000000000 +0000
+@@ -13,6 +13,11 @@
+ // along with this program; if not, write to the Free Software
+ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ // $Id: system_footer.php,v 1.38 2004/08/13 23:02:32 webbie Exp $
++
++if (eregi('system_footer.php', $_SERVER['PHP_SELF'])) {
++	exit;
++}
++
+ if (!$hide_picklist) {
+   echo "<center>";
+ 
+diff -ruN phpsysinfo-dev-orig/includes/system_header.php phpsysinfo-dev/includes/system_header.php
+--- phpsysinfo-dev-orig/includes/system_header.php	2005-04-01 16:19:55.685941944 +0000
++++ phpsysinfo-dev/includes/system_header.php	2005-03-23 16:30:38.000000000 +0000
+@@ -18,6 +18,11 @@
+ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+ // $Id: system_header.php,v 1.21 2003/11/08 23:49:16 precision Exp $
++
++if (eregi('system_header.php', $_SERVER['PHP_SELF'])) {
++	exit;
++}
++
+ header("Cache-Control: no-cache, must-revalidate");
+ if (!isset($charset)) {
+   $charset = 'iso-8859-1';
+diff -ruN phpsysinfo-dev-orig/index.php phpsysinfo-dev/index.php
+--- phpsysinfo-dev-orig/index.php	2005-04-01 16:19:55.688941488 +0000
++++ phpsysinfo-dev/index.php	2005-03-23 16:35:50.000000000 +0000
+@@ -122,7 +122,7 @@
+     require('./includes/mb/class.' . $sensor_program . '.inc.php');
+     $mbinfo = new mbinfo;
+   } else {
+-    echo '<center><b>Error: ' . $sensor_program . ' is not currently supported</b></center>';
++    echo '<center><b>Error: ' . htmlentities($sensor_program) . ' is not currently supported</b></center>';
+     exit;
+   }
+ }
diff --git a/dev-php/phpsysinfo/phpsysinfo-2.3-r2.ebuild b/dev-php/phpsysinfo/phpsysinfo-2.3-r2.ebuild
new file mode 100644
index 000000000000..06dda8bdb6ec
--- /dev/null
+++ b/dev-php/phpsysinfo/phpsysinfo-2.3-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/phpsysinfo-2.3-r2.ebuild,v 1.1 2005/04/01 17:09:08 corsair Exp $
+
+inherit eutils webapp
+
+DESCRIPTION="phpSysInfo is a nice package that will display your system stats via PHP."
+HOMEPAGE="http://phpsysinfo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/phpsysinfo/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~hppa ~sparc ~amd64 ppc64"
+IUSE=""
+
+DEPEND="$DEPEND >=net-www/apache-1.3.27-r1
+	>=virtual/httpd-php-4.3.8"
+
+S=${WORKDIR}/${PN}-dev
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-xss-and-path.patch
+	epatch ${FILESDIR}/${P}-sparc.patch
+	cd ${S}
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -R templates ${D}${MY_HTDOCSDIR} || die "cp failed"
+	cp -R includes ${D}${MY_HTDOCSDIR} || die "cp failed"
+	cp *.php ${D}${MY_HTDOCSDIR} || die "cp failed"
+	cp -R images ${D}${MY_HTDOCSDIR} || die "cp failed"
+
+	cp config.php.new ${D}${MY_HTDOCSDIR}/config.php || die "cp failed"
+	webapp_configfile ${MY_HTDOCSDIR}
+
+	dodoc ChangeLog README
+
+	webapp_src_install
+}