Version bump

(Portage version: 2.0.51.22-r2)

8 files changed, 317 insertions, 13 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 474823fce543..7955537a6dc2 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.24 2005/10/24 14:19:14 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.25 2005/12/04 16:19:15 rl03 Exp $
+
+*rt-3.4.4 (04 Dec 2005)
+
+  04 Dec 2005; Renat Lumpau <rl03@gentoo.org>
+  files/3.4.2/postinstall-en.txt, files/3.4.2/reconfig,
+  +files/3.4.2/rt_apache2.conf, +files/3.4.4/reconfig, +rt-3.4.4.ebuild:
+  Version bump
 
   24 Oct 2005; Renat Lumpau <rl03@gentoo.org> +files/3.4.2/Callback.patch,
   rt-3.4.3.ebuild:
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 2a28e5547a09..94752ad58c45 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,17 +1,21 @@
+MD5 ead23ec5d52fefb7d8ba409ff8302d32 rt-3.4.3.ebuild 5999
+MD5 939107934a799efb520c62c057341273 rt-3.2.1.ebuild 4362
 MD5 92dc20327e49512a91079db5434c7244 ChangeLog 4087
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
-MD5 939107934a799efb520c62c057341273 rt-3.2.1.ebuild 4362
-MD5 ead23ec5d52fefb7d8ba409ff8302d32 rt-3.4.3.ebuild 5999
+MD5 bdc97a2957626f018b7873c78623e192 rt-3.4.4.ebuild 5897
 MD5 5f5c3f76ea4676e743612e38341780fe files/digest-rt-3.2.1 61
 MD5 74849aa771037cfdb03fc4a8b8d01af6 files/digest-rt-3.4.3 61
+MD5 a859c86fce7cdcad017a5858ede1c0e6 files/digest-rt-3.4.4 61
 MD5 15fc088b37155656e008679f3c07eea7 files/3.2.1/postinstall-en.txt 1648
 MD5 0706d6edcd1c4e23f526d611c9c6b531 files/3.2.1/reconfig 1170
 MD5 4dcfdbf63b882b398473d975b34fa23e files/3.4.2/config.layout-gentoo 616
-MD5 3a24e1ccdc0d6b7c6b0d40e19c586365 files/3.4.2/postinstall-en.txt 703
-MD5 bf81df666e02df7b1e6f73ee9908a767 files/3.4.2/reconfig 1206
+MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache2.conf 574
+MD5 b54ebbfd3fc1dd2a49d396e3dba2b857 files/3.4.2/rt_apache1_fcgi.conf 990
+MD5 c915d8b7646d69d0dc32fae2bfaf298a files/3.4.2/postinstall-en.txt 703
+MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache.conf 574
 MD5 c807deb11e08ab9f37a658bd5e971c7f files/3.4.2/rt.conf.d 405
 MD5 54a1cd04dc0d0788ce920d941e5601d0 files/3.4.2/rt.init.d 1019
-MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache.conf 574
-MD5 b54ebbfd3fc1dd2a49d396e3dba2b857 files/3.4.2/rt_apache1_fcgi.conf 990
-MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/3.4.2/rt_apache2_fcgi.conf 993
 MD5 cee32ca276838f6d74230c66d0bfc961 files/3.4.2/Callback.patch 1567
+MD5 0b5844df3dcd4e7e8a3231d7dc16826b files/3.4.2/reconfig 1232
+MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/3.4.2/rt_apache2_fcgi.conf 993
+MD5 28ed7a899ba4f40410c4796ffacb292b files/3.4.4/reconfig 1190
diff --git a/www-apps/rt/files/3.4.2/postinstall-en.txt b/www-apps/rt/files/3.4.2/postinstall-en.txt
index 9a1c3a3301fd..c77c0a11e922 100644
--- a/www-apps/rt/files/3.4.2/postinstall-en.txt
+++ b/www-apps/rt/files/3.4.2/postinstall-en.txt
@@ -5,8 +5,8 @@ Please follow the Gentoo install guide found at
 http://wiki.bestpractical.com/index.cgi?GentooInstallGuide
 
 Your local config files are located here:
