commit: 8c099aa0b092901ea6fa576956ae1a5ebf347e26
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 07:55:40 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 07:55:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c099aa0
www-apps/otrs: Security cleanup (bug #598768)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-apps/otrs/Manifest | 2 -
www-apps/otrs/files/apache2.patch | 25 ------
www-apps/otrs/files/dbi_finish.patch | 10 ---
www-apps/otrs/files/postinstall-en-2.txt | 18 -----
www-apps/otrs/files/reconfig-2 | 31 --------
www-apps/otrs/otrs-4.0.12.ebuild | 131 -------------------------------
www-apps/otrs/otrs-4.0.13.ebuild | 131 -------------------------------
7 files changed, 348 deletions(-)
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 9fabaeb..5f68e09 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,3 +1 @@
-DIST otrs-4.0.12.tar.bz2 14373765 SHA256
ea0a7b2019c46108f78d2329aa40ec5024405f08b586b6b33a6fca6a31ca9880 SHA512
17177b42c3768d271388fbe7abef033553fa524ba819a903b3f151b560de31183c5a1d975f8eb75f755b8bbf99331808309002f38cf3f469b22eadc8fefaa911
WHIRLPOOL
07b3d81c36e10f89ba1498c8d80845f53fc44feab25903addb8c3e6fa567633ec9938115859b5b81bc74efaa7c65286a1f501d6472737e00c47cfa48b77b2ac4
-DIST otrs-4.0.13.tar.bz2 14376200 SHA256
1c663c264043b65369f5608f9c5fcfc90938147053b14581db306df0c5e3e9ff SHA512
fb6156385643c838f46f80eeb8db2777ed426bca10df0ea94654df80b84e6dfd320a1ef6e43312edfcdb1a735e592cc49707a9507a47f2a5e3f5c80d9e0ccdc4
WHIRLPOOL
ff8654485bf69ea08abd97e08dcaf68633f16242afc9beb169b0682a2155e4e4e89f5776d36eaaf15ab2ecde0717fb9c85676a3120ee01a21d3c70068605d669
DIST otrs-5.0.15.tar.bz2 19344790 SHA256
03f294a34c1e44b0bf5d6974eab718e053546e6e7d9d84c7b14958827b83805b SHA512
5ac8614eee5719831dbf5e19c401c3947d48c0f43fea3d1be70cde797f108f5ca964616f7d0129471636d1f69f1ecaaa63939870c66c64138fd925c74cf6174c
WHIRLPOOL
58406cc2cb2700b96811913c0b31dfca9dc7df051e6206d957c382f494f2ac1a6a5bfea7a16d155e6fe384070d2cb121358496c477a70866f907caeddafcd90f
diff --git a/www-apps/otrs/files/apache2.patch
b/www-apps/otrs/files/apache2.patch
deleted file mode 100644
index 45ef689..00000000
--- a/www-apps/otrs/files/apache2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- apache2-httpd.include.conf.orig 2007-09-14 07:49:10.000000000 +0200
-+++ apache2-httpd.include.conf 2007-09-14 07:49:50.000000000 +0200
-@@ -11,7 +11,7 @@
- <IfModule mod_perl.c>
-
- # load all otrs modules
-- Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
-+ #Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
-
- # Apache::Reload - Reload Perl Modules when Changed on Disk
- PerlModule Apache::Reload
-@@ -22,10 +22,10 @@
- # ErrorDocument 403 /otrs/customer.pl
- AllowOverride None
- ErrorDocument 403 /otrs/index.pl
-- SetHandler perl-script
-- PerlHandler ModPerl::Registry
-+ #SetHandler perl-script
-+ #PerlHandler ModPerl::Registry
- Options +ExecCGI
-- PerlOptions +ParseHeaders
-+ #PerlOptions +ParseHeaders
- Order allow,deny
- Allow from all
- </Location>
diff --git a/www-apps/otrs/files/dbi_finish.patch
b/www-apps/otrs/files/dbi_finish.patch
deleted file mode 100644
index 3817d58..00000000
--- a/www-apps/otrs/files/dbi_finish.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Kernel/System/DB.pm.old Wed Jun 14 15:45:49 2006
-+++ Kernel/System/DB.pm Wed Jun 14 15:43:12 2006
-@@ -217,6 +217,7 @@
- );
- }
- # do disconnect
-+ $Self->{Curser}->finish() if (defined($Self->{Curser}));
- $Self->{dbh}->disconnect() if ($Self->{dbh});
- return 1;
- }
diff --git a/www-apps/otrs/files/postinstall-en-2.txt
b/www-apps/otrs/files/postinstall-en-2.txt
deleted file mode 100644
index c86b278..00000000
--- a/www-apps/otrs/files/postinstall-en-2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Your installation is almost complete.
-1. You now need to edit ${VHOST_ROOT}/${PN}-${PVR}/Kernel/Config.pm
-and set some Kernel::Config options (FQDN, SystemID, TicketHook, Home, ...).
-
-2. Configure and restart your webserver.
-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.bz2
-
-4. Read the INSTALL file in /usr/share/doc/${PN}-${PVR}/, pp. 9-12,
-to finish the installation.
-
-If you are upgrading, read /usr/share/doc/${PN}-${PVR}/UPGRADING.bz2
diff --git a/www-apps/otrs/files/reconfig-2 b/www-apps/otrs/files/reconfig-2
deleted file mode 100644
index 769e8a7..00000000
--- a/www-apps/otrs/files/reconfig-2
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-PF=${PN}-${PVR}
-
-die() {
- echo "******"
- echo $1
- echo "******"
- exit 1
-}
-
-if [ $1 = "install" ]; then
- # edit Apache configs
- cd ${VHOST_ROOT}/${PF}/scripts
- sed -e "s|/opt/otrs/var/httpd/htdocs/|${MY_INSTALLDIR}/|g" -i
apache-httpd.include.conf apache2-httpd.include.conf || die "sed failed"
-
- # set $HOME
- grep -lR "/opt" * | xargs sed -i "s|/opt/otrs|${VHOST_ROOT}/${PF}|g" ||
die "sed failed"
-
- sed -i "s|/opt/otrs|${VHOST_ROOT}/${PF}|g"
${VHOST_ROOT}/${PF}/Kernel/Config.pm || die "sed failed"
-
- # set permissions
- ${VHOST_ROOT}/${PF}/bin/SetPermissions.sh ${VHOST_ROOT}/${PF} otrs
apache apache apache > /dev/null || die "Could not set permissions"
-
-
-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/otrs/otrs-4.0.12.ebuild b/www-apps/otrs/otrs-4.0.12.ebuild
deleted file mode 100644
index ff592b2..00000000
--- a/www-apps/otrs/otrs-4.0.12.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils confutils user
-
-DESCRIPTION="OTRS is an Open source Ticket Request System"
-HOMEPAGE="http://otrs.org/";
-SRC_URI="http://ftp.otrs.org/pub/${PN}/${P}.tar.bz2";
-
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
-SLOT="0"
-
-DEPEND="media-libs/libpng"
-
-RDEPEND="dev-perl/Apache-Reload
- dev-perl/Archive-Zip
- dev-perl/DBI
- dev-perl/IO-Socket-SSL
- dev-perl/JSON-XS
- dev-perl/LWP-UserAgent-Determined
- dev-perl/Mail-POP3Client
- dev-perl/Mail-IMAPClient
- >dev-perl/Net-DNS-0.60
- dev-perl/Template-Toolkit
- dev-perl/Text-CSV_XS
- dev-perl/TimeDate
- dev-perl/XML-Parser
- dev-perl/YAML-LibYAML
- apache2? ( mod_perl? ( www-servers/apache:2
- =www-apache/libapreq2-2* www-apache/mod_perl )
- !fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) ) )
- fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi )
- !fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
- gd? ( dev-perl/GD
- dev-perl/GDTextUtil
- dev-perl/GDGraph )
- ldap? ( dev-perl/perl-ldap )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- pdf? ( >=dev-perl/PDF-API2-0.73
- virtual/perl-Compress-Raw-Zlib )
- soap? (
- dev-perl/SOAP-Lite
- !=dev-perl/SOAP-Lite-0.711
- !=dev-perl/SOAP-Lite-0.712 )
- "
-
-OTRS_HOME="/var/lib/otrs"
-
-pkg_setup() {
- # The enewuser otrs will fail if apache isn't there, but it's an
optional dep
- # so we create the apache user here just in case
- enewgroup apache 81
- enewuser apache 81 -1 /var/www apache
- enewuser otrs -1 -1 ${OTRS_HOME} apache
- confutils_require_any mysql postgres
-}
-
-src_prepare() {
- rm -fr "${S}/scripts"/{auto_*,redhat*,suse*,*.spec} || die
- cp Kernel/Config.pm{.dist,} || die
-
- # Fix broken png files
- pngfix -q --out=out.png
"${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
- mv -f out.png
"${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
-
- sed -i -e "s:/opt/otrs:${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
- || die "sed failed"
-
- grep -lR "/opt" "${S}"/scripts | \
- xargs sed -i -e "s:/opt/otrs:${OTRS_HOME}:g" \
- || die "sed failed"
-
- cd Kernel/Config/ || die
- for i in *.dist; do
- cp ${i} $(basename ${i} .dist) || die
- done
-
- echo "CONFIG_PROTECT=\"${OTRS_HOME}/Kernel/Config.pm \
- ${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}"
-}
-
-# This is too automagic, either einfo telling user or installing to
/etc/cron.d/ should be preferred
-pkg_config() {
- einfo "Installing cronjobs"
- crontab -u otrs /usr/share/doc/${PF}/crontab
-}
-
-src_install() {
- dodoc CHANGES.md README*
-
- insinto "${OTRS_HOME}"
- doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
- Custom Kernel bin scripts var
-
- cat "${S}"/var/cron/*.dist > crontab
- insinto /usr/share/doc/${PF}/
- doins crontab
-
- for a in article log pics/images pics/stats pics sessions spool tmp
tmp/CacheFileStorable
- do
- keepdir "${OTRS_HOME}/var/${a}"
- done
- doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
- einfo "Setting correct permissions ..."
- /usr/bin/env perl "${OTRS_HOME}"/bin/otrs.SetPermissions.pl
"${OTRS_HOME}" \
- --otrs-user=otrs \
- --web-group=apache \
- || die "Could not set permissions"
-
- einfo "Rebuilding config ..."
- /usr/bin/env perl "${OTRS_HOME}"/bin/otrs.RebuildConfig.pl \
- || die "Could not rebuild config"
-
- einfo "Deleting cache ..."
- /usr/bin/env perl "${OTRS_HOME}"/bin/otrs.DeleteCache.pl \
- || die "Could not delete cache"
-
- einfo "Installation done!"
-
- elog "Enable cronjobs with the following command:"
- elog "crontab -u otrs crontab"
-}
diff --git a/www-apps/otrs/otrs-4.0.13.ebuild b/www-apps/otrs/otrs-4.0.13.ebuild
deleted file mode 100644
index ff592b2..00000000
--- a/www-apps/otrs/otrs-4.0.13.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils confutils user
-
-DESCRIPTION="OTRS is an Open source Ticket Request System"
-HOMEPAGE="http://otrs.org/";
-SRC_URI="http://ftp.otrs.org/pub/${PN}/${P}.tar.bz2";
-
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
-SLOT="0"
-
-DEPEND="media-libs/libpng"
-
-RDEPEND="dev-perl/Apache-Reload
- dev-perl/Archive-Zip
- dev-perl/DBI
- dev-perl/IO-Socket-SSL
- dev-perl/JSON-XS
- dev-perl/LWP-UserAgent-Determined
- dev-perl/Mail-POP3Client
- dev-perl/Mail-IMAPClient
- >dev-perl/Net-DNS-0.60
- dev-perl/Template-Toolkit
- dev-perl/Text-CSV_XS
- dev-perl/TimeDate
- dev-perl/XML-Parser
- dev-perl/YAML-LibYAML
- apache2? ( mod_perl? ( www-servers/apache:2
- =www-apache/libapreq2-2* www-apache/mod_perl )
- !fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) ) )
- fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi )
- !fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
- gd? ( dev-perl/GD
- dev-perl/GDTextUtil
- dev-perl/GDGraph )
- ldap? ( dev-perl/perl-ldap )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- pdf? ( >=dev-perl/PDF-API2-0.73
- virtual/perl-Compress-Raw-Zlib )
- soap? (
- dev-perl/SOAP-Lite
- !=dev-perl/SOAP-Lite-0.711
- !=dev-perl/SOAP-Lite-0.712 )
- "
-
-OTRS_HOME="/var/lib/otrs"
-
-pkg_setup() {
- # The enewuser otrs will fail if apache isn't there, but it's an
optional dep
- # so we create the apache user here just in case
- enewgroup apache 81
- enewuser apache 81 -1 /var/www apache
- enewuser otrs -1 -1 ${OTRS_HOME} apache
- confutils_require_any mysql postgres
-}
-
-src_prepare() {
- rm -fr "${S}/scripts"/{auto_*,redhat*,suse*,*.spec} || die
- cp Kernel/Config.pm{.dist,} || die
-
- # Fix broken png files
- pngfix -q --out=out.png
"${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
- mv -f out.png
"${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
-
- sed -i -e "s:/opt/otrs:${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
- || die "sed failed"
-
- grep -lR "/opt" "${S}"/scripts | \
- xargs sed -i -e "s:/opt/otrs:${OTRS_HOME}:g" \
- || die "sed failed"
-
- cd Kernel/Config/ || die
- for i in *.dist; do
- cp ${i} $(basename ${i} .dist) || die
- done
-
- echo "CONFIG_PROTECT=\"${OTRS_HOME}/Kernel/Config.pm \
- ${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}"
-}
-
-# This is too automagic, either einfo telling user or installing to
/etc/cron.d/ should be preferred
-pkg_config() {
- einfo "Installing cronjobs"
- crontab -u otrs /usr/share/doc/${PF}/crontab
-}
-
-src_install() {
- dodoc CHANGES.md README*
-
- insinto "${OTRS_HOME}"
- doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
- Custom Kernel bin scripts var
-
- cat "${S}"/var/cron/*.dist > crontab
- insinto /usr/share/doc/${PF}/
- doins crontab
-
- for a in article log pics/images pics/stats pics sessions spool tmp
tmp/CacheFileStorable
- do
- keepdir "${OTRS_HOME}/var/${a}"
- done
- doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
- einfo "Setting correct permissions ..."
- /usr/bin/env perl "${OTRS_HOME}"/bin/otrs.SetPermissions.pl
"${OTRS_HOME}" \
- --otrs-user=otrs \
- --web-group=apache \
- || die "Could not set permissions"
-
- einfo "Rebuilding config ..."
- /usr/bin/env perl "${OTRS_HOME}"/bin/otrs.RebuildConfig.pl \
- || die "Could not rebuild config"
-
- einfo "Deleting cache ..."
- /usr/bin/env perl "${OTRS_HOME}"/bin/otrs.DeleteCache.pl \
- || die "Could not delete cache"
-
- einfo "Installation done!"
-
- elog "Enable cronjobs with the following command:"
- elog "crontab -u otrs crontab"
-}
