diff options
| -rw-r--r-- | main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch | 6 | ||||
| -rw-r--r-- | main/rt4/APKBUILD | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch b/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch index a7bbf33d9b..6168df1bcb 100644 --- a/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch +++ b/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch @@ -26,9 +26,9 @@ index 620ca60..8bd94eb 100644 unless ( $args{'Entity'}->head->get('To') || $args{'Entity'}->head->get('Cc') @@ -408,16 +411,16 @@ sub SendEmail { - - # SetOutgoingMailFrom - if ( RT->Config->Get('SetOutgoingMailFrom') ) { + if ( $args{'Bounce'} ) { + $args .= ' '. RT->Config->Get('SendmailBounceArguments'); + } elsif ( RT->Config->Get('SetOutgoingMailFrom') ) { - my $OutgoingMailAddress; + my $OutgoingMailAddress = $envelope_from; diff --git a/main/rt4/APKBUILD b/main/rt4/APKBUILD index 254b240fb2..d2e3343f4d 100644 --- a/main/rt4/APKBUILD +++ b/main/rt4/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rt4 -pkgver=4.0.4 +pkgver=4.0.5 pkgrel=0 pkgdesc="Request Tracker - issue and bug tracker" pkgusers="rt4" @@ -67,6 +67,7 @@ depends="perl perl-json perl-ipc-run3 perl-plack + ttf-droid " makedepends="$depends" @@ -85,6 +86,9 @@ prepare() { esac done + sed -i -e 's_$RT::BasePath/share/fonts/_/usr/share/fonts/TTF/_g' \ + "$_builddir"/etc/RT_Config.pm* + cat <<'EOF' >> config.layout # Alpione directory layout. <Layout Alpine> @@ -121,6 +125,7 @@ build() { --with-rt-group=rt4 \ --with-web-group=rt4 \ --with-web-user=rt4 \ + --disable-gpg \ || return 1 make || return 1 } @@ -128,7 +133,10 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 + # delete the droid fonts as we get them from ttf-droid + rm -rf "$pkgdir"/usr/share/rt4/fonts/ + } -md5sums="7bbfe24c3e3b6fb64c62a43769780093 rt-4.0.4.tar.gz -ed9ba8bd09e68f4af1095aeedbe7a18b 0001-email-allow-envelope-from-overriding-from-templates.patch" +md5sums="0dc4defc313c4c992ae1b3d630f5cd99 rt-4.0.5.tar.gz +8efa0bcee373ee111ac08c53bac8354d 0001-email-allow-envelope-from-overriding-from-templates.patch" |