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

(Portage version: 2.0.51.19)

3 files changed, 170 insertions, 0 deletions

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;
+   }
+ }