-${VHOST_ROOT}/${PV}-${PVR}/etc/RT_Config.pm
-${VHOST_ROOT}/${PV}-${PVR}/etc/RT_SiteConfig.pm
+${VHOST_ROOT}/${PN}-${PVR}/etc/RT_Config.pm
+${VHOST_ROOT}/${PN}-${PVR}/etc/RT_SiteConfig.pm
 
 If you need more help, consider searching the mailing list (Google site:lists.fsck.com )
 
diff --git a/www-apps/rt/files/3.4.2/reconfig b/www-apps/rt/files/3.4.2/reconfig
index e71d24fdbb70..f254a3c2212f 100644
--- a/www-apps/rt/files/3.4.2/reconfig
+++ b/www-apps/rt/files/3.4.2/reconfig
@@ -14,9 +14,9 @@ if [ $1 = "install" ]; then
 	sed -e "s|${MY_HOSTROOTDIR}/${PF}|${VHOST_ROOT}/${PF}|g
 		s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i bin/* lib/RT.pm sbin/* etc/RT_Config.pm || die
 
-	# fix Apache configs
-	sed -e "s|RT_DIR|${VHOST_ROOT}/${PF}|g
-		s|HTDOCS|${MY_INSTALLDIR}|g" -i ${MY_SERVERCONFIGDIR}/apache* || die
+	# don't fix Apache configs - breaks sandbox
+	# sed -e "s|RT_DIR|${VHOST_ROOT}/${PF}|g
+	#	s|HTDOCS|${MY_INSTALLDIR}|g" -i ${MY_SERVERCONFIGDIR}/apache* || die
 
 	# check for upgrades
 	cd ${VHOST_ROOT}/${PF}/upgrade
diff --git a/www-apps/rt/files/3.4.2/rt_apache2.conf b/www-apps/rt/files/3.4.2/rt_apache2.conf
new file mode 100644
index 000000000000..896f642c55af
--- /dev/null
+++ b/www-apps/rt/files/3.4.2/rt_apache2.conf
@@ -0,0 +1,30 @@
+<IfDefine PERL>
+    <VirtualHost MY_RT_DOMAIN:80>
+        ServerName MY_RT_DOMAIN
+
+        DocumentRoot HTDOCS
+	ServerAdmin YOUR_EMAIL_HERE
+
+        AddDefaultCharset UTF-8
+	<IfDefine USERDIR>
+	        UserDir disabled
+	</IfDefine>
+ 
+        PerlModule Apache::DBI
+        PerlRequire RT_DIR/bin/webmux.pl
+ 
+	<Location />
+		SetHandler perl-script
+		PerlHandler RT::Mason
+		PerlSetEnv PERL5LIB /usr/lib
+	</Location>
+
+	<Directory "HTDOCS">
+		Options Indexes FollowSymLinks
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+    </VirtualHost>
+</IfDefine>
diff --git a/www-apps/rt/files/3.4.4/reconfig b/www-apps/rt/files/3.4.4/reconfig
new file mode 100644
index 000000000000..61e08d74f941
--- /dev/null
+++ b/www-apps/rt/files/3.4.4/reconfig
@@ -0,0 +1,37 @@
+#!/bin/bash
+PF=${PN}-${PVR}
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	# fix location
+	cd ${VHOST_ROOT}/${PF}
+	sed -e "s|${MY_HOSTROOTDIR}/${PF}|${VHOST_ROOT}/${PF}|g
+		s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i bin/* lib/RT.pm sbin/* etc/RT_Config.pm || die
+
+	 sed -e "s|RT_DIR|${VHOST_ROOT}/${PF}|g
+		s|HTDOCS|${MY_INSTALLDIR}|g" -i ${VHOST_ROOT}/${PF}/etc/rt_apache* || die
+
+	# check for upgrades
+	cd ${VHOST_ROOT}/${PF}/upgrade
+	echo "You may need to update your database."
+	echo "For each item in the output below"
+	echo "whose name is greater than your previously installed RT version,"
+	echo "rt-setup-database --action schema --datadir ${VHOST_ROOT}/${PF}/upgrade/<version>"
+	echo "rt-setup-database --action acl --datadir ${VHOST_ROOT}/${PF}/upgrade/<version>"
+	echo "rt-setup-database --action insert --datadir ${VHOST_ROOT}/${PF}/upgrade/<version>"
+	echo "Don't forget to read the online installation guide for more details"
+	ls
+
+elif [ $1 = "clean" ]; then
+	echo "Please examine the contents of the following directories"
+	echo "and delete anything that is no longer necessary"
+	echo 
+	echo ${VHOST_ROOT}/${PF}
+	echo ${MY_INSTALLDIR}
+fi
diff --git a/www-apps/rt/files/digest-rt-3.4.4 b/www-apps/rt/files/digest-rt-3.4.4
new file mode 100644
index 000000000000..dbea74493d34
--- /dev/null
+++ b/www-apps/rt/files/digest-rt-3.4.4
@@ -0,0 +1 @@
+MD5 769d77eea39006be643cbd2db4820ba3 rt-3.4.4.tar.gz 1393950
diff --git a/www-apps/rt/rt-3.4.4.ebuild b/www-apps/rt/rt-3.4.4.ebuild
new file mode 100644
index 000000000000..cb94c411aa36
--- /dev/null
+++ b/www-apps/rt/rt-3.4.4.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.4.ebuild,v 1.1 2005/12/04 16:19:15 rl03 Exp $
+
+inherit webapp eutils
+
+IUSE="mysql postgres fastcgi apache2 lighttpd"
+
+DESCRIPTION="RT is an enterprise-grade ticketing system"
+HOMEPAGE="http://www.bestpractical.com/rt/"
+SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
+
+KEYWORDS="~ppc ~x86"
+
+DEPEND="
+	>=dev-lang/perl-5.8.3
+	>=dev-perl/Params-Validate-0.02
+	dev-perl/Cache-Cache
+	>=dev-perl/Exception-Class-1.14
+	>=perl-core/Digest-MD5-2.27
+	>=perl-core/Storable-2.08
+	perl-core/CGI
+	>dev-perl/HTML-Mason-1.28
+	dev-perl/MLDBM
+	dev-perl/FreezeThaw
+	>=dev-perl/Apache-Session-1.53
+	>=dev-perl/XML-RSS-1.05
+	>=dev-perl/HTTP-Server-Simple-0.07
+	>=dev-perl/HTTP-Server-Simple-Mason-0.09
+	dev-perl/HTML-Tree
+	dev-perl/HTML-Format
+	dev-perl/libwww-perl
+	>=dev-perl/DBI-1.37
+	dev-perl/Test-Inline
+	>=dev-perl/class-returnvalue-0.40
+	>=dev-perl/dbix-searchbuilder-1.27
+	dev-perl/text-template
+	dev-perl/HTML-Parser
+	>=dev-perl/HTML-Scrubber-0.08
+	>=perl-core/File-Spec-0.8
+	>=dev-perl/log-dispatch-2.0
+	>=dev-perl/locale-maketext-lexicon-0.32
+	dev-perl/locale-maketext-fuzzy
+	>=dev-perl/MIME-tools-5.417
+	>=dev-perl/MailTools-1.60
+	dev-perl/text-wrapper
+	dev-perl/Text-WikiFormat
+	dev-perl/Time-modules
+	dev-perl/TermReadKey
+	>=dev-perl/Text-Quoted-1.3
+	>=dev-perl/Tree-Simple-1.04
+	dev-perl/Module-Versions-Report
+	dev-perl/Cache-Simple-TimedExpiry
+	dev-perl/XML-Simple
+	dev-perl/regexp-common
+	dev-perl/WWW-Mechanize
+	dev-perl/Test-WWW-Mechanize
+	dev-perl/Module-Refresh
+
+	dev-perl/Font-AFM
+	dev-perl/text-autoformat
+	dev-perl/text-reform
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/mta
+	mysql? ( >=dev-db/mysql-4.0.13 >=dev-perl/DBD-mysql-2.1018 )
+	postgres? ( >=dev-db/postgresql-7.4.2-r1 >=dev-perl/DBD-Pg-1.41 )
+	!lighttpd? (
+		>=dev-perl/Apache-DBI-0.92
+		apache2? ( >=net-www/apache-2
+			fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
+			!fastcgi? ( >=www-apache/libapreq2-2.06
+						>=dev-perl/HTML-Mason-1.31 ) )
+		!apache2? ( =net-www/apache-1*
+			fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
+			!fastcgi? ( =www-apache/libapreq-1* ) ) )
+	lighttpd? (
+		>=www-servers/lighttpd-1.3.13
+		dev-perl/FCGI )
+"
+
+LICENSE="GPL-2"
+
+add_user_rt() {
+	# add new user
+	# suexec2 requires uid >= 1000; enewuser is of no help here
+	# From: Mike Frysinger <vapier@gentoo.org>
+	# Date: Fri, 17 Jun 2005 08:41:44 -0400
+	# i'd pick a 5 digit # if i were you
+
+	local euser="rt"
+
+	# first check if username rt exists
+	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
+		# check uid
+		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
+		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
+			ewarn "uid of user rt is less than 1000. suexec2 will not work."
+			ewarn "If you want to use FastCGI, please delete the user 'rt'"
+			ewarn "from your system and re-emerge www-apps/rt"
+			epause
+		fi
+		return 0 # all is well
+	fi
+
+	# add user
+	# stolen from enewuser
+	local pwrange euid
+
+	pwrange=$(seq 10001 11001)
+	for euid in ${pwrange} ; do
+		[[ -z $(egetent passwd ${euid}) ]] && break
+	done
+	if [[ ${euid} == "11001" ]]; then
+		# she gets around, doesn't she?
+		die "No available uid's found"
+	fi
+
+	einfo " - Userid: ${euid}"
+
+	enewuser rt ${euid} -1 /dev/null rt > /dev/null
+	return 0
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if useq mysql; then
+		ewarn "RT needs MySQL with innodb support"
+	fi
+	ewarn
+	ewarn "If you are upgrading from an existing _RT2_ installation,"
+	ewarn "stop this ebuild (Ctrl-C now), download the upgrade tool,"
+	ewarn "http://bestpractical.com/pub/rt/devel/rt2-to-rt3.tar.gz"
+	ewarn "and follow the included instructions."
+	ewarn
+	epause 5
+	enewgroup rt >/dev/null
+	add_user_rt || die "Could not add user"
+
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# add Gentoo-specific layout
+	cat ${FILESDIR}/3.4.2/config.layout-gentoo >> config.layout
+	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|
+			s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout || die
+
+	# don't need to check dev dependencies
+	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" -i sbin/rt-test-dependencies.in || die
+}
+
+src_compile() {
+
+	local web="apache"
+	if useq lighttpd; then
+		web="lighttpd"
+	fi
+
+	./configure --enable-layout=Gentoo \
+		--with-bin-owner=rt \
+		--with-libs-owner=rt \
+		--with-libs-group=rt \
+		--with-rt-group=rt \
+		--with-web-user=${web} \
+		--with-web-group=${web}
+
+	# check for missing deps and ask to report if something is broken
+	local myconf="--verbose $(use_with mysql) \
+		$(use_with postgres pg) \
+		$(use_with fastcgi) \
+		$(use_with lighttpd fastcgi)"
+	if ! useq fastcgi && ! useq lighttpd; then
+		myconf="${myconf} $(use_with apache2 modperl2)"
+		! useq apache2 && myconf="${myconf} --with-modperl1"
+	fi
+
+	/usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > ${T}/t
+	if grep -q "MISSING" ${T}/t; then
+		ewarn "Missing Perl dependency!"
+		ewarn
+		cat ${T}/t
+		ewarn
+		ewarn "Please file a bug in the Gentoo Bugzilla with the information above"
+		ewarn "and assign it to rl03@gentoo.org"
+		die "Missing dependencies."
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	make install
+
+	# make sure we don't clobber existing site configuration
+	rm -f ${D}/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
+
+	# copy upgrade files
+	cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${PF}
+
+	cd ${D}
+	grep -Rl "${D}" * | xargs dosed
+
+	if useq lighttpd; then
+		newinitd ${FILESDIR}/3.4.2/${PN}.init.d ${PN}
+		insinto /etc/conf.d
+		newins ${FILESDIR}/3.4.2/${PN}.conf.d ${PN}
+	else
+		if useq apache2; then
+			local CONF="rt_apache2_fcgi.conf rt_apache2.conf"
+		else
+			local CONF="rt_apache1_fcgi.conf rt_apache.conf"
+		fi
+		cd ${FILESDIR}/3.4.2
+		cp ${CONF} ${D}/${MY_HOSTROOTDIR}/${PF}/etc
+	fi
+	webapp_postinst_txt en ${FILESDIR}/3.4.2/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/3.4.4/reconfig
+	webapp_src_install
+}