diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2017-06-01 07:41:24 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2017-06-01 07:41:29 +0000 |
| commit | 1e093e12276c08a65f51946bf9154fbcf19e24f1 (patch) | |
| tree | 8d634bf9becea2cdd68b7cc64fb2059b87da02e6 | |
| parent | 61d40c06ca85a3b38304acd29d119caa0e333000 (diff) | |
| download | aports-1e093e12276c08a65f51946bf9154fbcf19e24f1.tar.bz2 aports-1e093e12276c08a65f51946bf9154fbcf19e24f1.tar.xz | |
testing/x2goserver: added initd and xsession support for alpine
| -rw-r--r-- | testing/x2goserver/APKBUILD | 21 | ||||
| -rw-r--r-- | testing/x2goserver/x2goserver.initd | 23 | ||||
| -rw-r--r-- | testing/x2goserver/xsession-alpine-support.patch | 13 |
3 files changed, 52 insertions, 5 deletions
diff --git a/testing/x2goserver/APKBUILD b/testing/x2goserver/APKBUILD index ce14c7399f..8d3e0822a0 100644 --- a/testing/x2goserver/APKBUILD +++ b/testing/x2goserver/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=x2goserver pkgver=4.0.1.20 -pkgrel=0 +pkgrel=1 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" @@ -13,11 +13,20 @@ depends="perl perl-config-simple perl-dbi perl-file-readbackwards perl-capture-t makedepends="libssh2-dev python2-dev man" install="$pkgname.pre-install $pkgname.post-install" subpackages="$pkgname-doc" -source="http://code.x2go.org/releases/source/$pkgname/$pkgname-$pkgver.tar.gz" +source="http://code.x2go.org/releases/source/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname.initd + xsession-alpine-support.patch" pkgusers="x2gouser" pkggroups="x2gouser" builddir="$srcdir"/$pkgname-$pkgver + +check() { + cd "$builddir" + # check or test is not implemented in make + return 0 +} + prepare() { local dir cd "$builddir" @@ -26,6 +35,7 @@ prepare() { sed -i -e "s/^build-indep:.*/build-indep: /g" $dir/Makefile fi done + default_prepare } build() { @@ -36,8 +46,9 @@ build() { package() { cd "$builddir" make DESTDIR="$pkgdir" PREFIX=/usr install || return 1 + install -Dm 755 "$srcdir/${pkgname}.initd" "$pkgdir/etc/init.d/$pkgname" } -md5sums="54f165ab50ccf329465d95ae108f6f64 x2goserver-4.0.1.20.tar.gz" -sha256sums="f8bf48e1c8995bd5a7cde6de1c006fdb77f2bae6c4b82e6b7b985a8f00a3dad9 x2goserver-4.0.1.20.tar.gz" -sha512sums="21f3a415c50bf78e4c044c5b77f8478a307e4b3cef990edd415d9e7479f48fbc1c051e9f7c16a5d1f30726f4f2a812fb367eecb0a073bfba1ea2c6173c71fe54 x2goserver-4.0.1.20.tar.gz" +sha512sums="21f3a415c50bf78e4c044c5b77f8478a307e4b3cef990edd415d9e7479f48fbc1c051e9f7c16a5d1f30726f4f2a812fb367eecb0a073bfba1ea2c6173c71fe54 x2goserver-4.0.1.20.tar.gz +1784894c3f04abbb626bf8178dc6c8383a0d2883eb168cb805e707581d547584ac8eb767155153ee7d50d2192b757fa8c71e40fa9393c8df39e3cda94e05b7b4 x2goserver.initd +1c73bdf9e1b040cb74c762427380f1758cd6c3a7e869e1331cf33acf14a5dcc2d223d594e1aa7d98545afaee44aa7353c3a1a9a95683a6b8d450602eec58cc0f xsession-alpine-support.patch" diff --git a/testing/x2goserver/x2goserver.initd b/testing/x2goserver/x2goserver.initd new file mode 100644 index 0000000000..2ae724797e --- /dev/null +++ b/testing/x2goserver/x2goserver.initd @@ -0,0 +1,23 @@ +#!/sbin/openrc-run + +DAEMON=/usr/sbin/x2gocleansessions +PIDFILE=/var/run/x2goserver.pid + +depend() { + need net + need localmount + after firewall +} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} -- $DAEMON-OPTS + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile ${PIDFILE} + eend $? +} + diff --git a/testing/x2goserver/xsession-alpine-support.patch b/testing/x2goserver/xsession-alpine-support.patch new file mode 100644 index 0000000000..09ddfdd2d8 --- /dev/null +++ b/testing/x2goserver/xsession-alpine-support.patch @@ -0,0 +1,13 @@ +diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession +index 52a61bf..34ada90 100755 +--- a/x2goserver-xsession/etc/Xsession ++++ b/x2goserver-xsession/etc/Xsession +@@ -145,7 +145,7 @@ if [ -f /etc/debian_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 + + # 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 |