version bump wrt security #215138

Package-Manager: portage-2.1.4.4

4 files changed, 136 insertions, 8 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/Manifest b/www-apps/otrs/Manifest
index 58969503dca7..3258ddf900e5 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX apache2.patch 874 RMD160 c3e87de6e20429ed80c2fd08f731aabb198dfa60 SHA1 0847d39c32fead0a19716dcd9bdb4d83c56d089e SHA256 fbad80b193717c42d7b1daf9a5026772e20ddb39d985e5042f50dbfd1876c4ad
 AUX dbi_finish.patch 293 RMD160 7178dee7a8f250733510feb9ffdbe6bd9b044429 SHA1 a4a16eaca625edb53cee172262b93989ab82c7fd SHA256 5ab5d742efb0c6287d4571178f711bcfc18e0bfa700f0efed33576519a02c6d4
 AUX postinstall-en-2.txt 661 RMD160 ea269ff2e998784b66642e89ab711a3055c9cf8f SHA1 330eef95add88fed1a6631b27f8373e2219326c5 SHA256 a9b4fa8cf75550d5d970bb3d203662a3dd2398f50d22ec0bcddb009259396da9
 AUX reconfig-2 880 RMD160 eb71fbb7b086e60e648f06828353baf9b3f8bec7 SHA1 442203fc0694b9591ee21baababc697c31ad65e4 SHA256 f08ef6e1258bb64d77fbf34bad33eee2e8556580509706eb17cbd2ae079e0a29
 DIST otrs-2.2.2.tar.bz2 10259281 RMD160 22d4b502938d5aa8def52997963e800dff7c6aa1 SHA1 5059b70647bd8bff554cb93aabd752c52fd9cc34 SHA256 267893b48eaae15aafcce2e3254d7d12c8204dd72fa674105f61c7bb69571989
 DIST otrs-2.2.3.tar.bz2 10281102 RMD160 ebfcd5083836d07e8e817168ed82e1e795b04433 SHA1 3c5fbcd9e98d854491fe2d001d3bee07b6db77e1 SHA256 d175b8f48f43acd376b1a40477add6e413a03d31209a95a49d30654d7e91b42f
+DIST otrs-2.2.6.tar.bz2 10640789 RMD160 ccd86b0a42fab16fe0c8d41c026db3cf2f645672 SHA1 fef9feacc57797f3cd753eb3db28a7753fbe6b64 SHA256 7ec9520391066ec1156d2659b9c59f14428b379ff2a23dcf02e4df7963659853
 EBUILD otrs-2.2.2.ebuild 3189 RMD160 8a72058f1ddf1028d6969b842f61b0008df5b3db SHA1 c5912a7ff9f78ede46b7352c1698ac02d3eab5ae SHA256 1059083f565130393f5e02bed398181e5f5d9719c2ae37ef6846cd11156edfe1
 EBUILD otrs-2.2.3.ebuild 3189 RMD160 301e710d56f4c776902dd493d2da3bfcb191b2f7 SHA1 3ac7ed9d75adf8103b1a684a04d0e8321a56b03b SHA256 286be4201817a7765255f717dc13abc3feb46a624af8b42dae8d5f8caee334f1
-MISC ChangeLog 5667 RMD160 4cade7c771630b8cc8e4444d9c2ae96a2e7c1431 SHA1 12613d6463b321f6d053c2da259583b4198bfd8d SHA256 065d42f1642b76d4b281dda7b05128b1740723545a11518939c7cd761a2532ab
-MISC metadata.xml 221 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 SHA1 0f301c536f2b097bd3ff21cc1dd05fe6d8f4713e SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a
+EBUILD otrs-2.2.6.ebuild 2982 RMD160 d518a57bcab6b039d6ff6eb1265ade3c8717f727 SHA1 ab3f3a53f340b6d0227ec9c76257f066aaa0b003 SHA256 29612e96ec097cd02db83b122c8639e784d74ba33aee6952cce2a93895c32509
+MISC ChangeLog 5817 RMD160 9267cc5b1964305533aceae28e829ab2e6fc61d0 SHA1 a4e9a8e6aaf63b503308c2c20324c277266dc1e2 SHA256 acb6ea1b540be5f3c9915ec317f9a5b65e80c83fc0d62718aca260702ea2966c
+MISC metadata.xml 224 RMD160 6473c0e4796e967137528ff82a99aad5b7e410c9 SHA1 b69add64067ccc2d56e521ac0e5799cc8a47fd75 SHA256 d093d9f523cc0019dc1107d9955a0b24fb0a796dbc032775dbdafe782c0c4066
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH9LrUmPFBzbX68WERAjvEAKCQC1fLBDDmaG4B31F8va99DUbGuACbBsbP
+Sg7tQBF4jotrIVRqZjrQgmw=
+=GwJR
+-----END PGP SIGNATURE-----
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
+}