testing/otrs: fix license fix url

1 files changed, 25 insertions, 27 deletions

diff --git a/testing/otrs/APKBUILD b/testing/otrs/APKBUILD
index fa2132c39b3..7ec4c36a8ad 100644
--- a/testing/otrs/APKBUILD
+++ b/testing/otrs/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=otrs
 pkgver=5.0.23
-pkgrel=0
+pkgrel=1
 pkgdesc="Flexible Open Source Service Management Software"
-url="http://www.otrs.org/"
+url="https://www.otrs.org/"
 arch="noarch"
-license="AGPL-3.0"
+license="AGPL-3.0-or-later"
 pkgusers="otrs"
 pkggroups="www-data"
 depends="perl perl-archive-zip perl-crypt-eksblowfish perl-crypt-ssleay
@@ -14,9 +14,9 @@ depends="perl perl-archive-zip perl-crypt-eksblowfish perl-crypt-ssleay
 	perl-ldap perl-libwww perl-mail-imapclient perl-net-dns perl-template-toolkit
 	perl-text-csv perl-text-csv_xs perl-uri perl-xml-libxml perl-xml-libxslt
 	perl-xml-parser perl-yaml-xs ttf-dejavu"
-makedepends=""
 subpackages="$pkgname-doc $pkgname-dev $pkgname-setup $pkgname-apache2
-	$pkgname-fastcgi $pkgname-nginx $pkgname-bash-completion:bashcomp"
+	$pkgname-fastcgi $pkgname-nginx $pkgname-bash-completion:bashcomp
+	$pkgname-openrc"
 install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade
 	$pkgname-setup.post-install $pkgname-setup.post-deinstall"
 source="http://ftp.otrs.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2
