version bump wrt security #215138

(Portage version: 2.1.4.4)

3 files changed, 122 insertions, 6 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index 2f3ef67ec697..710f4a54fb15 100644
--- a/www-apps/otrs/ChangeLog
+++ b/www-apps/otrs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/otrs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.38 2007/09/18 12:29:04 wrobel Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.39 2008/04/03 11:08:59 hollow Exp $
+
+*otrs-2.2.6 (03 Apr 2008)
+
+  03 Apr 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  +otrs-2.2.6.ebuild:
+  version bump wrt security #215138
 
 *otrs-2.2.3 (18 Sep 2007)
 
diff --git a/www-apps/otrs/metadata.xml b/www-apps/otrs/metadata.xml
index 43819e102566..5e4c3a3a245d 100644
--- a/www-apps/otrs/metadata.xml
+++ b/www-apps/otrs/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-  <email>rl03@gentoo.org</email>
-</maintainer>
+	<herd>web-apps</herd>
+	<maintainer>
+		<email>rl03@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/otrs/otrs-2.2.6.ebuild b/www-apps/otrs/otrs-2.2.6.ebuild
new file mode 100644
index 000000000000..9933c4960773
--- /dev/null
+++ b/www-apps/otrs/otrs-2.2.6.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.2.6.ebuild,v 1.1 2008/04/03 11:08:59 hollow Exp $
+
+inherit webapp eutils depend.apache
+
+DESCRIPTION="OTRS is an Open source Ticket Request System"
+HOMEPAGE="http://otrs.org/"
+SRC_URI="ftp://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="mysql postgres fastcgi ldap gd pdf"
+
+RDEPEND="${DEPEND}
+	virtual/mta
+	=dev-lang/perl-5*
+
+	dev-perl/Authen-SASL
+	dev-perl/Crypt-PasswdMD5
+	dev-perl/DBI
+	dev-perl/Date-Pcalc
+	dev-perl/IO-stringy
+	dev-perl/MIME-tools
+	dev-perl/MailTools
+	dev-perl/Net-DNS
+	dev-perl/TimeDate
+	dev-perl/XML-Parser
+	dev-perl/libwww-perl
+	virtual/perl-CGI
+	virtual/perl-Digest-MD5
+	virtual/perl-MIME-Base64
+	virtual/perl-libnet
+
+	apache2? ( =www-apache/libapreq2-2* )
+	fastcgi? ( dev-perl/FCGI )
+	gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph )
+	ldap? ( dev-perl/perl-ldap net-nds/openldap )
+	mysql? ( >=dev-perl/DBD-mysql-3.0005 )
+	pdf? ( dev-perl/PDF-API2 )
+	postgres? ( dev-perl/DBD-Pg )
+"
+
+want_apache
+
+pkg_setup() {
+	webapp_pkg_setup
+	if use apache2; then
+		enewuser otrs -1 -1 /dev/null apache
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cp "${S}"/Kernel/Config.pm{.dist,}
+
+	cd "${S}"/Kernel/Config/
+	for i in *.dist; do
+		cp ${i} $(basename ${i} .dist)
+	done
+
+	cd "${S}"/scripts
+	rm -rf auto_* redhat* suse*
+
+	if use fastcgi; then
+		epatch "${FILESDIR}"/apache2.patch
+		sed -e "s|cgi-bin|fcgi-bin|" -i "${S}"/scripts/apache2-httpd.include.conf
+		sed -e "s|index.pl|index.fpl|" -i "${S}"/var/httpd/htdocs/index.html
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+	dodir "${MY_HOSTROOTDIR}"/${PF}
+
+	dodoc CHANGES CREDITS INSTALL README* TODO UPGRADING \
+		doc/otrs-database.dia doc/test-* doc/X-OTRS-Headers.txt \
+		.fetchmailrc.dist .mailfilter.dist .procmailrc.dist
+	dohtml doc/manual/{en,de}/html/*
+
+	insinto "${MY_HOSTROOTDIR}"/${PF}
+	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE Kernel bin scripts var
+
+	mv "${D}/${MY_HOSTROOTDIR}"/${PF}/var/httpd/htdocs/* "${D}/${MY_HTDOCSDIR}"
+	rm -rf "${D}/${MY_HOSTROOTDIR}"/${PF}/var/httpd
+
+	local a d="article log pics/images pics/stats pics sessions spool tmp"
+	for a in ${d}; do
+		keepdir "${MY_HOSTROOTDIR}"/${PF}/var/${a}
+	done
+
+	webapp_configfile "${MY_HOSTROOTDIR}"/${PF}/Kernel/Config.pm
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.txt
+	webapp_hook_script "${FILESDIR}"/reconfig-2
+	webapp_src_install
+}
+
+pkg_postinst() {
+	ewarn "webapp-config will not be run automatically"
+	ewarn "That messes up Apache configs"
+	ewarn "Don't run webapp-config with -d otrs. Instead, try"
+	ewarn "webapp-config -I -h <host> -d ot ${PN} ${PVR}"
+	ewarn
+	if ! use apache2; then
+		ewarn "You did not activate the USE-flag apache2 which means you"
+		ewarn "will need to create the otrs user yourself. Make this user"
+		ewarn "a member of your webserver group."
+	fi
+	# webapp_pkg_postinst
+}