Fix for bugs #60742 58375

5 files changed, 87 insertions, 10 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index fcfaa41c034a..f7462facb13d 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/gallery
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.1 2004/08/15 10:00:35 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.2 2004/08/19 06:35:48 rl03 Exp $
+
+*gallery-1.4.4-r1 (19 Aug 2004)
+
+  19 Aug 2004; Renat Lumpau <rl03@gentoo.org> +files/vuln-20040817.diff,
+  +gallery-1.4.4-r1.ebuild:
+  Fix for possible PHP insertion (bug #60742). Updated for webapp.eclass (bug
+  #58375).
 
 *gallery-1.4.3_p2 (15 Aug 2004)
 
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index 049702b0aeb6..3074699c4c38 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,14 +1,17 @@
-MD5 ebb7be3df3a3c8d49f7c061bfb767ea7 ChangeLog 4079
-MD5 a634f343806b8f29e65d7dc37f55c151 gallery-1.4.1_p1.ebuild 1782
-MD5 af8bfec3bb8d80efd8bd338725e68a51 gallery-1.4.2.ebuild 1737
-MD5 9a2718e33c5a1117f12ace30d666f97a gallery-1.4.3.ebuild 1738
-MD5 0db9f0201bc0dea57d882671c72ef1f7 gallery-1.4.3_p1.ebuild 1741
-MD5 c3751d7c11ee91b539624a1728f38424 gallery-1.4.3_p2.ebuild 1763
+MD5 404bcab2b1f62e7c973d4871df02c5be gallery-1.4.2.ebuild 1735
+MD5 5317b2a09c22e27dbfb478e62eaaf539 gallery-1.4.1_p1.ebuild 1780
+MD5 5733aaa5e89ea1a8253a8ce74086dfd9 gallery-1.4.3_p2.ebuild 1763
+MD5 7a94491a7ff43afa55d44139272fdf69 gallery-1.4.4.ebuild 1760
+MD5 d4be29ec034abd2c81e93a6bb2cebd8e gallery-1.4.3_p1.ebuild 1739
+MD5 9e1b88e9eaaec6d6fed2f043600e84bf gallery-1.4.3.ebuild 1736
+MD5 f623e4f9ee949e74ef9f9345b7a7f47e ChangeLog 4601
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 c2edfb65e8ce3dddc52d8b82a447497a gallery-1.4.4.ebuild 1762
+MD5 81427b9f34fb81efa65cc3f60f6594b6 gallery-1.4.4-r1.ebuild 1012
+MD5 763f3e84ab504c5f79b9bc2feaae0083 files/digest-gallery-1.4.4-r1 66
 MD5 d4812c8c0c1fad4c00cda3e8ad7bbe8a files/digest-gallery-1.4.1_p1 69
-MD5 44bf6fed00843f0654d7cfcb988beb36 files/digest-gallery-1.4.2 66
-MD5 4aa62ed7c1c8cd620528145cfc3a09c2 files/digest-gallery-1.4.3 66
 MD5 78950371f06d5607461f8f3feb91ecc7 files/digest-gallery-1.4.3_p1 70
 MD5 0b10bc559288d96d6521d6e48339e3b1 files/digest-gallery-1.4.3_p2 70
+MD5 6e417c5e80b9a99378aa31cc926ea9d1 files/vuln-20040817.diff 461
+MD5 44bf6fed00843f0654d7cfcb988beb36 files/digest-gallery-1.4.2 66
+MD5 4aa62ed7c1c8cd620528145cfc3a09c2 files/digest-gallery-1.4.3 66
 MD5 763f3e84ab504c5f79b9bc2feaae0083 files/digest-gallery-1.4.4 66
diff --git a/www-apps/gallery/files/digest-gallery-1.4.4-r1 b/www-apps/gallery/files/digest-gallery-1.4.4-r1
new file mode 100644
index 000000000000..1ef0136e3c31
--- /dev/null
+++ b/www-apps/gallery/files/digest-gallery-1.4.4-r1
@@ -0,0 +1 @@
+MD5 fe21d5c2c48699666f20a6108805c44c gallery-1.4.4.tar.gz 1756042
diff --git a/www-apps/gallery/files/vuln-20040817.diff b/www-apps/gallery/files/vuln-20040817.diff
new file mode 100644
index 000000000000..5509547cbb6b
--- /dev/null
+++ b/www-apps/gallery/files/vuln-20040817.diff
@@ -0,0 +1,17 @@
+--- save_photos.php.orig	2004-08-18 21:47:09.000000000 +0100
++++ save_photos.php	2004-08-18 21:54:21.000000000 +0100
+@@ -128,6 +128,14 @@
+ //			$name = eregi_replace(".$tag\$", "", $name);
+ 
+ 		}
++
++		$l_aTags = explode(".", $url);
++		if (!acceptableFormat($l_aTags[count($l_aTags) -1])
++		{
++			processingMsg(sprintf(_("URL %s doesn't contain a supported image"), $url));
++			continue;
++		}
++
+ 		/* Dont output warning messages if we cant open url */
+ 	
+ 		/*
diff --git a/www-apps/gallery/gallery-1.4.4-r1.ebuild b/www-apps/gallery/gallery-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..8d63db6a3107
--- /dev/null
+++ b/www-apps/gallery/gallery-1.4.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.4.4-r1.ebuild,v 1.1 2004/08/19 06:35:48 rl03 Exp $
+
+inherit webapp eutils
+
+DESCRIPTION="Web based (PHP Script) photo album viewer/creator."
+HOMEPAGE="http://gallery.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+IUSE=""
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+DEPEND="$DEPEND"
+RDEPEND=">=net-www/apache-1.3.24-r1
+	>=dev-php/mod_php-4.1.2-r5
+	>=media-gfx/jhead-1.6
+	>=media-libs/netpbm-9.12
+	>=media-gfx/imagemagick-5.4.9.1-r1"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# bug 60742
+	epatch ${FILESDIR}/vuln-20040817.diff
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	webapp_src_preinst
+
+	for file in AUTHORS ChangeLog README ChangeLog.archive.gz; do
+		dodoc ${file}
+		rm -f ${file}
+	done
+
+	cp -R . ${D}/${MY_HTDOCSDIR}
+	dodir ${MY_HTDOCSDIR}/albums
+	webapp_serverowned ${MY_HTDOCSDIR}/albums
+
+	dohtml docs/*
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}