diff options
Diffstat (limited to 'pcr/xrdp')
| -rw-r--r-- | pcr/xrdp/PKGBUILD | 45 | ||||
| -rw-r--r-- | pcr/xrdp/arch-config.diff | 71 | ||||
| -rw-r--r-- | pcr/xrdp/fixups.patch | 79 | ||||
| -rw-r--r-- | pcr/xrdp/xrdp-sesman.service | 5 |
4 files changed, 98 insertions, 102 deletions
diff --git a/pcr/xrdp/PKGBUILD b/pcr/xrdp/PKGBUILD index 55f2a5272..e6cc633a7 100644 --- a/pcr/xrdp/PKGBUILD +++ b/pcr/xrdp/PKGBUILD @@ -1,27 +1,29 @@ -# Maintainer: Brian Bidulock <bidulock@openss7.org> -# Contributo: Jianhui Z <jianhui@outlook.com> -# Contributo: Tau Tsao <realturner at gmail.com> -# Contributor: Tomasz Zok <tomasz.zok [at] gmail.com> -# Contributor: techryda <techryda at silentdome dot com> -# Contributor: Mathias R. <pu154r@overlinux.org> +# Maintainer (Arch): Brian Bidulock <bidulock@openss7.org> +# Contributo (Arch): Jianhui Z <jianhui@outlook.com> +# Contributo (Arch): Tau Tsao <realturner at gmail.com> +# Contributor (Arch): Tomasz Zok <tomasz.zok [at] gmail.com> +# Contributor (Arch): techryda <techryda at silentdome dot com> +# Contributor (Arch): Mathias R. <pu154r@overlinux.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=xrdp -pkgver=0.8.0 -pkgrel=4 +pkgver=0.9.1 +pkgrel=5 pkgdesc="An open source remote desktop protocol (RDP) server" -url="http://xrdp.sourceforge.net/" -arch=('i686' 'x86_64' 'armv7h') +url="https://github.com/neutrinolabs/xrdp" +arch=('i686' 'x86_64' 'armv6h') license=('Apache') -depends=('tigervnc' 'libjpeg-turbo' 'libxrandr' 'libpulse' 'fuse') +makedepends=('nasm') +depends=('tigervnc' 'libxrandr' 'lame' 'opus' 'fuse') backup=('etc/xrdp/sesman.ini' 'etc/xrdp/xrdp.ini') -install=xrdp.install -source=(https://github.com/neutrinolabs/${pkgname}/archive/v${pkgver}.tar.gz - fixups.patch) -md5sums=('2b0c3affc65ee77ad251514c62896757' - 'e6985363c6f13e22272afdc6a7dddc96') +install="${pkgname}.install" +source=("https://github.com/neutrinolabs/xrdp/releases/download/v${pkgver}/xrdp-${pkgver}.tar.gz" + "arch-config.diff") +md5sums=('111a3a3b7ea01eb62b08c698ab8f8bff' + 'b41c3d596a582d00e83cd55c756e9ee4') prepare() { cd "${pkgname}-${pkgver}" - patch -p2 -b -z .orig <../fixups.patch + patch -Np2 -b -z .orig <../arch-config.diff ./bootstrap } @@ -33,15 +35,18 @@ build() { --sbindir=/usr/bin \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --enable-jpeg \ - --enable-simplesound \ + --enable-tjpeg \ --enable-fuse \ - --enable-loadpulsemodules + --enable-opus \ + --enable-rfxcodec \ + --enable-mp3lame \ + --enable-pixman make V=0 } package() { cd "${pkgname}-${pkgver}" make DESTDIR="$pkgdir" install - + rm -f "$pkgdir"/etc/xrdp/rsakeys.ini install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } diff --git a/pcr/xrdp/arch-config.diff b/pcr/xrdp/arch-config.diff new file mode 100644 index 000000000..d67e16e77 --- /dev/null +++ b/pcr/xrdp/arch-config.diff @@ -0,0 +1,71 @@ +diff -up src/xrdp-0.9.1/instfiles/xrdp.service.orig src/xrdp-0.9.1/instfiles/xrdp.service +--- src/xrdp-0.9.1/instfiles/xrdp.service.orig 2016-12-22 10:02:47.000000000 -0700 ++++ src/xrdp-0.9.1/instfiles/xrdp.service 2017-01-07 00:55:16.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-0.9.1/instfiles/xrdp-sesman.service.orig src/xrdp-0.9.1/instfiles/xrdp-sesman.service +--- src/xrdp-0.9.1/instfiles/xrdp-sesman.service.orig 2016-12-22 10:02:47.000000000 -0700 ++++ src/xrdp-0.9.1/instfiles/xrdp-sesman.service 2017-01-07 00:55:54.000000000 -0700 +@@ -2,15 +2,13 @@ + Description=xrdp session manager + After=syslog.target network.target + StopWhenUnneeded=true +-BindTo=xrdp.service ++BindsTo=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-0.9.1/instfiles/xrdp.sh.orig src/xrdp-0.9.1/instfiles/xrdp.sh +--- src/xrdp-0.9.1/instfiles/xrdp.sh.orig 2016-12-22 09:56:24.000000000 -0700 ++++ src/xrdp-0.9.1/instfiles/xrdp.sh 2017-01-07 00:55:16.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-0.9.1/sesman/startwm.sh.orig src/xrdp-0.9.1/sesman/startwm.sh +--- src/xrdp-0.9.1/sesman/startwm.sh.orig 2016-12-22 10:02:47.000000000 -0700 ++++ src/xrdp-0.9.1/sesman/startwm.sh 2017-01-07 00:55:16.000000000 -0700 +@@ -8,6 +8,17 @@ wm_start() + export LANG LANGUAGE + fi + ++ # arch user ++ if [ -r ~/.xinitrc ]; then ++ . ~/.xinitrc ++ exit 0 ++ fi ++ # arch ++ if [ -r /etc/X11/xinit/xinitrc ]; then ++ . /etc/X11/xinit/xinitrc ++ exit 0 ++ fi ++ + # debian + if [ -r /etc/X11/Xsession ]; then + . /etc/X11/Xsession diff --git a/pcr/xrdp/fixups.patch b/pcr/xrdp/fixups.patch deleted file mode 100644 index b555486c7..000000000 --- a/pcr/xrdp/fixups.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -up src/xrdp-0.8.0/instfiles/Makefile.am.orig src/xrdp-0.8.0/instfiles/Makefile.am ---- src/xrdp-0.8.0/instfiles/Makefile.am.orig 2014-05-19 23:41:42.000000000 -0600 -+++ src/xrdp-0.8.0/instfiles/Makefile.am 2015-05-26 17:22:39.000000000 -0600 -@@ -28,5 +28,7 @@ startscript_DATA = \ - # must be tab below - install-data-hook: - chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh -- chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp -- sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp; -+ if [ -f $(DESTDIR)$(sysconfdir)/init.d/xrdp ]; then \ -+ chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp; \ -+ sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp; \ -+ fi -diff -up src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman.orig src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman ---- src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman.orig 2014-05-19 23:41:42.000000000 -0600 -+++ src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman 2015-05-26 17:22:39.000000000 -0600 -@@ -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 -up src/xrdp-0.8.0/sesman/startwm.sh.orig src/xrdp-0.8.0/sesman/startwm.sh ---- src/xrdp-0.8.0/sesman/startwm.sh.orig 2014-05-19 23:41:42.000000000 -0600 -+++ src/xrdp-0.8.0/sesman/startwm.sh 2015-05-26 17:22:39.000000000 -0600 -@@ -8,6 +8,17 @@ wm_start() - export LANG LANGUAGE - fi - -+ # arch user -+ if [ -r ~/.xinitrc ]; then -+ . ~/.xinitrc -+ exit 0 -+ fi -+ # arch -+ if [ -r /etc/X11/xinit/xinitrc ]; then -+ . /etc/X11/xinit/xinitrc -+ exit 0 -+ fi -+ - # debian - if [ -r /etc/X11/Xsession ]; then - . /etc/X11/Xsession -diff -up src/xrdp-0.8.0/xrdp/xrdp.ini.orig src/xrdp-0.8.0/xrdp/xrdp.ini ---- src/xrdp-0.8.0/xrdp/xrdp.ini.orig 2014-05-19 23:41:42.000000000 -0600 -+++ src/xrdp-0.8.0/xrdp/xrdp.ini 2015-05-26 17:25:17.000000000 -0600 -@@ -36,7 +36,7 @@ grey=dedede - #red=ff0000 - #green=00ff00 - #background=626c72 --#autorun=xrdp1 -+autorun=xrdp2 - #hidelogwindow=yes - - # when true, userid/password *must* be passed on cmd line -@@ -119,6 +119,15 @@ xrdpvr=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 diff --git a/pcr/xrdp/xrdp-sesman.service b/pcr/xrdp/xrdp-sesman.service index 8222069b9..c33376ecc 100644 --- a/pcr/xrdp/xrdp-sesman.service +++ b/pcr/xrdp/xrdp-sesman.service @@ -6,9 +6,8 @@ StopWhenUnneeded=true [Service] Type=forking PIDFile=/var/run/xrdp-sesman.pid -EnvironmentFile=/etc/xrdp/xrdp.ini -ExecStart=/usr/bin/xrdp-sesman $SESMAN_OPTIONS -ExecStop=/usr/bin/xrdp-sesman $SESMAN_OPTIONS --kill +ExecStart=/usr/bin/xrdp-sesman +ExecStop=/usr/bin/xrdp-sesman --kill [Install] WantedBy=multi-user.target |