Removed old, insecure ebuilds, added otrs-2.2.2. See #177630.

(Portage version: 2.1.2.12)

7 files changed, 26 insertions, 123 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index 3a31482fac7b..4890da3fff1d 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.34 2007/08/19 11:40:10 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.35 2007/09/12 07:00:31 wrobel Exp $
+
+*otrs-2.2.2 (12 Sep 2007)
+
+  12 Sep 2007; <wrobel@gentoo.org> files/postinstall-en-2.txt,
+  -otrs-2.0.4.ebuild, -otrs-2.1.5.ebuild, +otrs-2.2.2.ebuild:
+  Removed old, insecure ebuilds, added otrs-2.2.2. See #177630.
 
   19 Aug 2007; Benedikt Böhm <hollow@gentoo.org> otrs-2.0.4.ebuild,
   otrs-2.1.5.ebuild:
diff --git a/www-apps/otrs/files/digest-otrs-2.0.4 b/www-apps/otrs/files/digest-otrs-2.0.4
deleted file mode 100644
index a52294b31686..000000000000
--- a/www-apps/otrs/files/digest-otrs-2.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cfc0fa4f711c2fa92bc513b57632bbfe otrs-2.0.4-01.tar.bz2 11560233
-RMD160 f68650e86273cffe82382de57a6d4efa6b080d68 otrs-2.0.4-01.tar.bz2 11560233
-SHA256 6d3a357e4beee75c0267e6dc3dd16cf31d94946a75063b15081db0d2864d1866 otrs-2.0.4-01.tar.bz2 11560233
diff --git a/www-apps/otrs/files/digest-otrs-2.1.5 b/www-apps/otrs/files/digest-otrs-2.1.5
deleted file mode 100644
index cef5d188a461..000000000000
--- a/www-apps/otrs/files/digest-otrs-2.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e302fd0fd6207ea2ea51884ab51b430b otrs-2.1.5.tar.bz2 12621955
-RMD160 579b90c850e813a6f3c625020e42a762e2817a25 otrs-2.1.5.tar.bz2 12621955
-SHA256 857a2b79ce37e54f7b1870ec4d148aa8083498609e02967b74adddfe3e54f350 otrs-2.1.5.tar.bz2 12621955
diff --git a/www-apps/otrs/files/digest-otrs-2.2.2 b/www-apps/otrs/files/digest-otrs-2.2.2
new file mode 100644
index 000000000000..79ac6d974c44
--- /dev/null
+++ b/www-apps/otrs/files/digest-otrs-2.2.2
@@ -0,0 +1,3 @@
+MD5 fddfaf6dead3c51d2132bd92d762cd74 otrs-2.2.2.tar.bz2 10259281
+RMD160 22d4b502938d5aa8def52997963e800dff7c6aa1 otrs-2.2.2.tar.bz2 10259281
+SHA256 267893b48eaae15aafcce2e3254d7d12c8204dd72fa674105f61c7bb69571989 otrs-2.2.2.tar.bz2 10259281
diff --git a/www-apps/otrs/files/postinstall-en-2.txt b/www-apps/otrs/files/postinstall-en-2.txt
index 84f59b14520f..c967f7576b0d 100644
--- a/www-apps/otrs/files/postinstall-en-2.txt
+++ b/www-apps/otrs/files/postinstall-en-2.txt
@@ -4,15 +4,15 @@ Your installation is almost complete.
 and set some Kernel::Config options (FQDN, SystemID, TicketHook, Home, ...).
 
 2. Configure and restart your webserver.
-Read /usr/share/doc/${PN}-${PVR}/README.webserver.gz.
+Read /usr/share/doc/${PN}-${PVR}/README.webserver.bz2.
 Sample config files are in ${VHOST_ROOT}/${PN}-${PVR}/scripts
 
 If you are using FastCGI, don't forget to add -D FASTCGI
 to your Apache options.
 
-3. Setup your database. Read /usr/share/doc/${PN}-${PVR}/README.database.gz
+3. Setup your database. Read /usr/share/doc/${PN}-${PVR}/README.database.bz2
 
 4. Read /usr/share/doc/${PN}-${PVR}/INSTALL.gz , pp. 9-12,
 to finish the installation.
 
