Version bump, fixes security issues, bug #238113, thank Robert Buchholz for report.

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 132 insertions, 2 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index eca23db21098..5a79d252cd4f 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/gallery
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.153 2008/09/19 18:50:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.154 2008/09/29 07:38:27 pva Exp $
+
+*gallery-2.2.6 (29 Sep 2008)
+*gallery-1.5.9 (29 Sep 2008)
+
+  29 Sep 2008; Peter Volkov <pva@gentoo.org> +gallery-1.5.9.ebuild,
+  +gallery-2.2.6.ebuild:
+  Version bump, fixes security issues, bug #238113, thank Robert Buchholz for
+  report.
 
   19 Sep 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   gallery-1.5.8.ebuild:
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index dfc9006c1e78..d428270f5d70 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,8 +1,12 @@
 AUX postinstall-en.txt 430 RMD160 bfac0f557ce318745a713cf7a4b90c4473ee97a5 SHA1 c1abf75f41ca3dea22c029e3e3f6604c02e71d08 SHA256 e2e63ec31b83e97fec9ecc7163f84beda4744150fa179ce39f0c26ed7ec54f3b
 AUX postinstall-en2.txt 912 RMD160 c84759b0159710075f0099153bfc802cd76e8cb9 SHA1 afe393b216f0d5c9588e5e2d07cc852724860d2f SHA256 ae1b0727e11518abf12616cd11cb82e6648a026769d9e4854ba6afb6d972c30b
 DIST gallery-1.5.8.tar.gz 2476116 RMD160 6a45b62968a557a3c1c1a11755c0f34089ff7d66 SHA1 d382bcd7176594c2669a9f42a998efe784fddc33 SHA256 b2d5c05eb9b757c37cf136ba2c5be32581bd696a80a1f00c9ba817ab3e91298d
+DIST gallery-1.5.9.tar.gz 2563215 RMD160 a7a7eefb34827c120910c7b93fd7c058b3b71bea SHA1 7bdfb9447cb9046ce5d848c846a5289483d4c517 SHA256 d48bfbf4d548440a0099a01b87bdaee283f528fb800c801f00360d655dc70bb4
 DIST gallery-2.2.5-full.tar.gz 11908434 RMD160 b4edf6d745243a3e5f3ee3cdcf1cd94a29c1e955 SHA1 713cf3c75a5963919802a63e730b8db9e2e16bbd SHA256 84969599bd3745c49c036a6e5261c5c563b0bb6cb49a938f9a9ff120637a5fc6
+DIST gallery-2.2.6-full.tar.gz 12038651 RMD160 f60bcf44ee8479152c8767f4e99c9e43ad2e631b SHA1 a3dfb86e2a0287795b3a2b859b12753141c68828 SHA256 3ef47029e3069bf49beba29670b88e022d0b31708bf7403aff5f80e1c41152f8
 EBUILD gallery-1.5.8.ebuild 1247 RMD160 e8001af32c096990d8e2052bc5f439e5b7d16f2c SHA1 402e823e05af3c809d1220781de77def63ae0ea3 SHA256 33a251abf1c702e86a6d8a9560eaf3beb4e0db7dac2233284ce62ccd75c4f9bb
+EBUILD gallery-1.5.9.ebuild 1225 RMD160 f70b1155360c9af5812e63cad328946d9670b00b SHA1 2ba0e18845820b25994b4e824ff233ebee44fe2b SHA256 e0756c89208e96b4a6a0188ff309d3e3ac24832fc4cdf8ade5907a677777ae71
 EBUILD gallery-2.2.5.ebuild 2187 RMD160 f99c3b6430ef331176e462d3da419659286b8838 SHA1 6e281c203f629545875ead59e6c8b376363b53e7 SHA256 55d4172da9fb507b063a23a5e5d18702134ba06ba0fbd948b8fd03298bc272f9
-MISC ChangeLog 23614 RMD160 8ae3c0a72abd0a9ca559a14876bee1a48443791f SHA1 2f2da2c600d8407789fcd8be89ba686c59627eb6 SHA256 4329ff163032aea72036d56542b83f488589d494d78743c478e3f108832e96d5
+EBUILD gallery-2.2.6.ebuild 2192 RMD160 d9b3e1e30efcd6cbd18c3b4ea62a2e4976db66a3 SHA1 e8c9f88287b52e5e03474e48c64ba861c8a28042 SHA256 b34964397c6e0cdcfa3124acaa9437436d522bf87d000f46752506960087ca88
+MISC ChangeLog 23848 RMD160 498674494329fe7d5550fe7beabbd76b126705f3 SHA1 2f26ef3c123317bd94e174adbcb90dbca16fb3f7 SHA256 54610ef243841446d65f3658d8cc1afe879575fd61625fcf4cf074bb18e009a8
 MISC metadata.xml 431 RMD160 214052590439ed80e656684ab33b9ff2296aeed3 SHA1 0cd3a7a054b77c4733ea13d1f27b03e17e8317f9 SHA256 8bebffaf26f2d5937ae6cc2ffccc2eed084e166d4a7c2724a1de8ba7202baf52
diff --git a/www-apps/gallery/gallery-1.5.9.ebuild b/www-apps/gallery/gallery-1.5.9.ebuild
new file mode 100644
index 000000000000..6cf2b1d1b7a4
--- /dev/null
+++ b/www-apps/gallery/gallery-1.5.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.9.ebuild,v 1.1 2008/09/29 07:38:27 pva Exp $
+
+inherit webapp depend.php confutils
+
+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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="imagemagick netpbm unzip zip"
+
+RDEPEND="media-libs/jpeg
+	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
+	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
+	unzip? ( app-arch/unzip )
+	zip? ( app-arch/zip )"
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+	confutils_require_any imagemagick netpbm
+	require_php_with_use pcre session
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	gunzip ChangeLog.archive.gz
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc AUTHORS ChangeLog ChangeLog.archive README
+	dohtml docs/*
+
+	cp -r . "${D}/${MY_HTDOCSDIR}"
+	rm -rf "${D}/${MY_HTDOCSDIR}"/{AUTHORS,ChangeLog,ChangeLog.archive,README,LICENSE.txt,docs/}
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}
diff --git a/www-apps/gallery/gallery-2.2.6.ebuild b/www-apps/gallery/gallery-2.2.6.ebuild
new file mode 100644
index 000000000000..6bf8e2bfe69b
--- /dev/null
+++ b/www-apps/gallery/gallery-2.2.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.2.6.ebuild,v 1.1 2008/09/29 07:38:27 pva Exp $
+
+inherit webapp eutils depend.php confutils
+
+DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
+HOMEPAGE="http://gallery.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ffmpeg gd imagemagick mysql netpbm postgres raw unzip zip"
+
+RDEPEND="media-libs/jpeg
+	raw? ( >=media-gfx/dcraw-8.03 )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051216 )
+	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
+	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
+	unzip? ( app-arch/unzip )
+	zip? ( app-arch/zip )"
+
+S=${WORKDIR}/${PN}2
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+	confutils_require_any gd imagemagick netpbm
+	confutils_require_any mysql postgres
+
+	local php_flags="pcre session"
+	use mysql && php_flags="${php_flags} mysql"
+	use postgres && php_flags="${php_flags} postgres"
+
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${php_flags} || \
+			( use gd && ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ) ; then
+		eerror
+		eerror "${PHP_PKG} needs to be re-installed with all of the following USE flags enabled:"
+		eerror
+		eerror "${php_flags}"
+		eerror
+		use gd && eerror "as well as with either gd or gd-external USE flag enabled."
+		die "Re-install ${PHP_PKG}."
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dohtml README.html
+	rm README.html LICENSE MANIFEST
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en2.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "You are strongly encouraged to back up your database"
+	elog "and the g2data directory, as upgrading to 2.2 will make"
+	elog "irreversible changes to both."
+	elog
+	elog "g2data dir: cp -Rf /path/to/g2data/ /path/to/backup"
+	elog "mysql: mysqldump --opt -u username -h hostname -p database > /path/to/backup.sql"
+	elog "postgres: pg_dump -h hostname --format=t database > /path/to/backup.sql"
+	webapp_pkg_postinst
+}