aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2019-04-30 09:58:08 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2019-04-30 09:58:13 +0000
commit7e7c54453a0214907e194f5b4137c223e2e303a6 (patch)
tree22135fff6e024ee5b3c0387c9a16722e9fc32aee
parent1471228ba30e71f89345dfeb2691321c7816a11b (diff)
downloadaports-7e7c54453a0214907e194f5b4137c223e2e303a6.tar.bz2
aports-7e7c54453a0214907e194f5b4137c223e2e303a6.tar.xz
community/x2goserver: upgrade to 4.1.0.3
-rw-r--r--community/x2goserver/APKBUILD28
-rw-r--r--community/x2goserver/xsession-alpine-support.patch8
2 files changed, 18 insertions, 18 deletions
diff --git a/community/x2goserver/APKBUILD b/community/x2goserver/APKBUILD
index 649adc62be..495d5d6acd 100644
--- a/community/x2goserver/APKBUILD
+++ b/community/x2goserver/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Jean-Charles de Longueville <jch@hellea.eu>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=x2goserver
-pkgver=4.0.1.20
-pkgrel=1
+pkgver=4.1.0.3
+pkgrel=0
pkgdesc=" X2Go enables you to access a graphical desktop of a computer over a low bandwidth (or high bandwidth) connection."
url="http://x2go.org"
arch="all"
@@ -14,7 +14,7 @@ depends="perl perl-config-simple perl-dbi perl-file-readbackwards
openssh lsof xauth perl-file-basedir mcookie nx-libs perl-file-which"
makedepends="libssh2-dev python2-dev man"
install="$pkgname.pre-install $pkgname.post-install"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
source="http://code.x2go.org/releases/source/$pkgname/$pkgname-$pkgver.tar.gz
$pkgname.initd
xsession-alpine-support.patch"
@@ -23,13 +23,8 @@ pkggroups="x2gouser"
builddir="$srcdir"/$pkgname-$pkgver
-check() {
- cd "$builddir"
- # check or test is not implemented in make
- return 0
-}
-
prepare() {
+ default_prepare
local dir
cd "$builddir"
for dir in x2goserver*; do
@@ -37,20 +32,25 @@ prepare() {
sed -i -e "s/^build-indep:.*/build-indep: /g" $dir/Makefile
fi
done
- default_prepare
}
build() {
cd "$builddir"
- make PREFIX=/usr || return 1
+ make PREFIX=/usr
+}
+
+check() {
+ cd "$builddir"
+ # check or test is not implemented in make
+ return 0
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir" PREFIX=/usr install || return 1
+ make DESTDIR="$pkgdir" PREFIX=/usr install
install -Dm 755 "$srcdir/${pkgname}.initd" "$pkgdir/etc/init.d/$pkgname"
}
-sha512sums="21f3a415c50bf78e4c044c5b77f8478a307e4b3cef990edd415d9e7479f48fbc1c051e9f7c16a5d1f30726f4f2a812fb367eecb0a073bfba1ea2c6173c71fe54 x2goserver-4.0.1.20.tar.gz
+sha512sums="9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a x2goserver-4.1.0.3.tar.gz
1784894c3f04abbb626bf8178dc6c8383a0d2883eb168cb805e707581d547584ac8eb767155153ee7d50d2192b757fa8c71e40fa9393c8df39e3cda94e05b7b4 x2goserver.initd
-1c73bdf9e1b040cb74c762427380f1758cd6c3a7e869e1331cf33acf14a5dcc2d223d594e1aa7d98545afaee44aa7353c3a1a9a95683a6b8d450602eec58cc0f xsession-alpine-support.patch"
+5235028e1e2e164a9c94e5bc925661108614bdafa7c430892f1797267112eeb83984ca340211629a10ac4817b0462ce89a3b2d48b8dfc068b5cd7b4d60ddd618 xsession-alpine-support.patch"
diff --git a/community/x2goserver/xsession-alpine-support.patch b/community/x2goserver/xsession-alpine-support.patch
index 09ddfdd2d8..8b58fecad2 100644
--- a/community/x2goserver/xsession-alpine-support.patch
+++ b/community/x2goserver/xsession-alpine-support.patch
@@ -1,13 +1,13 @@
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
-index 52a61bf..34ada90 100755
+index ebee0c5..a63cdd0 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
-@@ -145,7 +145,7 @@ if [ -f /etc/debian_version ]; then
+@@ -145,7 +145,7 @@ if [ -f /etc/debian_version ] || [ -f /etc/devuan_version ]; then
done
set -e
fi
--elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
-+elif [ -f /etc/alpine-release ] || [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
+-elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-rt-release ]; then
++elif [ -f /etc/alpine-release ] || [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-rt-release ]; then
# define a fallback... (should never be needed). The XSESSION_EXEC var gets set in
# X2Go's x2goruncommand script and can be used with obsolete switchdesk or with