diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 32 | ||||
| -rw-r--r-- | arch-config.diff | 95 |
3 files changed, 67 insertions, 68 deletions
@@ -1,6 +1,6 @@ pkgbase = xrdp-devel-git pkgdesc = An open source remote desktop protocol (RDP) server - GIT version - pkgver = 0.8.0.r411.g9fb02e3 + pkgver = 0.9.1.r16.gedd8d5e6 pkgrel = 1 url = https://github.com/neutrinolabs/xrdp install = xrdp-devel-git.install @@ -8,18 +8,20 @@ pkgbase = xrdp-devel-git arch = x86_64 arch = armv6h license = Apache + makedepends = git depends = tigervnc depends = libxrandr + depends = lame depends = opus depends = fuse - provides = xrdp + provides = xrdp=0.9.1 conflicts = xrdp backup = etc/xrdp/sesman.ini backup = etc/xrdp/xrdp.ini source = xrdp-devel-git::git+https://github.com/neutrinolabs/xrdp.git#branch=devel source = arch-config.diff md5sums = SKIP - md5sums = 964d82ca1689435e1e9ae98120e6fb68 + md5sums = cca1a944ca04e33987b60eb7278d4d8f pkgname = xrdp-devel-git @@ -1,38 +1,31 @@ # Maintainer: Brian Bidulock <bidulock@openss7.org> # Contributor: Tau Tsao <realturner at gmail.com> pkgname=xrdp-devel-git -pkgver=0.8.0.r411.g9fb02e3 +pkgver=0.9.1.r16.gedd8d5e6 pkgrel=1 pkgdesc="An open source remote desktop protocol (RDP) server - GIT version" url="https://github.com/neutrinolabs/xrdp" arch=('i686' 'x86_64' 'armv6h') license=('Apache') -depends=('tigervnc' 'libxrandr' 'opus' 'fuse') +makedepends=('git') +depends=('tigervnc' 'libxrandr' 'lame' 'opus' 'fuse') conflicts=('xrdp') -provides=('xrdp') +provides=('xrdp=0.9.1') backup=('etc/xrdp/sesman.ini' 'etc/xrdp/xrdp.ini') -install=xrdp-devel-git.install +install="${pkgname}.install" source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git#branch=devel" "arch-config.diff") md5sums=('SKIP' - '964d82ca1689435e1e9ae98120e6fb68') + 'cca1a944ca04e33987b60eb7278d4d8f') pkgver() { cd $pkgname - printf "0.8.0.r%s.g%s" "$(git rev-list --count v0.8.0..HEAD)" "$(git rev-parse --short HEAD)" + printf "0.9.1.r%s.g%s" "$(git rev-list --count v0.9.1..HEAD)" "$(git rev-parse --short HEAD)" } prepare() { cd $pkgname - - sed -i 's|/etc/sysconfig/xrdp|/etc/xrdp/xrdp.ini|' instfiles/xrdp.service - sed -i 's|/etc/sysconfig/xrdp|/etc/xrdp/xrdp.ini|' instfiles/xrdp-sesman.service - - sed -i 's|/usr/local/sbin|/usr/bin|' instfiles/xrdp.sh - sed -i 's|/usr/sbin|/usr/bin|' instfiles/xrdp.service - sed -i 's|/usr/sbin|/usr/bin|' instfiles/xrdp-sesman.service - patch -p1 < ../arch-config.diff - + patch -Np2 -b -z .orig < ../arch-config.diff ./bootstrap } @@ -42,15 +35,20 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --sbindir=/usr/bin \ + --with-systemdsystemdunitdir=/usr/lib/systemd/system \ --enable-jpeg \ + --enable-tjpeg \ --enable-fuse \ - --enable-opus + --enable-opus \ + --enable-rfxcodec \ + --enable-mp3lame \ + --enable-pixman make V=0 } package() { cd $pkgname make DESTDIR="$pkgdir" install - + rm -f "$pkgdir"/etc/xrdp/rsakeys.ini install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } diff --git a/arch-config.diff b/arch-config.diff index d8957f065504..d55120226eb9 100644 --- a/arch-config.diff +++ b/arch-config.diff @@ -1,23 +1,50 @@ -diff -upr xrdp-git/instfiles/pam.d/xrdp-sesman xrdp-git-new/instfiles/pam.d/xrdp-sesman ---- xrdp-git/instfiles/pam.d/xrdp-sesman 2015-04-24 16:38:02.096121088 -0700 -+++ xrdp-git-new/instfiles/pam.d/xrdp-sesman 2015-04-24 16:44:57.272805802 -0700 -@@ -1,5 +1,9 @@ - #%PAM-1.0 --@include common-auth --@include common-account --@include common-session --@include common-password -+#@include common-auth -+#@include common-account -+#@include common-session -+#@include common-password -+auth include system-auth -+account include system-auth -+password include system-auth -+session include system-auth -diff -upr xrdp-git/sesman/startwm.sh xrdp-git-new/sesman/startwm.sh ---- xrdp-git/sesman/startwm.sh 2015-04-24 16:38:02.116121089 -0700 -+++ xrdp-git-new/sesman/startwm.sh 2015-04-24 16:43:36.872802307 -0700 +diff -up src/xrdp-devel-git/instfiles/xrdp.service.orig src/xrdp-devel-git/instfiles/xrdp.service +--- src/xrdp-devel-git/instfiles/xrdp.service.orig 2017-01-04 17:08:45.000000000 -0700 ++++ src/xrdp-devel-git/instfiles/xrdp.service 2017-01-04 17:08:48.000000000 -0700 +@@ -6,10 +6,8 @@ After=syslog.target network.target xrdp- + [Service] + Type=forking + PIDFile=/var/run/xrdp.pid +-EnvironmentFile=-/etc/sysconfig/xrdp +-EnvironmentFile=-/etc/default/xrdp +-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS +-ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill ++ExecStart=/usr/bin/xrdp ++ExecStop=/usr/bin/xrdp --kill + + [Install] + WantedBy=multi-user.target +diff -up src/xrdp-devel-git/instfiles/xrdp-sesman.service.orig src/xrdp-devel-git/instfiles/xrdp-sesman.service +--- src/xrdp-devel-git/instfiles/xrdp-sesman.service.orig 2017-01-04 17:08:45.000000000 -0700 ++++ src/xrdp-devel-git/instfiles/xrdp-sesman.service 2017-01-04 17:08:48.000000000 -0700 +@@ -7,10 +7,8 @@ BindTo=xrdp.service + [Service] + Type=forking + PIDFile=/var/run/xrdp-sesman.pid +-EnvironmentFile=-/etc/sysconfig/xrdp +-EnvironmentFile=-/etc/default/xrdp +-ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS +-ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill ++ExecStart=/usr/bin/xrdp-sesman ++ExecStop=/usr/bin/xrdp-sesman --kill + + [Install] + WantedBy=multi-user.target +diff -up src/xrdp-devel-git/instfiles/xrdp.sh.orig src/xrdp-devel-git/instfiles/xrdp.sh +--- src/xrdp-devel-git/instfiles/xrdp.sh.orig 2017-01-04 17:08:45.000000000 -0700 ++++ src/xrdp-devel-git/instfiles/xrdp.sh 2017-01-04 17:10:02.000000000 -0700 +@@ -17,7 +17,7 @@ + # Description: starts xrdp + ### END INIT INFO + +-SBINDIR=/usr/local/sbin ++SBINDIR=/usr/bin + LOG=/dev/null + CFGDIR=/etc/xrdp + +diff -up src/xrdp-devel-git/sesman/startwm.sh.orig src/xrdp-devel-git/sesman/startwm.sh +--- src/xrdp-devel-git/sesman/startwm.sh.orig 2017-01-04 17:08:46.000000000 -0700 ++++ src/xrdp-devel-git/sesman/startwm.sh 2017-01-04 17:08:48.000000000 -0700 @@ -8,6 +8,17 @@ wm_start() export LANG LANGUAGE fi @@ -36,31 +63,3 @@ diff -upr xrdp-git/sesman/startwm.sh xrdp-git-new/sesman/startwm.sh # debian if [ -r /etc/X11/Xsession ]; then . /etc/X11/Xsession -diff -upr xrdp-git/xrdp/xrdp.ini xrdp-git-new/xrdp/xrdp.ini ---- xrdp-git/xrdp/xrdp.ini 2015-04-24 16:38:02.152787757 -0700 -+++ xrdp-git-new/xrdp/xrdp.ini 2015-04-24 16:46:19.786142723 -0700 -@@ -51,7 +51,7 @@ grey=dedede - # require_credentials=yes - - # set a default entry for autorun if the client send login and pass directly --autorun=xrdp1 -+autorun=xrdp2 - - bulk_compression=yes - -@@ -139,6 +139,15 @@ tcutils=true - # for debugging xrdp, add following line to section xrdp1 - # chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210 - -+[xrdp0] -+name=sesman-Xvnc-delay -+lib=libvnc.so -+username=ask -+password=ask -+ip=127.0.0.1 -+port=-1 -+delay_ms=2000 -+ - [xrdp1] - name=sesman-X11rdp - lib=libxup.so |