version 0.9.1-2

4 files changed, 69 insertions, 222 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f3837b253bd..f6bb239fa05b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,24 @@
-# Generated by mksrcinfo v8
-# Fri Dec  4 13:42:46 UTC 2015
 pkgbase = xrdp
 	pkgdesc = An open source remote desktop protocol (RDP) server
-	pkgver = 0.8.0
-	pkgrel = 4
-	url = http://xrdp.sourceforge.net/
+	pkgver = 0.9.1
+	pkgrel = 2
+	url = https://github.com/neutrinolabs/xrdp
 	install = xrdp.install
 	arch = i686
 	arch = x86_64
 	arch = armv6h
 	license = Apache
 	depends = tigervnc
-	depends = libjpeg-turbo
 	depends = libxrandr
-	depends = libpulse
+	depends = lame
+	depends = opus
 	depends = fuse
 	backup = etc/xrdp/sesman.ini
 	backup = etc/xrdp/xrdp.ini
-	source = https://github.com/neutrinolabs/xrdp/archive/v0.8.0.tar.gz
-	source = fixups.patch
-	md5sums = 2b0c3affc65ee77ad251514c62896757
-	md5sums = e6985363c6f13e22272afdc6a7dddc96
+	source = https://github.com/neutrinolabs/xrdp/releases/download/v0.9.1/xrdp-0.9.1.tar.gz
+	source = arch-config.diff
+	md5sums = 111a3a3b7ea01eb62b08c698ab8f8bff
+	md5sums = cca1a944ca04e33987b60eb7278d4d8f
 
 pkgname = xrdp
 
diff --git a/PKGBUILD b/PKGBUILD
index c3952db4214f..fe7d0a02a901 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,23 +5,23 @@
 # Contributor: techryda <techryda at silentdome dot com>
 # Contributor: Mathias R. <pu154r@overlinux.org>
 pkgname=xrdp
-pkgver=0.8.0
-pkgrel=4
+pkgver=0.9.1
+pkgrel=2
 pkgdesc="An open source remote desktop protocol (RDP) server"
-url="http://xrdp.sourceforge.net/"
+url="https://github.com/neutrinolabs/xrdp"
 arch=('i686' 'x86_64' 'armv6h')
 license=('Apache')
-depends=('tigervnc' 'libjpeg-turbo' 'libxrandr' 'libpulse' 'fuse')
+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'
+         'cca1a944ca04e33987b60eb7278d4d8f')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-  patch -p2 -b -z .orig <../fixups.patch
+  patch -Np2 -b -z .orig <../arch-config.diff
   ./bootstrap
 }
 
@@ -33,15 +33,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/arch-config.diff b/arch-config.diff
index cdc5b942cdce..d55120226eb9 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,55 +1,50 @@
-diff -upr xrdp-git/instfiles/Makefile.am xrdp-git-new/instfiles/Makefile.am
---- xrdp-git/instfiles/Makefile.am	2015-04-24 16:38:02.092787754 -0700
-+++ xrdp-git-new/instfiles/Makefile.am	2015-04-24 16:47:21.346145399 -0700
-@@ -4,14 +4,16 @@ xrdp.service
+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
  
- SUBDIRS = \
-   pam.d \
--  init.d \
--  default \
-   pulse
+ [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
  
- if HAVE_SYSTEMD
- systemdsystemunit_DATA = \
-         xrdp-sesman.service \
-         xrdp.service
-+else
-+SUBDIRS+= \
-+  init.d \
-+  default
- endif
+ [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
  
- startscriptdir=$(sysconfdir)/xrdp
-@@ -35,5 +37,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 -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
+-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
@@ -68,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
diff --git a/fixups.patch b/fixups.patch
deleted file mode 100644
index 9b76682a8d90..000000000000
--- a/fixups.patch
+++ /dev/null
@@ -1,121 +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-12-04 06:39:06.000000000 -0700
-@@ -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-12-04 06:39:06.000000000 -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 -up src/xrdp-0.8.0/instfiles/xrdp.service.orig src/xrdp-0.8.0/instfiles/xrdp.service
---- src/xrdp-0.8.0/instfiles/xrdp.service.orig	2015-12-04 06:39:06.000000000 -0700
-+++ src/xrdp-0.8.0/instfiles/xrdp.service	2015-12-04 06:40:54.000000000 -0700
-@@ -6,9 +6,8 @@ After=syslog.target network.target xrdp-
- [Service]
- Type=forking
- PIDFile=/var/run/xrdp.pid
--EnvironmentFile=/etc/sysconfig/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.8.0/instfiles/xrdp-sesman.service.orig src/xrdp-0.8.0/instfiles/xrdp-sesman.service
---- src/xrdp-0.8.0/instfiles/xrdp-sesman.service.orig	2015-12-04 06:39:06.000000000 -0700
-+++ src/xrdp-0.8.0/instfiles/xrdp-sesman.service	2015-12-04 06:41:09.000000000 -0700
-@@ -6,9 +6,8 @@ StopWhenUnneeded=true
- [Service]
- Type=forking
- PIDFile=/var/run/xrdp-sesman.pid
--EnvironmentFile=/etc/sysconfig/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.8.0/instfiles/xrdp.sh.orig src/xrdp-0.8.0/instfiles/xrdp.sh
---- src/xrdp-0.8.0/instfiles/xrdp.sh.orig	2015-12-04 06:39:06.000000000 -0700
-+++ src/xrdp-0.8.0/instfiles/xrdp.sh	2015-12-04 06:39:06.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.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-12-04 06:39:06.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 -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-12-04 06:39:06.000000000 -0700
-@@ -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