@@ -24,18 +24,16 @@ source="http://ftp.otrs.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2
 	$pkgname.spawn-fcgi
 	$pkgname.nginx.conf
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 # Security fixes:
 #   5.0.23:
 #     - CVE-2017-14635
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	find "$builddir" -type f -exec \
-		sed -i 's:/opt/otrs:/var/lib/otrs:g' {} + \
-		|| return 1
+		sed -i 's:/opt/otrs:/var/lib/otrs:g' {} +
 }
 
 package() {
@@ -45,8 +43,8 @@ package() {
 
 	cd "$pkgdir"
 
-	cp -r "$builddir"/* var/lib/$pkgname || return 1
-	install -Dm755 "$srcdir"/$pkgname.initd etc/init.d/$pkgname || return 1
+	cp -r "$builddir"/* var/lib/$pkgname
+	install -Dm755 "$srcdir"/$pkgname.initd etc/init.d/$pkgname
 
 	# switch to system fonts
 	rm -fr var/lib/$pkgname/var/fonts
@@ -57,7 +55,7 @@ package() {
 	for file in var/lib/$pkgname/var/cron/*.dist \
 		var/lib/$pkgname/Kernel/Config.pod.dist
 	do
-		mv $file ${file%.dist} || return 1
+		mv $file ${file%.dist}
 	done
 }
 
@@ -67,26 +65,26 @@ check() {
 
 doc() {
 	local file;
-	default_doc || return 1
+	default_doc
 
 	mkdir -p "$subpkgdir"/var/lib/$pkgname/scripts
 
 	mv "$pkgdir"/var/lib/$pkgname/doc \
-		"$subpkgdir"/var/lib/$pkgname || return 1
+		"$subpkgdir"/var/lib/$pkgname
 
 	for file in $(find "$pkgdir" -name "*.md" -o -name "*.pod" -o -name "*.txt" \
 		-o -name "ARCHIVE" -o -name "README"  \
 		-o -name "UPGRADING" -o -name "COPYING*")
 	do
 		file=${file#$pkgdir}
-		mkdir -p "$subpkgdir"/${file%/*} || return 1
-		mv "$pkgdir"/$file "$subpkgdir"/$file || return 1
+		mkdir -p "$subpkgdir"/${file%/*}
+		mv "$pkgdir"/$file "$subpkgdir"/$file
 	done
 }
 
 dev() {
 	local file
-	default_dev || return 1
+	default_dev
 
 	mkdir -p "$subpkgdir"/var/lib/$pkgname/scripts \
 		"$subpkgdir"/var/lib/$pkgname/var/httpd/htdocs/js
@@ -96,12 +94,12 @@ dev() {
 		"$pkgdir"/var/lib/$pkgname/scripts/test \
 		"$pkgdir"/var/lib/$pkgname/scripts/contrib \
 		"$pkgdir"/var/lib/$pkgname/scripts/rpc-example.pl \
-		"$subpkgdir"/var/lib/$pkgname/scripts || return 1
+		"$subpkgdir"/var/lib/$pkgname/scripts
 
 	for file in processes webservices; do
 		mkdir -p "$subpkgdir"/var/lib/$pkgname/var/$file
 		mv "$pkgdir"/var/lib/$pkgname/var/$file/examples \
-			"$subpkgdir"/var/lib/$pkgname/var/$file || return 1
+			"$subpkgdir"/var/lib/$pkgname/var/$file
 	done
 
 	mv "$pkgdir"/var/lib/$pkgname/var/httpd/htdocs/js/test \
@@ -119,22 +117,22 @@ setup() {
 
 	mv "$pkgdir"/var/lib/$pkgname/scripts/DBUpdate-* \
 		"$pkgdir"/var/lib/$pkgname/scripts/database \
-		"$subpkgdir"/var/lib/$pkgname/scripts || return 1
+		"$subpkgdir"/var/lib/$pkgname/scripts
 
 	mv "$pkgdir"/var/lib/$pkgname/bin/cgi-bin/installer.pl \
-		"$subpkgdir"/var/lib/$pkgname/bin/cgi-bin/installer.pl || return 1
+		"$subpkgdir"/var/lib/$pkgname/bin/cgi-bin/installer.pl
 
 	mv "$pkgdir"/var/lib/$pkgname/bin/fcgi-bin/installer.pl \
-		"$subpkgdir"/var/lib/$pkgname/bin/fcgi-bin/installer.pl || return 1
+		"$subpkgdir"/var/lib/$pkgname/bin/fcgi-bin/installer.pl
 
 	for file in CheckModules CheckSum; do
 		mv "$pkgdir"/var/lib/$pkgname/bin/$pkgname.$file.pl \
-			"$subpkgdir"/var/lib/$pkgname/bin/$pkgname.$file.pl || return 1
+			"$subpkgdir"/var/lib/$pkgname/bin/$pkgname.$file.pl
 	done
 
 	for file in fetchmailrc mailfilter procmailrc; do
 		install -Dm644 "$builddir"/.$file.dist \
-			"$subpkgdir"/var/lib/$pkgname/.$file.dist || return 1
+			"$subpkgdir"/var/lib/$pkgname/.$file.dist
 	done
 
 	mv "$pkgdir"/var/lib/$pkgname/scripts/apache2-httpd-plack-proxy.conf \
@@ -149,7 +147,7 @@ apache2() {
 		"$subpkgdir"/var/lib/$pkgname/scripts
 
 	mv "$pkgdir"/var/lib/$pkgname/scripts/apache2-httpd.include.conf \
-		"$subpkgdir"/etc/apache2/conf.d/$pkgname.conf || return 1
+		"$subpkgdir"/etc/apache2/conf.d/$pkgname.conf
 
 	mv "$pkgdir"/var/lib/$pkgname/scripts/apache2-perl-startup.pl \
 		"$subpkgdir"/var/lib/$pkgname/scripts
@@ -160,7 +158,7 @@ fastcgi() {
 	depends="$pkgname fcgiwrap perl-cgi-fast spawn-fcgi"
 
 	install -Dm644 "$srcdir"/$pkgname.spawn-fcgi \
-		"$subpkgdir"/etc/conf.d/spawn-fcgi.$pkgname || return 1
+		"$subpkgdir"/etc/conf.d/spawn-fcgi.$pkgname
 
 	mkdir -p "$subpkgdir"/etc/init.d
 	ln -s spawn-fcgi "$subpkgdir"/etc/init.d/spawn-fcgi.$pkgname
@@ -171,7 +169,7 @@ nginx() {
 	depends="$pkgname $pkgname-fastcgi nginx"
 
 	install -Dm644 "$srcdir"/$pkgname.nginx.conf \
-		"$subpkgdir"/etc/nginx/$pkgname.conf || return 1
+		"$subpkgdir"/etc/nginx/$pkgname.conf
 }
 
 bashcomp() {