summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2004-08-23 19:36:27 +0000
committerStuart Herbert <stuart@gentoo.org>2004-08-23 19:36:27 +0000
commit96e9a26afe950be43ff9ccd62d46a30b79a2a2fb (patch)
treec0db8f2c5eaa14cd05c04e9c9715ca718b68f240 /www-apps/gallery
parentSpace fix (diff)
downloadhistorical-96e9a26afe950be43ff9ccd62d46a30b79a2a2fb.tar.gz
historical-96e9a26afe950be43ff9ccd62d46a30b79a2a2fb.tar.bz2
historical-96e9a26afe950be43ff9ccd62d46a30b79a2a2fb.zip
Patch fix & mark stable
Diffstat (limited to 'www-apps/gallery')
-rw-r--r--www-apps/gallery/ChangeLog6
-rw-r--r--www-apps/gallery/Manifest8
-rw-r--r--www-apps/gallery/files/vuln-20040817.diff2
-rw-r--r--www-apps/gallery/gallery-1.4.4-r1.ebuild4
4 files changed, 12 insertions, 8 deletions
diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 5deb17e80407..112d1ea0ba0c 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,10 @@
# 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.4 2004/08/20 02:16:46 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.5 2004/08/23 19:36:27 stuart Exp $
+
+ 23 Aug 2004; Stuart Herbert <stuart@gentoo.org> files/vuln-20040817.diff,
+ gallery-1.4.4-r1.ebuild:
+ Fix syntax error in the patch, and mark stable on x86
20 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> gallery-1.4.4-r1.ebuild:
Stable on alpha, bug 60742.
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index 6d3d73931fca..067e19dd1632 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,8 +1,8 @@
-MD5 5545d1f4c90451f3bfb24fb302058d53 ChangeLog 4823
-MD5 8d9e8aaf769adc5a417391c6b08a006b gallery-1.4.4.ebuild 1741
+MD5 071bfbe357bae4cfb2399488be0f0fdd ChangeLog 4983
MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 562dc492a578af81021fc91acd4fc5b5 gallery-1.4.4-r1.ebuild 1111
+MD5 7a52ab9f28aab1915f2e1d5e191507e3 gallery-1.4.4-r1.ebuild 1110
+MD5 8d9e8aaf769adc5a417391c6b08a006b gallery-1.4.4.ebuild 1741
+MD5 c587b8102659ede5078c12013b289587 files/vuln-20040817.diff 462
MD5 763f3e84ab504c5f79b9bc2feaae0083 files/digest-gallery-1.4.4 66
MD5 763f3e84ab504c5f79b9bc2feaae0083 files/digest-gallery-1.4.4-r1 66
MD5 1a10c9a2ede35b5bfcfcedc4d90373e3 files/postinstall-en.txt 287
-MD5 6e417c5e80b9a99378aa31cc926ea9d1 files/vuln-20040817.diff 461
diff --git a/www-apps/gallery/files/vuln-20040817.diff b/www-apps/gallery/files/vuln-20040817.diff
index 5509547cbb6b..d9885c508978 100644
--- a/www-apps/gallery/files/vuln-20040817.diff
+++ b/www-apps/gallery/files/vuln-20040817.diff
@@ -6,7 +6,7 @@
}
+
+ $l_aTags = explode(".", $url);
-+ if (!acceptableFormat($l_aTags[count($l_aTags) -1])
++ if (!acceptableFormat($l_aTags[count($l_aTags) -1]))
+ {
+ processingMsg(sprintf(_("URL %s doesn't contain a supported image"), $url));
+ continue;
diff --git a/www-apps/gallery/gallery-1.4.4-r1.ebuild b/www-apps/gallery/gallery-1.4.4-r1.ebuild
index f882b85c1e1d..9ea488b95e6e 100644
--- a/www-apps/gallery/gallery-1.4.4-r1.ebuild
+++ b/www-apps/gallery/gallery-1.4.4-r1.ebuild
@@ -1,6 +1,6 @@
# 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.4 2004/08/20 02:16:46 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.4.4-r1.ebuild,v 1.5 2004/08/23 19:36:27 stuart Exp $
inherit webapp eutils
@@ -9,7 +9,7 @@ HOMEPAGE="http://gallery.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
IUSE=""
-KEYWORDS="~x86 ppc sparc alpha ~hppa ~amd64"
+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