From ab29341580cd04ec7f38ab2a455e43d9f5f5bead Mon Sep 17 00:00:00 2001 From: Renat Lumpau Date: Sun, 10 Jul 2005 02:01:08 +0000 Subject: Version bump wrt security bug 97651. Remove unnecessary 007-r1. Package-Manager: portage-2.0.51.22-r1 --- www-apps/egroupware/ChangeLog | 9 +++- www-apps/egroupware/Manifest | 13 +++--- www-apps/egroupware/egroupware-1.0.0.007-r1.ebuild | 50 ---------------------- www-apps/egroupware/egroupware-1.0.0.008.ebuild | 46 ++++++++++++++++++++ .../files/digest-egroupware-1.0.0.007-r1 | 1 - .../egroupware/files/digest-egroupware-1.0.0.008 | 1 + .../files/egroupware-1.0.0.007-xmlrpc.patch | 29 ------------- 7 files changed, 61 insertions(+), 88 deletions(-) delete mode 100644 www-apps/egroupware/egroupware-1.0.0.007-r1.ebuild create mode 100644 www-apps/egroupware/egroupware-1.0.0.008.ebuild delete mode 100644 www-apps/egroupware/files/digest-egroupware-1.0.0.007-r1 create mode 100644 www-apps/egroupware/files/digest-egroupware-1.0.0.008 delete mode 100644 www-apps/egroupware/files/egroupware-1.0.0.007-xmlrpc.patch diff --git a/www-apps/egroupware/ChangeLog b/www-apps/egroupware/ChangeLog index c6c45c267044..1afc8a34dba0 100644 --- a/www-apps/egroupware/ChangeLog +++ b/www-apps/egroupware/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-apps/egroupware # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.23 2005/07/08 08:28:14 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/ChangeLog,v 1.24 2005/07/10 02:01:08 rl03 Exp $ + +*egroupware-1.0.0.008 (10 Jul 2005) + + 10 Jul 2005; Renat Lumpau + -files/egroupware-1.0.0.007-xmlrpc.patch, -egroupware-1.0.0.007-r1.ebuild, + +egroupware-1.0.0.008.ebuild: + Version bump wrt security bug 97651. Remove unnecessary 007-r1. 08 Jul 2005; Bryan Østergaard egroupware-1.0.0.007-r1.ebuild: diff --git a/www-apps/egroupware/Manifest b/www-apps/egroupware/Manifest index e4089b066cd6..e11f5fe7e20c 100644 --- a/www-apps/egroupware/Manifest +++ b/www-apps/egroupware/Manifest @@ -1,18 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 545ec586b36a2a813a2e2e80a0fc67e8 egroupware-1.0.0.007-r1.ebuild 1363 MD5 43abedf32fc95ad9f886a2d22991fe02 egroupware-1.0.0.007.ebuild 1262 -MD5 9b5e6919e69ad3aebba51bbc33bfa3c2 ChangeLog 4881 +MD5 1c8e647a7e8536875524076fff992fb1 ChangeLog 5138 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161 -MD5 059eae124458c66f13e1ff62a93c0b69 files/egroupware-1.0.0.007-xmlrpc.patch 1088 -MD5 08a77bf0063609ec500ebbfb2135ef05 files/digest-egroupware-1.0.0.007-r1 77 +MD5 fc8274b4e56ac962d307c5f77486cf2d egroupware-1.0.0.008.ebuild 1259 MD5 5acfe8f4f634af8faac95b6411b410e5 files/postinstall-en.txt 397 MD5 08a77bf0063609ec500ebbfb2135ef05 files/digest-egroupware-1.0.0.007 77 +MD5 d6192beb58efafa10fc2a75273e77c0c files/digest-egroupware-1.0.0.008 77 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCzjk0Kf2g/qXtneoRAu4uAJ9w4QxMepG/6dFZuZBWhYnMdqM75QCgrAOx -V6KDpHxmIk+0BtEcNfHd1vk= -=/5Hc +iD8DBQFC0IFxEzitwsaoONoRApLFAKC58r79enrGMPE8GPCrUDeYx99X0gCeK+7T +xYBhKR77p5EqltfTCmxBovM= +=mRhI -----END PGP SIGNATURE----- diff --git a/www-apps/egroupware/egroupware-1.0.0.007-r1.ebuild b/www-apps/egroupware/egroupware-1.0.0.007-r1.ebuild deleted file mode 100644 index ecde89be8a58..000000000000 --- a/www-apps/egroupware/egroupware-1.0.0.007-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.0.0.007-r1.ebuild,v 1.3 2005/07/08 08:28:14 kloeri Exp $ - -inherit webapp eutils - -MY_P=eGroupWare-${PV}-2 -S=${WORKDIR}/${PN} - -DESCRIPTION="Web-based GroupWare suite. It contains many modules" -HOMEPAGE="http://www.eGroupWare.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="alpha ~amd64 ~hppa ppc ~sparc ~x86" -IUSE="ldap" - -RDEPEND="virtual/php - || ( >=dev-db/mysql-3.23 >=dev-db/postgresql-7.2 ) - ldap? ( net-nds/openldap ) - net-www/apache" - -pkg_setup () { - webapp_pkg_setup - einfo "Please make sure that your PHP is compiled with LDAP (if using openldap), IMAP, and MySQL|PostgreSQL support" - einfo - einfo "Consider installing an MTA if you want to take advantage of eGW's mail capabilities." -} - -src_unpack() { - unpack ${A} - cd ${S} -# epatch ${FILESDIR}/${PN}-1.0.0.007-xmlrpc.patch -} - -src_install() { - webapp_src_preinst - cd ${S} - # remove CVS directories - find . -type d -name 'CVS' -print | xargs rm -rf - cp -r . ${D}/${MY_HTDOCSDIR} - - webapp_serverowned ${MY_HTDOCSDIR}/fudforum - webapp_serverowned ${MY_HTDOCSDIR}/phpgwapi/images - - # add post-installation instructions - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt - - webapp_src_install -} diff --git a/www-apps/egroupware/egroupware-1.0.0.008.ebuild b/www-apps/egroupware/egroupware-1.0.0.008.ebuild new file mode 100644 index 000000000000..82f0b74ebe14 --- /dev/null +++ b/www-apps/egroupware/egroupware-1.0.0.008.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/egroupware/egroupware-1.0.0.008.ebuild,v 1.1 2005/07/10 02:01:08 rl03 Exp $ + +inherit webapp eutils + +MY_P=eGroupWare-${PV}-1 +S=${WORKDIR}/${PN} + +DESCRIPTION="Web-based GroupWare suite. It contains many modules" +HOMEPAGE="http://www.eGroupWare.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="alpha ~amd64 ~hppa ppc ~sparc x86" +IUSE="ldap" + +RDEPEND="virtual/php + || ( >=dev-db/mysql-3.23 >=dev-db/postgresql-7.2 ) + ldap? ( net-nds/openldap ) + net-www/apache" + +pkg_setup () { + webapp_pkg_setup + einfo "Please make sure that your PHP is compiled with LDAP (if using openldap), IMAP, and MySQL|PostgreSQL support" + einfo + einfo "Consider installing an MTA if you want to take advantage of eGW's mail capabilities." +} + +src_unpack() { + unpack ${A} + cd ${S} + # remove CVS directories + find . -type d -name 'CVS' -print | xargs rm -rf +} + +src_install() { + webapp_src_preinst + cp -r . ${D}/${MY_HTDOCSDIR} + + webapp_serverowned ${MY_HTDOCSDIR}/fudforum + webapp_serverowned ${MY_HTDOCSDIR}/phpgwapi/images + + webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt + webapp_src_install +} diff --git a/www-apps/egroupware/files/digest-egroupware-1.0.0.007-r1 b/www-apps/egroupware/files/digest-egroupware-1.0.0.007-r1 deleted file mode 100644 index e61134a24508..000000000000 --- a/www-apps/egroupware/files/digest-egroupware-1.0.0.007-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 3c9a3ab01cf36c45b394e3a3bf98a3ca eGroupWare-1.0.0.007-2.tar.bz2 11084469 diff --git a/www-apps/egroupware/files/digest-egroupware-1.0.0.008 b/www-apps/egroupware/files/digest-egroupware-1.0.0.008 new file mode 100644 index 000000000000..361223f479fd --- /dev/null +++ b/www-apps/egroupware/files/digest-egroupware-1.0.0.008 @@ -0,0 +1 @@ +MD5 085d1c7b3e7fdd59e8f935c090ec2927 eGroupWare-1.0.0.008-1.tar.bz2 11081652 diff --git a/www-apps/egroupware/files/egroupware-1.0.0.007-xmlrpc.patch b/www-apps/egroupware/files/egroupware-1.0.0.007-xmlrpc.patch deleted file mode 100644 index a9b420d04ce5..000000000000 --- a/www-apps/egroupware/files/egroupware-1.0.0.007-xmlrpc.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- egroupware/phpgwapi/inc/xml_functions.inc.php.old 2005-07-04 22:35:39.000000000 +0200 -+++ egroupware/phpgwapi/inc/xml_functions.inc.php 2004-03-07 10:55:43.000000000 +0100 -@@ -189,7 +189,7 @@ - $GLOBALS['_xh'][$parser]['qt']=0; - break; - case 'NAME': -- $GLOBALS['_xh'][$parser]['st'] .= "'"; -+ $GLOBALS['_xh'][$parser]['st'] .= '"'; - $GLOBALS['_xh'][$parser]['ac'] = ''; - break; - case 'FAULT': -@@ -265,7 +265,7 @@ - $GLOBALS['_xh'][$parser]['cm']--; - break; - case 'NAME': -- $GLOBALS['_xh'][$parser]['st'].= $GLOBALS['_xh'][$parser]['ac'] . "' => "; -+ $GLOBALS['_xh'][$parser]['st'].= $GLOBALS['_xh'][$parser]['ac'] . '" => '; - break; - case 'BOOLEAN': - // special case here: we translate boolean 1 or 0 into PHP -@@ -293,7 +293,7 @@ - } - elseif ($GLOBALS['_xh'][$parser]['qt']==2) - { -- $GLOBALS['_xh'][$parser]['st'].='base64_decode("'. $GLOBALS['_xh'][$parser]['ac'] . '")'; -+ $GLOBALS['_xh'][$parser]['st'].="base64_decode('". $GLOBALS['_xh'][$parser]['ac'] . "')"; - } - elseif ($name=='BOOLEAN') - { -- cgit v1.2.3-65-gdbad