From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PrrZF-0002bJ-Vw for garchives@archives.gentoo.org; Tue, 22 Feb 2011 12:42:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78FEE1C02B; Tue, 22 Feb 2011 12:42:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 240A91C02B for ; Tue, 22 Feb 2011 12:42:07 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8929A1B41AE for ; Tue, 22 Feb 2011 12:42:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E8E0C8006A for ; Tue, 22 Feb 2011 12:42:05 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: Subject: [gentoo-commits] dev/blueness:master commit in: www-apps/moodle/ X-VCS-Repository: dev/blueness X-VCS-Files: www-apps/moodle/ChangeLog www-apps/moodle/Manifest www-apps/moodle/moodle-1.9.11.ebuild www-apps/moodle/moodle-2.0.2.ebuild X-VCS-Directories: www-apps/moodle/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: a6f35e509ee0195220d4072efbb0c806d80c83e4 Date: Tue, 22 Feb 2011 12:42:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7960a0b76bbcdb5dba272abe4d30cab7 commit: a6f35e509ee0195220d4072efbb0c806d80c83e4 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Feb 22 12:41:56 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Feb 22 12:41:56 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3Da6f35e50 www-apps/moodle: version bumps to address security issues (Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit) --- www-apps/moodle/ChangeLog | 7 ++ www-apps/moodle/Manifest | 6 ++- www-apps/moodle/moodle-1.9.11.ebuild | 121 ++++++++++++++++++++++++++++= +++ www-apps/moodle/moodle-2.0.2.ebuild | 133 ++++++++++++++++++++++++++++= ++++++ 4 files changed, 266 insertions(+), 1 deletions(-) diff --git a/www-apps/moodle/ChangeLog b/www-apps/moodle/ChangeLog index 2fff710..a8927f8 100644 --- a/www-apps/moodle/ChangeLog +++ b/www-apps/moodle/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.1 2010/= 07/19 14:05:32 blueness Exp $ =20 +*moodle-2.0.2 (22 Feb 2011) +*moodle-1.9.11 (22 Feb 2011) + + 22 Feb 2011; Anthony G. Basile + +moodle-1.9.11.ebuild, +moodle-2.0.2.ebuild: + Version bumps. + 08 Jan 2011; Anthony G. Basile -moodle-2.0.1.ebu= ild: moved to tree =20 diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest index 76710a0..59afe81 100644 --- a/www-apps/moodle/Manifest +++ b/www-apps/moodle/Manifest @@ -1,5 +1,9 @@ AUX config.php 718 RMD160 9e4b97aafca65da8648466d11728c457fff439ab SHA1 = d71fc86158e82f706ca2cdfe1efe2e8de62cc607 SHA256 c62a37c0d81043ee4ca7fc4d7= 610d19dc2df426d556eb3285d7b1fe367a44a8d AUX postinstall-en.txt 6524 RMD160 d3799bc5cdc283e787c1b5d08935a8d7851d0= c8d SHA1 097744447c046848611bfe53d5191518465f1c6d SHA256 dad8831abc23179e= bcd2c2431f11d83346c142175c59da47cf5f913c928de667 AUX postinstall-nodb-en.txt 171 RMD160 88ff71d95c63f1b5d76e398c3566ada75= 954cdf4 SHA1 26748e5f24207ef5cb145e3668e1f17cdcddf699 SHA256 f39ff660a1ca= fbbd96ce18c46f056450ace04df5ac401eeccaf16441d54f3b6a -MISC ChangeLog 2405 RMD160 220e053cc3181eed055f28e5a702fe467b535f3b SHA1= e276d612fd479b72862f6d93ee8cc7b1cbd34e60 SHA256 3bfe2ef9de7b7109ffb6db76= bff00fdf598e8e7bdfe63915f99e74d7eb1e8f61 +DIST moodle-1.9.11.tgz 14045392 RMD160 d50216d4cf535533aed7ca7dcc9211cbb= e2fb52f SHA1 0355999061bff37693e2cf8f55e11abcfc0a7744 SHA256 b21da3a8e73c= 061b2115242b73e5328d078f979b9ca86523a392857c4fc59531 +DIST moodle-2.0.2.tgz 22270280 RMD160 957100de1ac3123911147ac5b00fe574b0= cc0804 SHA1 c720e6dba716d21c6fa87cc88fbf939ab53c8320 SHA256 64c360b787e4b= b099c328da09cf3b969d02c8ef57cc9d895598f0ddb4c7a44fe +EBUILD moodle-1.9.11.ebuild 3019 RMD160 e89e36d92c7a66a212b32d0c9e9b1754= 4a001edc SHA1 7f51fd0eeb1821e0c44adc09a75421350f5ec094 SHA256 ca63bb55126= abc1ad93d4670c2607440abeaae27ab2a4973a7fcec1730becba2 +EBUILD moodle-2.0.2.ebuild 3582 RMD160 7de28d2289a51b25a6ee06e908f127a1c= 6751589 SHA1 38dd39644547d2307a6e127803ad3e3c6f266eb4 SHA256 40497a4218c7= 53fdc2d63baa3c321aa164b29ca052550f3b78d04310ee2c7709 +MISC ChangeLog 2583 RMD160 e5d88e582fc351705feb2c2499270db9e74cc226 SHA1= 2e56d355290e041d70d34d4ea2241362e111f8ed SHA256 8dc0b2b8507d509d1ab49cb2= 019a991f4c0dfbe8dbbb071d81a00fc7493c55b1 MISC metadata.xml 256 RMD160 7cd5a16a6eade95f71d40edbb4729baadfbc7649 SH= A1 809eeef12d97ae39db024aea151a70c7363475b7 SHA256 8230894d717ea9f2e42f9c= 7de54671126820f89bf05ca96ec5f03842b12378e1 diff --git a/www-apps/moodle/moodle-1.9.11.ebuild b/www-apps/moodle/moodl= e-1.9.11.ebuild new file mode 100644 index 0000000..d37fe0e --- /dev/null +++ b/www-apps/moodle/moodle-1.9.11.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.10.ebuild,= v 1.1 2010/10/29 15:55:40 blueness Exp $ + +EAPI=3D"2" + +inherit versionator webapp + +AVC=3D( $(get_version_components) ) +MY_BRANCH=3D"stable${AVC[0]}${AVC[1]}" + +DESCRIPTION=3D"The Moodle Course Management System" +HOMEPAGE=3D"http://moodle.org" +SRC_URI=3D"http://download.moodle.org/${MY_BRANCH}/${P}.tgz" +S=3D"${WORKDIR}/${PN}" + +LICENSE=3D"GPL-2" +KEYWORDS=3D"~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +#SLOT empty due to webapp + +DBFLAGS=3D"mysql?,postgres?" +DBTYPES=3D${DBFLAGS//\?/} +DBTYPES=3D${DBTYPES//,/ } + +AUTHFLAGS=3D"imap?,ldap?,odbc?" +AUTHMODES=3D${AUTHFLAGS//\?/} +AUTHMODES=3D${AUTHMODES//,/ } + +PHPFLAGS=3D"ctype,curl,gd,iconv,ssl,tokenizer,xml,xmlrpc,zlib" + +IUSE=3D"${DBTYPES} ${AUTHMODES} vhosts" + +# No forced dependency on +# mysql? ( virtual/mysql ) +# postgres? ( dev-db/postgresql-server-7* ) +# which may live on another server +DEPEND=3D"" +RDEPEND=3D">=3Ddev-lang/php-4.3.0[${DBFLAGS},${AUTHFLAGS},${PHPFLAGS}] + virtual/httpd-php + virtual/cron" + +pkg_setup() { + webapp_pkg_setup + + # How many dbs were selected? If one and only one, which one is it? + MYDB=3D"" + DBCOUNT=3D0 + for db in ${DBTYPES}; do + if use ${db}; then + MYDB=3D${db} + DBCOUNT=3D$(($DBCOUNT+1)) + fi + done + + if [[ ${DBCOUNT} -eq 0 ]]; then + eerror + eerror "\033[1;31m**************************************************\0= 33[1;31m" + eerror "No database selected in your USE flags," + eerror "You must select at least one." + eerror "\033[1;31m**************************************************\0= 33[1;31m" + eerror + die + fi + + if [[ ${DBCOUNT} -gt 1 ]]; then + MYDB=3D"" + ewarn + ewarn "\033[1;33m**************************************************\03= 3[1;33m" + ewarn "Multiple databases selected in your USE flags," + ewarn "You will have to choose your database manually." + ewarn "\033[1;33m**************************************************\03= 3[1;33m" + ewarn + fi +} + +src_prepare() { + rm COPYING.txt + cp "${FILESDIR}"/config.php . + + # + # Moodle expect postgres7, not postgres + # + MYDB=3D${MYDB/postgres/postgres7} + if [[ ${DBCOUNT} -eq 1 ]] ; then + sed -i -e "s|mydb|${MYDB}|" config.php + fi +} + +src_install() { + webapp_src_preinst + + local MOODLEDATA=3D"${MY_HOSTROOTDIR}"/moodle + dodir ${MOODLEDATA} + webapp_serverowned -R "${MOODLEDATA}" + + local MOODLEROOT=3D"${MY_HTDOCSDIR}" + insinto ${MOODLEROOT} || die "Unable to insinto ${MOODLEROOT}" + doins -r * + + webapp_configfile "${MOODLEROOT}"/config.php + + if [[ ${DBCOUNT} -eq 1 ]]; then + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + else + webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt + fi + + webapp_src_install +} + +pkg_postinst() { + einfo + einfo "\033[1;32m**************************************************\033= [1;32m" + einfo + einfo "To see the post install instructions, do" + einfo + einfo " webapp-config --show-postinst ${PN} ${PVR}" + einfo + einfo "\033[1;32m**************************************************\033= [1;32m" + einfo +} diff --git a/www-apps/moodle/moodle-2.0.2.ebuild b/www-apps/moodle/moodle= -2.0.2.ebuild new file mode 100644 index 0000000..b3c205d --- /dev/null +++ b/www-apps/moodle/moodle-2.0.2.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.1.ebuild,v= 1.1 2011/01/08 23:21:15 blueness Exp $ + +EAPI=3D"2" + +inherit versionator webapp + +AVC=3D( $(get_version_components) ) +MY_BRANCH=3D"stable${AVC[0]}${AVC[1]}" + +DESCRIPTION=3D"The Moodle Course Management System" +HOMEPAGE=3D"http://moodle.org" +SRC_URI=3D"http://download.moodle.org/${MY_BRANCH}/${P}.tgz" +S=3D"${WORKDIR}/${PN}" + +LICENSE=3D"GPL-2" +KEYWORDS=3D"~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +#SLOT empty due to webapp + +DB_FLAGS=3D"mysqli?,postgres?" +DB_TYPES=3D${DB_FLAGS//\?/} +DB_TYPES=3D${DB_TYPES//,/ } + +AUTHENTICATION_FLAGS=3D"imap?,ldap?,odbc?" +AUTHENTICATION_MODES=3D${AUTHENTICATION_FLAGS//\?/} +AUTHENTICATION_MODES=3D${AUTHENTICATION_MODES//,/ } + +PHP_REQUIRED_FLAGS_52=3D"ctype,curl,iconv,json,pcre,simplexml,spl,xml,zi= p" +PHP_OPTIONAL_FLAGS_52=3D"gd,soap,ssl,tokenizer,xmlrpc" +PHP_FLAGS_52=3D"${PHP_REQUIRED_FLAGS_52},${PHP_OPTIONAL_FLAGS_52}" + +PHP_REQUIRED_FLAGS_53=3D"ctype,curl,iconv,json,simplexml,xml,zip" +PHP_OPTIONAL_FLAGS_53=3D"gd,intl,soap,ssl,tokenizer,xmlrpc" +PHP_FLAGS_53=3D"${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}" + +IUSE=3D"${DB_TYPES} ${AUTHENTICATION_MODES} vhosts" + +# No forced dependency on +# mysql? ( virtual/mysql ) +# postgres? ( dev-db/postgresql-server-7* ) +# which may live on another server +DEPEND=3D"" +RDEPEND=3D" + || ( + =3Ddev-lang/php-5.2*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_5= 2}] + =3Ddev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_5= 3}] + ) + virtual/httpd-php + virtual/cron" + +pkg_setup() { + webapp_pkg_setup + + # How many dbs were selected? If one and only one, which one is it? + MYDB=3D"" + DB_COUNT=3D0 + for db in ${DB_TYPES}; do + if use ${db}; then + MYDB=3D${db} + DB_COUNT=3D$(($DB_COUNT+1)) + fi + done + + if [[ ${DB_COUNT} -eq 0 ]]; then + eerror + eerror "\033[1;31m**************************************************\0= 33[1;31m" + eerror "No database selected in your USE flags," + eerror "You must select at least one." + eerror "\033[1;31m**************************************************\0= 33[1;31m" + eerror + die + fi + + if [[ ${DB_COUNT} -gt 1 ]]; then + MYDB=3D"" + ewarn + ewarn "\033[1;33m**************************************************\03= 3[1;33m" + ewarn "Multiple databases selected in your USE flags," + ewarn "You will have to choose your database manually." + ewarn "\033[1;33m**************************************************\03= 3[1;33m" + ewarn + fi +} + +src_prepare() { + rm COPYING.txt + cp "${FILESDIR}"/config.php . + + # Moodle expect postgres7, not postgres + MYDB=3D${MYDB/postgres/postgres7} + + # Moodle expects mysql, not mysqli + MYDB=3D${MYDB/mysqli/mysql} + + if [[ ${DB_COUNT} -eq 1 ]] ; then + sed -i -e "s|mydb|${MYDB}|" config.php + fi +} + +src_install() { + webapp_src_preinst + + local MOODLEDATA=3D"${MY_HOSTROOTDIR}"/moodle + dodir ${MOODLEDATA} + webapp_serverowned -R "${MOODLEDATA}" + + local MOODLEROOT=3D"${MY_HTDOCSDIR}" + insinto ${MOODLEROOT} || die "Unable to insinto ${MOODLEROOT}" + doins -r * + + webapp_configfile "${MOODLEROOT}"/config.php + + if [[ ${DB_COUNT} -eq 1 ]]; then + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + else + webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt + fi + + webapp_src_install +} + +pkg_postinst() { + einfo + einfo "\033[1;32m**************************************************\033= [1;32m" + einfo + einfo "To see the post install instructions, do" + einfo + einfo " webapp-config --show-postinst ${PN} ${PVR}" + einfo + einfo "\033[1;32m**************************************************\033= [1;32m" + einfo +}