Fix for bug #39248

5 files changed, 57 insertions, 4 deletions

diff --git a/dev-php/phpsysinfo/ChangeLog b/dev-php/phpsysinfo/ChangeLog
index 28a20ded8d30..e680a9368509 100644
--- a/dev-php/phpsysinfo/ChangeLog
+++ b/dev-php/phpsysinfo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/phpsysinfo
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/ChangeLog,v 1.9 2004/03/21 14:56:37 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/ChangeLog,v 1.10 2004/03/28 22:30:57 stuart Exp $
+
+  28 Mar 2004; Stuart Herbert <stuart@gentoo.org> :
+  Included working 2.5/2.6 kernel patch from Stephen Reindl
+  <sr@stephenreindl.de>. The patch is now auto-applied as well.
+  Fixes bug #39248
 
   21 Mar 2004; Martin Holzer <mholzer@gentoo.org> phpsysinfo-2.1.ebuild:
   adding categorie. see 45110 for details
diff --git a/dev-php/phpsysinfo/Manifest b/dev-php/phpsysinfo/Manifest
index 19b19a581c2d..ca3f14ddae93 100644
--- a/dev-php/phpsysinfo/Manifest
+++ b/dev-php/phpsysinfo/Manifest
@@ -1,6 +1,9 @@
-MD5 a95ba20f01d9e64b901e33780b83e411 ChangeLog 1197
-MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
-MD5 d2b137b1bac0a1e85dd98d8304b53045 phpsysinfo-2.1-r1.ebuild 1423
 MD5 94a0153ea83ef62e1da926a337518d44 phpsysinfo-2.1.ebuild 911
+MD5 d2b137b1bac0a1e85dd98d8304b53045 phpsysinfo-2.1-r1.ebuild 1423
+MD5 b77aa9e8e908e8c3135cf33ce1963cb9 ChangeLog 1393
+MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
+MD5 421a0191eff0cbc0836f6e9eb48c872f phpsysinfo-2.1-r2.ebuild 1244
 MD5 dd6e98f9ae29de67bf46f225d4fe3eff files/digest-phpsysinfo-2.1 66
 MD5 31e3ac9396a003b09c5f3caf78c361f2 files/digest-phpsysinfo-2.1-r1 133
+MD5 31e3ac9396a003b09c5f3caf78c361f2 files/digest-phpsysinfo-2.1-r2 133
+MD5 7885e7ba5eca949998923dae36e02071 files/fix_memory_display_kernel2.5.diff.gz 1230
diff --git a/dev-php/phpsysinfo/files/digest-phpsysinfo-2.1-r2 b/dev-php/phpsysinfo/files/digest-phpsysinfo-2.1-r2
new file mode 100644
index 000000000000..eb6876585821
--- /dev/null
+++ b/dev-php/phpsysinfo/files/digest-phpsysinfo-2.1-r2
@@ -0,0 +1,2 @@
+MD5 22d4d7977dfff237f8e0aa3e4ebaee75 phpSysInfo-2.1.tar.gz 104141
+MD5 966612f8eaa0675afcfcbf8e048f2bef phpsysinfo_2.1-1.diff.gz 3601
diff --git a/dev-php/phpsysinfo/files/fix_memory_display_kernel2.5.diff.gz b/dev-php/phpsysinfo/files/fix_memory_display_kernel2.5.diff.gz
new file mode 100644
index 000000000000..2f7e48d21f12
--- /dev/null
+++ b/dev-php/phpsysinfo/files/fix_memory_display_kernel2.5.diff.gz
diff --git a/dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild b/dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild
new file mode 100644
index 000000000000..7ae98f115ef8
--- /dev/null
+++ b/dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild,v 1.1 2004/03/28 22:30:57 stuart Exp $
+
+inherit eutils
+
+MY_PN="phpSysInfo"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="phpSysInfo is a nice package that will display your system stats via PHP."
+HOMEPAGE="http://phpsysinfo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/phpsysinfo/${MY_P}.tar.gz
+	mirror://debian/pool/main/p/phpsysinfo/${PN}_${PV}-1.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc ~alpha hppa ~sparc amd64"
+
+DEPEND=">=net-www/apache-1.3.27-r1
+	>=dev-php/mod_php-4.2.3-r2"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	epatch ${DISTDIR}/${PN}_${PV}-1.diff.gz
+	mv ${P}/debian ${S}
+	rmdir ${P}
+	epatch ${S}/debian/patches/urlencoded-security-fix.diff
+	epatch ${FILESDIR}/fix_memory_display_kernel2.5.diff.gz
+}
+
+src_install() {
+	HTDOCS="/var/www/localhost/htdocs"
+	insinto ${HTDOCS}/phpsysinfo
+	doins *.{php,dtd}
+	cp -pR templates ${D}${HTDOCS}/phpsysinfo
+	cp -pR includes  ${D}${HTDOCS}/phpsysinfo
+	dodoc COPYING  ChangeLog  README
+}
+
+pkg_postinst() {
+	einfo "Your stats are now available at http://localhost/phpsysinfo"
+}