-If you are upgrading, read /usr/share/doc/${PN}-${PVR}/UPGRADING.gz
+If you are upgrading, read /usr/share/doc/${PN}-${PVR}/UPGRADING.bz2
diff --git a/www-apps/otrs/otrs-2.0.4.ebuild b/www-apps/otrs/otrs-2.0.4.ebuild
deleted file mode 100644
index 88cad6d9bb30..000000000000
--- a/www-apps/otrs/otrs-2.0.4.ebuild
+++ /dev/null
@@ -1,108 +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/otrs/otrs-2.0.4.ebuild,v 1.13 2007/08/19 11:40:10 hollow Exp $
-
-inherit webapp eutils
-
-S=${WORKDIR}/${PN}
-
-IUSE="mysql postgres fastcgi ldap gd"
-
-DESCRIPTION="OTRS is an Open source Ticket Request System"
-HOMEPAGE="http://otrs.org/"
-SRC_URI="ftp://ftp.otrs.org/pub/${PN}/${P}-01.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
-	=dev-lang/perl-5*
-	dev-perl/Date-Pcalc
-	dev-perl/TimeDate
-	dev-perl/DBI
-	virtual/perl-CGI
-	virtual/perl-Digest-MD5
-	dev-perl/libwww-perl
-	dev-perl/IO-stringy
-	virtual/perl-MIME-Base64
-	dev-perl/MIME-tools
-	dev-perl/MailTools
-	dev-perl/Net-DNS
-	virtual/perl-libnet
-	dev-perl/Authen-SASL
-	dev-perl/XML-Parser
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/mta
-	ldap? ( dev-perl/perl-ldap net-nds/openldap )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	>=www-servers/apache-2
-	fastcgi? ( dev-perl/FCGI )
-	!fastcgi? ( =www-apache/libapreq2-2* )
-	gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph )
-"
-
-LICENSE="GPL-2"
-
-pkg_setup() {
-	webapp_pkg_setup
-	enewuser otrs -1 -1 /dev/null apache
-}
-
-src_unpack() {
-	unpack ${A}
-	cp ${S}/Kernel/Config.pm.dist ${S}/Kernel/Config.pm
-	cd ${S}/Kernel/Config/
-	for foo in *.dist; do cp ${foo} $(basename ${foo} .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}
-
-	# install documentation
-	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/*
-
-	# copy main files
-	cp -R .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE Kernel bin scripts var ${D}/${MY_HOSTROOTDIR}/${PF}
-	mv ${D}/${MY_HOSTROOTDIR}/${PF}/var/httpd/htdocs/* ${D}/${MY_HTDOCSDIR}
-
-	# remove stuff from ${D} that shouldn't be there
-	rm -rf ${D}/${MY_HOSTROOTDIR}/${PF}/var/httpd
-
-	# keep some empty dirs
-	local a
-	local d="article log pics/images pics/stats pics sessions spool tmp"
-	for a in ${d}; do
-		keepdir ${MY_HOSTROOTDIR}/${PF}/var/${a}
-	done
-
-	# helpers
-	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
-	# webapp_pkg_postinst
-}
diff --git a/www-apps/otrs/otrs-2.1.5.ebuild b/www-apps/otrs/otrs-2.2.2.ebuild
index 8543c4c08d74..6ed06f527e94 100644
--- a/www-apps/otrs/otrs-2.1.5.ebuild
+++ b/www-apps/otrs/otrs-2.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.1.5.ebuild,v 1.5 2007/08/19 11:40:10 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.2.2.ebuild,v 1.1 2007/09/12 07:00:31 wrobel Exp $
 
-inherit webapp eutils
+inherit webapp eutils depend.apache
 
 IUSE="mysql postgres fastcgi ldap gd pdf"
 
@@ -35,17 +35,20 @@ RDEPEND="
 	ldap? ( dev-perl/perl-ldap net-nds/openldap )
 	mysql? ( dev-perl/DBD-mysql )
 	postgres? ( dev-perl/DBD-Pg )
-	>=www-servers/apache-2
 	fastcgi? ( dev-perl/FCGI )
-	!fastcgi? ( =www-apache/libapreq2-2* )
+	apache2? ( =www-apache/libapreq2-2* )
 	gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph )
 "
 
+want_apache
+
 LICENSE="GPL-2"
 
 pkg_setup() {
 	webapp_pkg_setup
-	enewuser otrs -1 -1 /dev/null apache
+	if use apache2; then
+		enewuser otrs -1 -1 /dev/null apache
+	fi
 }
 
 src_unpack() {
@@ -106,5 +109,10 @@ pkg_postinst() {
 	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
 }