From: "Ian Delaney" <idella4@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/otrs/
Date: Thu, 1 Oct 2015 04:58:27 +0000 (UTC) [thread overview]
Message-ID: <1443675477.9c434c48e1aa309c6dcfa504592bff7f6a706a2a.idella4@gentoo> (raw)
commit: 9c434c48e1aa309c6dcfa504592bff7f6a706a2a
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 1 04:55:13 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 1 04:57:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c434c48
www-apps/otrs: Designate new maintainer in metadata, bump to -4.0.12
New maintainer added & supported under the proxy-maintainers herd, testing
and revision carried out thanks also to wraeth, fix to broken .png file
applied according to past bug #466190 supplied by Blackb|rd, all patches and
revisons of ebuilds supplied via bug cited below, releases after -3.2.12
skipped, holding off from beta versions of version 5.x for now, removed old
versions prior to -3.2.12. Finally closes the gentoo bug.
Gentoo-Bug: 506052
Package-Manager: portage-2.2.20.1
www-apps/otrs/Manifest | 3 +-
www-apps/otrs/metadata.xml | 8 +-
www-apps/otrs/otrs-3.2.9.ebuild | 156 ---------------------
.../{otrs-3.2.10.ebuild => otrs-4.0.12.ebuild} | 137 ++++++++----------
4 files changed, 64 insertions(+), 240 deletions(-)
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index d4c2607..43c63ca 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,3 +1,2 @@
-DIST otrs-3.2.10.tar.bz2 18773715 SHA256 3c993cbc8fead7d0f3efb2a24a9496c81ba3671d3fd806f30f240fcb0e7ccc21 SHA512 93206cab29683784f58cb2c5f3f4b8824de67ffc9d8f7cabffdabfb79a4c25721306ee8c2b6cb6f46eb79c8b28451b31dd8e6aa748235b6c4f94874bebd8a99d WHIRLPOOL 66ba2f9edea9c80011972f1ae6a8ec904800b24372b164f82f36a50b4bb73326bc3d339aff6bd8a2728f5815c09465a00110ab96e38a38f0acf98df885293cf6
DIST otrs-3.2.12.tar.bz2 18866640 SHA256 f69e4ffc10dc4ecf733a20ed79e1c65e03bbe01e7adb937af8f6ceb47a5b0709 SHA512 f3caceb239d11803b595ab654558d5f25e49b9444ce988d9350064c7a2a1a655fd271cbd1ddb8041e9fb8d11f3297301ba8621cc5f5e56866a7ac5320ff123af WHIRLPOOL a13db5c8720e9a43d6d1d72528459c7f517e2d528425c91e7890fcfeacd2a38f4c35ed2919395b714f4398e24295b51e65bb8b8561761b74131425673d122e13
-DIST otrs-3.2.9.tar.bz2 18747419 SHA256 a94edec491d68382d321f8b0464ccaaca1c383b4024799e251226ec524aedf69 SHA512 7c1f6efc5887a92dc1acf864c1f8efbcac50ec2790defbd038fb6b24c6721abae5c7a071b514a3960865304aa767027a9f47fe61bf40cf2e05f5af24a53b5f14 WHIRLPOOL 7fc6096c5f1a6eea1cfafee8cc2b67a344845285ddf3c0c36ad0a70cdc4d7be26d849c9f2308ceae1c74bce0a65d85d57b0a169a9d00b861260673d83a06813c
+DIST otrs-4.0.12.tar.bz2 14373765 SHA256 ea0a7b2019c46108f78d2329aa40ec5024405f08b586b6b33a6fca6a31ca9880 SHA512 17177b42c3768d271388fbe7abef033553fa524ba819a903b3f151b560de31183c5a1d975f8eb75f755b8bbf99331808309002f38cf3f469b22eadc8fefaa911 WHIRLPOOL 07b3d81c36e10f89ba1498c8d80845f53fc44feab25903addb8c3e6fa567633ec9938115859b5b81bc74efaa7c65286a1f501d6472737e00c47cfa48b77b2ac4
diff --git a/www-apps/otrs/metadata.xml b/www-apps/otrs/metadata.xml
index 0b797c9..9e582f6 100644
--- a/www-apps/otrs/metadata.xml
+++ b/www-apps/otrs/metadata.xml
@@ -2,8 +2,14 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>web-apps</herd>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>lists@xunil.at</email>
+ <name>Stefan Weichinger</name>
+ <description>Proxy maintainer</description>
+ </maintainer>
<use>
<flag name="mod_perl">Provide all dependencies for use of mod_perl instead of cgi</flag>
</use>
</pkgmetadata>
-
+
diff --git a/www-apps/otrs/otrs-3.2.9.ebuild b/www-apps/otrs/otrs-3.2.9.ebuild
deleted file mode 100644
index 6ba2fd1..0000000
--- a/www-apps/otrs/otrs-3.2.9.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-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"
-#WEBAPP_MANUAL_SLOT="yes"
-
-# FIXME add oracle/mssql/DB2 DB support
-# FIXME #cjk? ( >=dev-perl/Encode-HanExtra-0.23 ) unsatisfied dep
-
-DEPEND=""
-RDEPEND="${DEPEND}
- dev-perl/Authen-SASL
- dev-perl/Crypt-PasswdMD5
- dev-perl/CSS-Minifier
- dev-perl/Date-Pcalc
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- dev-perl/DBI
- gd? ( dev-perl/GD
- dev-perl/GDTextUtil
- dev-perl/GDGraph )
- dev-perl/IO-Socket-SSL
- >=dev-perl/JavaScript-Minifier-1.05
- >=dev-perl/JSON-2.21
- dev-perl/JSON-XS
- dev-perl/LWP-UserAgent-Determined
- dev-perl/Mail-POP3Client
- dev-perl/MailTools
- >=dev-perl/MIME-tools-5.427
- dev-perl/NetxAP
- dev-perl/Net-IMAP-Simple-SSL
- >dev-perl/Net-DNS-0.60
- dev-perl/Net-SMTP-SSL
- dev-perl/Net-SMTP-TLS
- dev-perl/IO-stringy
- pdf? ( >=dev-perl/PDF-API2-0.73
- virtual/perl-Compress-Raw-Zlib )
- ldap? ( dev-perl/perl-ldap )
- soap? (
- dev-perl/SOAP-Lite
- !=dev-perl/SOAP-Lite-0.711
- !=dev-perl/SOAP-Lite-0.712 )
- dev-perl/Text-CSV
- dev-perl/Text-CSV_XS
- dev-perl/TimeDate
- dev-perl/XML-Parser
-
- virtual/perl-MIME-Base64
- >=dev-perl/CGI-3.33
- virtual/perl-libnet
- virtual/perl-Digest-MD5
- >=virtual/perl-Digest-SHA-5.48
-
- virtual/mta
-
- apache2? ( mod_perl? ( www-servers/apache:2
- =www-apache/libapreq2-2* www-apache/mod_perl )
- fastcgi? ( || ( www-apache/mod_fcgid www-apache/mod_fastcgi )
- www-servers/apache:2[suexec] )
- !fastcgi? (
- !mod_perl? ( www-servers/apache:2[suexec] ) )
- )
- fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi )
- !fastcgi? (
- !apache2? ( virtual/httpd-cgi ) )"
-
-# dev-perl/libwww-perl
-
-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
- # procmail/fetchmail/mailfilter
-# local mailrc=".fetchmailrc .mailfilter .procmailrc"
-# for i in ${mailrc}; do
-# mv ${i}{.dist,} || die
-# done
-# fperms 600 ${mailrc} || die
-# fowners otrs ${mailrc} || 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
-
- perl "${S}"/bin/otrs.SetPermissions.pl \
- --otrs-user=otrs \
- --web-user=apache \
- --otrs-group=apache \
- --web-group=apache "${S}" \
- || die "Could not set permissions"
-
- echo "CONFIG_PROTECT=\"${OTRS_HOME}/Kernel/Config.pm \
- ${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}"
-
-}
-
-src_install() {
- dodoc CHANGES.md README* \
- doc/X-OTRS-Headers.txt || die
-
- dodoc doc/manual/en/otrs_admin_book.pdf
-
- insinto "${OTRS_HOME}"
- doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
- Custom Kernel bin scripts var || die "doins failed"
-
- 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}" || die
-}
-
-# 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
-}
-
-pkg_postinst() {
- elog "Enable cronjobs with the following command:"
- elog "crontab -u otrs crontab"
-}
diff --git a/www-apps/otrs/otrs-3.2.10.ebuild b/www-apps/otrs/otrs-4.0.12.ebuild
similarity index 57%
rename from www-apps/otrs/otrs-3.2.10.ebuild
rename to www-apps/otrs/otrs-4.0.12.ebuild
index 6ba2fd1..ff592b2 100644
--- a/www-apps/otrs/otrs-3.2.10.ebuild
+++ b/www-apps/otrs/otrs-4.0.12.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=2
+EAPI=5
inherit eutils confutils user
@@ -14,69 +14,41 @@ LICENSE="AGPL-3"
KEYWORDS="~amd64 ~x86"
IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
SLOT="0"
-#WEBAPP_MANUAL_SLOT="yes"
-# FIXME add oracle/mssql/DB2 DB support
-# FIXME #cjk? ( >=dev-perl/Encode-HanExtra-0.23 ) unsatisfied dep
-
-DEPEND=""
-RDEPEND="${DEPEND}
- dev-perl/Authen-SASL
- dev-perl/Crypt-PasswdMD5
- dev-perl/CSS-Minifier
- dev-perl/Date-Pcalc
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- dev-perl/DBI
+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 )
- dev-perl/IO-Socket-SSL
- >=dev-perl/JavaScript-Minifier-1.05
- >=dev-perl/JSON-2.21
- dev-perl/JSON-XS
- dev-perl/LWP-UserAgent-Determined
- dev-perl/Mail-POP3Client
- dev-perl/MailTools
- >=dev-perl/MIME-tools-5.427
- dev-perl/NetxAP
- dev-perl/Net-IMAP-Simple-SSL
- >dev-perl/Net-DNS-0.60
- dev-perl/Net-SMTP-SSL
- dev-perl/Net-SMTP-TLS
- dev-perl/IO-stringy
+ 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 )
- ldap? ( dev-perl/perl-ldap )
soap? (
dev-perl/SOAP-Lite
!=dev-perl/SOAP-Lite-0.711
!=dev-perl/SOAP-Lite-0.712 )
- dev-perl/Text-CSV
- dev-perl/Text-CSV_XS
- dev-perl/TimeDate
- dev-perl/XML-Parser
-
- virtual/perl-MIME-Base64
- >=dev-perl/CGI-3.33
- virtual/perl-libnet
- virtual/perl-Digest-MD5
- >=virtual/perl-Digest-SHA-5.48
-
- virtual/mta
-
- apache2? ( mod_perl? ( www-servers/apache:2
- =www-apache/libapreq2-2* www-apache/mod_perl )
- fastcgi? ( || ( www-apache/mod_fcgid www-apache/mod_fastcgi )
- www-servers/apache:2[suexec] )
- !fastcgi? (
- !mod_perl? ( www-servers/apache:2[suexec] ) )
- )
- fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi )
- !fastcgi? (
- !apache2? ( virtual/httpd-cgi ) )"
-
-# dev-perl/libwww-perl
+ "
OTRS_HOME="/var/lib/otrs"
@@ -92,13 +64,10 @@ pkg_setup() {
src_prepare() {
rm -fr "${S}/scripts"/{auto_*,redhat*,suse*,*.spec} || die
cp Kernel/Config.pm{.dist,} || die
- # procmail/fetchmail/mailfilter
-# local mailrc=".fetchmailrc .mailfilter .procmailrc"
-# for i in ${mailrc}; do
-# mv ${i}{.dist,} || die
-# done
-# fperms 600 ${mailrc} || die
-# fowners otrs ${mailrc} || 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"
@@ -112,45 +81,51 @@ src_prepare() {
cp ${i} $(basename ${i} .dist) || die
done
- perl "${S}"/bin/otrs.SetPermissions.pl \
- --otrs-user=otrs \
- --web-user=apache \
- --otrs-group=apache \
- --web-group=apache "${S}" \
- || die "Could not set permissions"
-
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* \
- doc/X-OTRS-Headers.txt || die
-
- dodoc doc/manual/en/otrs_admin_book.pdf
+ dodoc CHANGES.md README*
insinto "${OTRS_HOME}"
doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
- Custom Kernel bin scripts var || die "doins failed"
+ 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
+ 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}" || die
-}
-
-# 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
+ 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"
}
next reply other threads:[~2015-10-01 4:58 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-01 4:58 Ian Delaney [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-02-08 16:53 [gentoo-commits] repo/gentoo:master commit in: www-apps/otrs/ David Seifert
2018-10-29 14:22 Miroslav Šulc
2018-10-29 14:22 Miroslav Šulc
2018-05-16 15:52 Andreas Sturmlechner
2018-05-08 20:13 Mikle Kolyada
2018-05-08 20:00 Mikle Kolyada
2018-02-15 14:27 Patrice Clement
2018-02-11 11:36 Michał Górny
2018-01-02 19:12 Thomas Deutschmann
2017-12-06 12:54 Michael Palimaka
2017-11-26 23:26 David Seifert
2017-10-07 19:49 Patrice Clement
2017-10-02 22:32 Patrice Clement
2017-08-02 9:07 Patrice Clement
2017-06-06 11:53 Thomas Deutschmann
2017-06-06 11:53 Thomas Deutschmann
2017-05-31 16:46 Patrice Clement
2017-04-09 23:10 Göktürk Yüksek
2017-03-12 9:15 Michał Górny
2017-03-12 9:15 Michał Górny
2017-03-12 9:05 Michał Górny
2017-01-25 23:29 Patrice Clement
2017-01-25 23:29 Patrice Clement
2015-10-05 8:13 Ian Delaney
2015-10-05 8:06 Ian Delaney
2015-08-14 1:11 Chris Reffett
2015-08-14 1:07 Chris Reffett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443675477.9c434c48e1aa309c6dcfa504592bff7f6a706a2a.idella4@gentoo \
--to=idella4@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox