Added egroupware-1.4.002 to the tree in response to sec issue #193960.

Package-Manager: portage-2.1.2.12

4 files changed, 98 insertions, 9 deletions

diff --git a/www-apps/egroupware/ChangeLog b/www-apps/egroupware/ChangeLog
index e8f255163f1b..0112b2b8ffcf 100644
--- a/www-apps/egroupware/ChangeLog
+++ b/www-apps/egroupware/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/egroupware
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.78 2007/08/05 00:15:09 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.79 2007/09/29 15:12:18 wrobel Exp $
+
+*egroupware-1.4.002 (29 Sep 2007)
+
+  29 Sep 2007; <wrobel@gentoo.org> +egroupware-1.4.002.ebuild:
+  Added egroupware-1.4.002 to the tree in response to sec issue #193960.
 
   05 Aug 2007; Renat Lumpau <rl03@gentoo.org> egroupware-1.4.001.ebuild:
   Call webapp_pkg_postinst, bug #183228
diff --git a/www-apps/egroupware/Manifest b/www-apps/egroupware/Manifest
index 10d56e2b8b0a..bb1e8d68ea41 100644
--- a/www-apps/egroupware/Manifest
+++ b/www-apps/egroupware/Manifest
@@ -6,16 +6,22 @@ MD5 275cc4548dd7c3d730b3aa6227fd19c4 files/postinstall-en-1.2.txt 402
 RMD160 aefff6af227f9d007afd1b753d97786d66fa7a80 files/postinstall-en-1.2.txt 402
 SHA256 6063f422525dcb597b07a29a54f354452b8962f5487a222c82c75301697a42ba files/postinstall-en-1.2.txt 402
 DIST eGroupWare-1.4.001.tar.bz2 8931830 RMD160 dc294db1ccf250bc373d65c940546256c5b2437d SHA1 ecf0105b929cbb82845ad7061fe0a3b5c2ceffd0 SHA256 7f94f84969f0b25166ef734d48ac87fc37500bf2cfacc0ac61784544df6a0dec
+DIST eGroupWare-1.4.002.tar.bz2 9822488 RMD160 b0dfc876331d4d83a4aad125e1c061a1ada77ed9 SHA1 09b026efc596bb3d87a2b753243afa03ddc1181c SHA256 ac601969572060131b1460d207bf659840cf48d1ed356321c095965015fba9e9
 DIST eGroupWare-egw-pear-1.4.001.tar.bz2 66337 RMD160 6abade95637e3c7c6f2ea1c117c1eacf2105e663 SHA1 23b09534564a89b6ea98ce72f41aea2b59a70d9e SHA256 57eed308f87c6a98710d8b66fa449e6b56e44ed0368bbe4ddbc89bf562d8e3ca
+DIST eGroupWare-egw-pear-1.4.002.tar.bz2 66295 RMD160 1c8a737964760f4be0c2b3fa19a0c7a5c75d308a SHA1 559410234a1272440236b886057ea89f8b73b3bb SHA256 bb997f9d5120792823a8c79dc3461fa9f635337405123a9a6969199e28778830
 DIST eGroupWare-icalsrv-1.4.001.tar.bz2 630909 RMD160 760b3445feb282e538c646f6a581c19fa2c68b1d SHA1 3e2778e71b2c55eb806e0f2cfba5fecb9560024f SHA256 b72a55a079d05974934fa0fcd56da199daa4393caa405a16df70ebc710ebd990
 EBUILD egroupware-1.4.001.ebuild 2085 RMD160 532aed19d7a64ac3b43e6da7cf88f0c3d17cf553 SHA1 93fb004685c615a4d46271d5fe618886a6fc1ecb SHA256 ed0024ecf7c562855d3d9b409860478d7e8a835f9d5af91310eecb9d92ef6471
 MD5 d127bbc4d9ca49d0e00d0ed3faf12e55 egroupware-1.4.001.ebuild 2085
 RMD160 532aed19d7a64ac3b43e6da7cf88f0c3d17cf553 egroupware-1.4.001.ebuild 2085
 SHA256 ed0024ecf7c562855d3d9b409860478d7e8a835f9d5af91310eecb9d92ef6471 egroupware-1.4.001.ebuild 2085
-MISC ChangeLog 11909 RMD160 f57564bf5adad781ac527974130fcd58630a50d9 SHA1 a9d1b1f96d8532fd81c5419e320e56d9ee8dc903 SHA256 a0c3650e87be1d2af2d9e267fbf97bb317e32a5a27b36df0d0d8334b8ba37c4c
-MD5 f4c76dc447d8c762934061dbca8974b1 ChangeLog 11909
-RMD160 f57564bf5adad781ac527974130fcd58630a50d9 ChangeLog 11909
-SHA256 a0c3650e87be1d2af2d9e267fbf97bb317e32a5a27b36df0d0d8334b8ba37c4c ChangeLog 11909
+EBUILD egroupware-1.4.002.ebuild 1987 RMD160 5e721b389c4573c2adc8760e7f2d33100b66afb6 SHA1 c43649c275f96332a62ed07bacc23c7ce4a42ac4 SHA256 bdcd6e769f03239111a36fffe3bd2e207edcb30c96c6b6d0cafcdbc34b981cd4
+MD5 2cbfd4c41ade3175b37ddaf74cb2d9e1 egroupware-1.4.002.ebuild 1987
+RMD160 5e721b389c4573c2adc8760e7f2d33100b66afb6 egroupware-1.4.002.ebuild 1987
+SHA256 bdcd6e769f03239111a36fffe3bd2e207edcb30c96c6b6d0cafcdbc34b981cd4 egroupware-1.4.002.ebuild 1987
+MISC ChangeLog 12083 RMD160 67c70cb12c440162bedcc3d49394ab7fe07d1329 SHA1 f3a0529a3480eeff9d574920f635fcbbf0a1a50c SHA256 f62b7947104a6c9cdaf27934be62c069d173ac6e54fdd8652fad3719d4019a8f
+MD5 7b705f19a6258b00cf23729b2ca44999 ChangeLog 12083
+RMD160 67c70cb12c440162bedcc3d49394ab7fe07d1329 ChangeLog 12083
+SHA256 f62b7947104a6c9cdaf27934be62c069d173ac6e54fdd8652fad3719d4019a8f ChangeLog 12083
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
@@ -23,10 +29,13 @@ SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata
 MD5 5a7bc85d39af13fe9dd6589418837ac5 files/digest-egroupware-1.4.001 828
 RMD160 e8655035bc3ae5e3c023272150636870e0900452 files/digest-egroupware-1.4.001 828
 SHA256 907b602abb4e9e412e1057bd48d69d05079bd935b6ea8ce3fd0d2a1b2457afa5 files/digest-egroupware-1.4.001 828
