commit: 480ea096393f2fe727ba247d555ea85911baadc3 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sat Apr 2 11:38:16 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Fri May 13 22:49:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480ea096
www-apps/rt: migrate to glep-81 Closes: https://bugs.gentoo.org/781527 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/24865 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../rt/{rt-4.4.4-r1.ebuild => rt-4.4.4-r2.ebuild} | 54 +++------------------- 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/www-apps/rt/rt-4.4.4-r1.ebuild b/www-apps/rt/rt-4.4.4-r2.ebuild similarity index 83% rename from www-apps/rt/rt-4.4.4-r1.ebuild rename to www-apps/rt/rt-4.4.4-r2.ebuild index 8f0b49e9cc7a..efcf278b94c6 100644 --- a/www-apps/rt/rt-4.4.4-r1.ebuild +++ b/www-apps/rt/rt-4.4.4-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit webapp depend.apache user +inherit webapp depend.apache DESCRIPTION="RT is an enterprise-grade ticketing system" HOMEPAGE="https://www.bestpractical.com/rt/"; @@ -17,8 +17,9 @@ REQUIRED_USE="^^ ( mysql postgres )" RESTRICT="test" DEPEND=" + acct-group/rt + acct-user/rt >=dev-lang/perl-5.10.1 - >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 @@ -141,46 +142,6 @@ RDEPEND="${DEPEND} need_httpd_cgi -add_user_rt() { - # add new user - # suexec2 requires uid >= 1000; enewuser is of no help here - # From: Mike Frysinger <[email protected]> - # Date: Fri, 17 Jun 2005 08:41:44 -0400 - # i'd pick a 5 digit # if i were you - - local euser="rt" - - # first check if username rt exists - if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then - # check uid - rt_uid=$(egetent passwd "${euser}" | cut -d: -f3) - if $(expr ${rt_uid} '<' 1000 > /dev/null); then - ewarn "uid of user rt is less than 1000. suexec2 will not work." - ewarn "If you want to use FastCGI, please delete the user 'rt'" - ewarn "from your system and re-emerge www-apps/rt" - fi - return 0 # all is well - fi - - # add user - # stolen from enewuser - local pwrange euid - - pwrange=$(seq 10001 11001) - for euid in ${pwrange} ; do - [[ -z $(egetent passwd ${euid}) ]] && break - done - if [[ ${euid} == "11001" ]]; then - # she gets around, doesn't she? - die "No available uid's found" - fi - - elog " - Userid: ${euid}" - - enewuser rt ${euid} -1 /dev/null rt - return 0 -} - pkg_setup() { webapp_pkg_setup @@ -189,16 +150,13 @@ pkg_setup() { ewarn "make sure to read the related upgrade documentation in" ewarn "${ROOT}usr/share/doc/${PF}." ewarn - - enewgroup rt - add_user_rt || die "Could not add user" } src_prepare() { # add Gentoo-specific layout cat "${FILESDIR}"/config.layout-gentoo >> config.layout - sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \ - -e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \ + sed -e "s|PREFIX|${EPREFIX}/${MY_HOSTROOTDIR}/${PF}|g" \ + -e "s|HTMLDIR|${EPREFIX}/${MY_HTDOCSDIR}|g" \ -e 's|/\+|/|g' \ -i ./config.layout || die 'config sed failed'
