From 4ff50a7d43acbb02055027817465736451c18a95 Mon Sep 17 00:00:00 2001 From: Julien Allanos Date: Mon, 23 Apr 2007 12:51:26 +0000 Subject: [PATCH] Added 0.10.4, fixing bug #175354. Removed vulnerable 0.10.* ebuilds. Package-Manager: portage-2.1.2.2 --- www-apps/trac/ChangeLog | 8 +- www-apps/trac/files/digest-trac-0.10.1 | 3 - www-apps/trac/files/digest-trac-0.10.3 | 3 - www-apps/trac/files/digest-trac-0.10.4 | 3 + www-apps/trac/trac-0.10.3.ebuild | 129 ------------------ ...{trac-0.10.1.ebuild => trac-0.10.4.ebuild} | 22 +-- 6 files changed, 21 insertions(+), 147 deletions(-) delete mode 100644 www-apps/trac/files/digest-trac-0.10.1 delete mode 100644 www-apps/trac/files/digest-trac-0.10.3 create mode 100644 www-apps/trac/files/digest-trac-0.10.4 delete mode 100644 www-apps/trac/trac-0.10.3.ebuild rename www-apps/trac/{trac-0.10.1.ebuild => trac-0.10.4.ebuild} (84%) diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog index 41f8c7053ff0..72d78effbde7 100644 --- a/www-apps/trac/ChangeLog +++ b/www-apps/trac/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apps/trac # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.56 2007/03/20 20:25:22 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.57 2007/04/23 12:51:26 dju Exp $ + +*trac-0.10.4 (23 Apr 2007) + + 23 Apr 2007; Julien Allanos -trac-0.10.1.ebuild, + -trac-0.10.3.ebuild, +trac-0.10.4.ebuild: + Added 0.10.4, fixing bug #175354. Removed vulnerable 0.10.* ebuilds. 20 Mar 2007; Tobias Scherbaum trac-0.10.3.1.ebuild: diff --git a/www-apps/trac/files/digest-trac-0.10.1 b/www-apps/trac/files/digest-trac-0.10.1 deleted file mode 100644 index 4a24cd8c9983..000000000000 --- a/www-apps/trac/files/digest-trac-0.10.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 55e10547c92cf39d64ab7ae4040c238d trac-0.10.1.tar.gz 439941 -RMD160 13fc90cc6023d9279721eaa583be2a09bd42737d trac-0.10.1.tar.gz 439941 -SHA256 a5528c5e5ca865842628ad5fc6984df774d61b72e13db34a525496e3136c87c7 trac-0.10.1.tar.gz 439941 diff --git a/www-apps/trac/files/digest-trac-0.10.3 b/www-apps/trac/files/digest-trac-0.10.3 deleted file mode 100644 index 2e7ded3e823e..000000000000 --- a/www-apps/trac/files/digest-trac-0.10.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 354cca575cffc732f2fb8015b5c60b50 trac-0.10.3.tar.gz 440811 -RMD160 bfd3c16a2fb9e849ef068a0640a2c14cd2fb4423 trac-0.10.3.tar.gz 440811 -SHA256 b0d5826ff502172fec68d183088e1ac794369e848a541c031eeb53c3fe19da90 trac-0.10.3.tar.gz 440811 diff --git a/www-apps/trac/files/digest-trac-0.10.4 b/www-apps/trac/files/digest-trac-0.10.4 new file mode 100644 index 000000000000..444a7d629521 --- /dev/null +++ b/www-apps/trac/files/digest-trac-0.10.4 @@ -0,0 +1,3 @@ +MD5 52a3a21ad9faafc3b59cbeb87d5a69d2 trac-0.10.4.tar.gz 449116 +RMD160 9eb843eabf5f986b3d08cd2081f02fe9033abd1e trac-0.10.4.tar.gz 449116 +SHA256 0061cf11d6d259505ff64252c40baf53e845095437eb56f98d3493fad9701100 trac-0.10.4.tar.gz 449116 diff --git a/www-apps/trac/trac-0.10.3.ebuild b/www-apps/trac/trac-0.10.3.ebuild deleted file mode 100644 index 046b894b46d8..000000000000 --- a/www-apps/trac/trac-0.10.3.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.10.3.ebuild,v 1.6 2007/02/25 11:50:05 mabi Exp $ - -inherit distutils webapp - -DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system." -HOMEPAGE="http://trac.edgewall.com/" -SRC_URI="http://ftp.edgewall.com/pub/trac/${P}.tar.gz" - -LICENSE="trac" -KEYWORDS="~amd64 ppc ~ppc64 ~sparc x86" -IUSE="cgi fastcgi mysql postgres sqlite enscript silvercity" - -# doing so because utils (such as trac-admin), manpages... overlap -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" - -# we need to depend on virtual/httpd-cgi to pull apache/lighttpd/whatever in when USE cgi -# we need to depend on virtual/httpd-fcgi to pull mod_fastcgi/lighttpd/whatever in when USE fastcgi -# we need to depend on virtual/httpd-python to pull mod_python/whatever in when USE python (python -# is rather confusing here, as dev-lang/python is a required dependency, but httpd-python isn't) -DEPEND="${DEPEND} - >=dev-lang/python-2.3 - app-text/pytextile - >=dev-python/docutils-0.3.9 - dev-libs/clearsilver - >=dev-util/subversion-1.3.2 - mysql? ( - >=virtual/mysql-4.1 - >=dev-python/mysql-python-1.2.1 - ) - sqlite? ( - >=dev-db/sqlite-3.3.4 - >=dev-python/pysqlite-2.3 - ) - postgres? ( >=dev-python/psycopg-2 ) - enscript? ( app-text/enscript ) - silvercity? ( app-text/silvercity )" - -# The following function should be added to eutils.eclass (see bug #143572): - -# Generate an standard error message for missing USE flags -# in existing packages, and die. -# -# Usage: built_with_use_error [] -# ex: built_with_use_error dev-util/subversion python -# or: built_with_use_error net-www/apache LDAP ldap -# -# Typical usage: -# if ! built_with_use dev-util/subversion python ; then -# built_with_use_error dev-util/subversion python -# fi -# -# Note: when is not specified, is used for the USE flag name. -built_with_use_error() { - local package=$1 - local func=$2 - local use_flag=$3 - - [[ -z ${use_flag} ]] && use_flag=${func} - - eerror "Your ${package} package has been built without" - eerror "${func} support, please enable the '${use_flag}' USE flag and" - eerror "re-emerge ${package}." - elog "You can enable this USE flag either globally in /etc/make.conf," - elog "or just for specific packages in /etc/portage/package.use." - die "${package} missing ${func} support" -} - -pkg_setup () { - if ! use mysql && ! use postgres && ! use sqlite ; then - eerror "You must select at least one database backend, by enabling" - eerror "at least one of the 'mysql', 'postgres' or 'sqlite' USE flags." - die "no database backend selected" - fi - - if ! built_with_use dev-util/subversion python ; then - built_with_use_error dev-util/subversion python - fi - - if ! built_with_use dev-libs/clearsilver python ; then - built_with_use_error dev-libs/clearsilver python - fi - - ebegin "Creating tracd group and user" - enewgroup tracd - enewuser tracd -1 -1 -1 tracd - eend ${?} - - webapp_pkg_setup -} - -src_install () { - # project environments might go in here - keepdir /var/lib/trac - - webapp_src_preinst - distutils_src_install - - dodoc AUTHORS INSTALL RELEASE THANKS UPGRADE - rm ${D}/usr/share/doc/${P}/MANIFEST.in.gz - rm ${D}/usr/share/doc/${P}/PKG-INFO.gz - - docinto contrib - dodoc contrib/* - - # if needed, install cgi/fcgi scripts for webapp-config - local my_dir=${D}/usr/share/trac - if use cgi ; then - mv ${my_dir}/cgi-bin/trac.cgi ${D}${MY_CGIBINDIR} || die - fi - if use fastcgi ; then - mv ${my_dir}/cgi-bin/trac.fcgi ${D}${MY_CGIBINDIR} || die - fi - rm -rf ${my_dir}/cgi-bin || die - - for lang in en; do - webapp_postinst_txt ${lang} ${FILESDIR}/postinst-${lang}.txt - done - - # copy graphics, css & js - cp -r htdocs/* ${D}/${MY_HTDOCSDIR} - - webapp_src_install - - newconfd "${FILESDIR}"/tracd.confd tracd - newinitd "${FILESDIR}"/tracd.initd tracd -} diff --git a/www-apps/trac/trac-0.10.1.ebuild b/www-apps/trac/trac-0.10.4.ebuild similarity index 84% rename from www-apps/trac/trac-0.10.1.ebuild rename to www-apps/trac/trac-0.10.4.ebuild index 889b3d484782..b1d4c4dd1cbf 100644 --- a/www-apps/trac/trac-0.10.1.ebuild +++ b/www-apps/trac/trac-0.10.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.10.1.ebuild,v 1.6 2007/01/07 19:51:05 dju Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.10.4.ebuild,v 1.1 2007/04/23 12:51:26 dju Exp $ inherit distutils webapp @@ -9,7 +9,7 @@ HOMEPAGE="http://trac.edgewall.com/" SRC_URI="http://ftp.edgewall.com/pub/trac/${P}.tar.gz" LICENSE="trac" -KEYWORDS="~amd64 ppc ~sparc x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="cgi fastcgi mysql postgres sqlite enscript silvercity" # doing so because utils (such as trac-admin), manpages... overlap @@ -43,17 +43,17 @@ DEPEND="${DEPEND} # Generate an standard error message for missing USE flags # in existing packages, and die. # -# Usage: built_with_use_error [] -# ex: built_with_use_error dev-util/subversion python -# or: built_with_use_error net-www/apache LDAP ldap +# Usage: built_with_use_die [] +# ex: built_with_use_die dev-util/subversion python +# or: built_with_use_die net-www/apache LDAP ldap # # Typical usage: # if ! built_with_use dev-util/subversion python ; then -# built_with_use_error dev-util/subversion python +# built_with_use_die dev-util/subversion python # fi # # Note: when is not specified, is used for the USE flag name. -built_with_use_error() { +built_with_use_die() { local package=$1 local func=$2 local use_flag=$3 @@ -76,11 +76,11 @@ pkg_setup () { fi if ! built_with_use dev-util/subversion python ; then - built_with_use_error dev-util/subversion python + built_with_use_die dev-util/subversion python fi if ! built_with_use dev-libs/clearsilver python ; then - built_with_use_error dev-libs/clearsilver python + built_with_use_die dev-libs/clearsilver python fi ebegin "Creating tracd group and user" @@ -99,8 +99,8 @@ src_install () { distutils_src_install dodoc AUTHORS INSTALL RELEASE THANKS UPGRADE - rm ${D}/usr/share/doc/${P}/MANIFEST.in.gz - rm ${D}/usr/share/doc/${P}/PKG-INFO.gz + rm ${D}/usr/share/doc/${P}/MANIFEST.in* + rm ${D}/usr/share/doc/${P}/PKG-INFO* docinto contrib dodoc contrib/* -- 2.26.2