+MD5 d18d181cf29dc922d325e818117da173 files/digest-egroupware-1.4.002 545
+RMD160 5ac42f7cdfd9e36812d7f923c07943a243d5688e files/digest-egroupware-1.4.002 545
+SHA256 ffed54f531025d78c303d0e567db101dfd3294ec5b1a4ca5246adeffc876d2a7 files/digest-egroupware-1.4.002 545
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGtRaVEzitwsaoONoRAvQiAKDNMcNaYPrH2YwnzWIcenFMYGeRygCcCvJb
-y1muQ9CVB0pOhcrEb/QEdD4=
-=iZzm
+iD8DBQFG/mtYEEcxCpcDQ74RAoByAJ9CoEB28Nb+BZG1YFsJ0TWHBE0kJgCffgDE
+VwewIsj+p6WmNyChQFIx9Qk=
+=aFlN
 -----END PGP SIGNATURE-----
diff --git a/www-apps/egroupware/egroupware-1.4.002.ebuild b/www-apps/egroupware/egroupware-1.4.002.ebuild
new file mode 100644
index 000000000000..75a3abe909b6
--- /dev/null
+++ b/www-apps/egroupware/egroupware-1.4.002.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.4.002.ebuild,v 1.1 2007/09/29 15:12:18 wrobel Exp $
+
+inherit webapp depend.php
+
+MY_PN=eGroupWare
+S=${WORKDIR}/${PN}
+
+DESCRIPTION="Web-based GroupWare suite"
+HOMEPAGE="http://www.egroupware.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.bz2
+	mirror://sourceforge/${PN}/${MY_PN}-egw-pear-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="gd jpgraph ldap mysql postgres"
+
+RDEPEND="
+	ldap? ( net-nds/openldap )
+	gd? ( media-libs/gd )
+	jpgraph? ( || ( dev-php5/jpgraph dev-php4/jpgraph ) )
+"
+
+pkg_setup () {
+	has_php
+	webapp_pkg_setup
+
+	local php_flags="imap session"
+
+	use ldap && php_flags="${php_flags} ldap"
+	use mysql && php_flags="${php_flags} mysql"
+	use postgres && php_flags="${php_flags} postgres"
+	require_php_with_use ${php_flags}
+}
+
+src_unpack() {
+	has_php
+
+	unpack ${A}
+	cd ${S}
+	# remove SVN directories
+	find . -type d -name '.svn' -print | xargs rm -rf
+
+	if use jpgraph; then
+		einfo "Fixing jpgraph location"
+		sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'|'/usr/share/php${PHP_VERSION}/jpgraph/jpgraph.php'|" projectmanager/inc/class.ganttchart.inc.php || die
+		sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph_gantt.php'|'/usr/share/php${PHP_VERSION}/jpgraph/jpgraph_gantt.php'|" projectmanager/inc/class.ganttchart.inc.php || die
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+	cp -r . ${D}/${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/phpgwapi/images
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-1.2.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	if use ldap; then
+		einfo "If you are using LDAP contacts/addressbook, please read the upgrade instructions at"
+		einfo "http://www.egroupware.org/index.php?page_name=wiki&wikipage=ManualSetupUpdate"
+		einfo "before running the egroupware setup"
+	fi
+	webapp_pkg_postinst
+}
diff --git a/www-apps/egroupware/files/digest-egroupware-1.4.002 b/www-apps/egroupware/files/digest-egroupware-1.4.002
new file mode 100644
index 000000000000..ae4e38374078
--- /dev/null
+++ b/www-apps/egroupware/files/digest-egroupware-1.4.002
@@ -0,0 +1,6 @@
+MD5 4791db1df025ef44b53226abd9265bee eGroupWare-1.4.002.tar.bz2 9822488
+RMD160 b0dfc876331d4d83a4aad125e1c061a1ada77ed9 eGroupWare-1.4.002.tar.bz2 9822488
+SHA256 ac601969572060131b1460d207bf659840cf48d1ed356321c095965015fba9e9 eGroupWare-1.4.002.tar.bz2 9822488
+MD5 eee0a5523223ce12d8bad96aa422fd11 eGroupWare-egw-pear-1.4.002.tar.bz2 66295
+RMD160 1c8a737964760f4be0c2b3fa19a0c7a5c75d308a eGroupWare-egw-pear-1.4.002.tar.bz2 66295
+SHA256 bb997f9d5120792823a8c79dc3461fa9f635337405123a9a6969199e28778830 eGroupWare-egw-pear-1.4.002.tar.bz2 66295