version 0.8.0-1

3 files changed, 150 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f55494df6de..f46a004fdd7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,25 @@
 pkgbase = xrdp
 	pkgdesc = An open source remote desktop protocol (RDP) server
-	pkgver = 0.6.1
-	pkgrel = 2
+	pkgver = 0.8.0
+	pkgrel = 1
 	url = http://xrdp.sourceforge.net/
+	install = xrdp.install
 	arch = i686
 	arch = x86_64
 	arch = armv6h
-	license = GPL
+	license = Apache
+	makedepends = libpulse
+	makedepends = fuse
 	depends = tigervnc
-	source = https://github.com/neutrinolabs/xrdp/archive/v0.6.1.tar.gz
-	source = xrdp.service
-	source = xrdp-sesman.service
-	md5sums = ada45a1e8ca0be779b6ef0eda782aa13
-	md5sums = 0cb760b3e8a34f9bdf4daa871444d74c
-	md5sums = 58eb44bdc7ca5bb436d6fd66826f9b0f
+	depends = libxrandr
+	optdepends = libpulse: to use the pule audio module
+	optdepends = fuse: to use the file clipboard module
+	backup = etc/xrdp/sesman.ini
+	backup = etc/xrdp/xrdp.ini
+	source = https://github.com/neutrinolabs/xrdp/archive/v0.8.0.tar.gz
+	source = arch-config.diff
+	md5sums = 2b0c3affc65ee77ad251514c62896757
+	md5sums = 12bcbdf83cae9754da5e39aaf5e013e8
 
 pkgname = xrdp
 
diff --git a/PKGBUILD b/PKGBUILD
index 6033e34d3456..ac2215693e06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,58 @@
 # 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>
 pkgname=xrdp
-pkgver=0.6.1
-pkgrel=2
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="An open source remote desktop protocol (RDP) server"
 url="http://xrdp.sourceforge.net/"
 arch=('i686' 'x86_64' 'armv6h')
-license=('GPL')
-depends=('tigervnc')
+license=('Apache')
+makedepends=('libpulse' 'fuse')
+depends=('tigervnc' 'libxrandr')
+optdepends=('libpulse: to use the pule audio module'
+            'fuse: to use the file clipboard module')
+backup=('etc/xrdp/sesman.ini' 'etc/xrdp/xrdp.ini')
+install=xrdp.install
 source=(https://github.com/neutrinolabs/${pkgname}/archive/v${pkgver}.tar.gz
-        'xrdp.service'
-        'xrdp-sesman.service')
-md5sums=('26099c6588943262023607c1b4e774d8'
-         '0cb760b3e8a34f9bdf4daa871444d74c'
-         '58eb44bdc7ca5bb436d6fd66826f9b0f')
+        arch-config.diff)
+md5sums=('2b0c3affc65ee77ad251514c62896757'
+         '12bcbdf83cae9754da5e39aaf5e013e8')
 
 prepare() {
-    cd "${pkgname}-${pkgver}"
-    # Fix path in xrdp.sh file
-    sed -i 's|/usr/local/sbin|/usr/bin|' instfiles/xrdp.sh
+  cd "${pkgname}-${pkgver}"
+
+  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
+
+  ./bootstrap
 }
 
 build() {
-    cd "${pkgname}-${pkgver}"
-    ./bootstrap
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
+  cd "${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --localstatedir=/var \
+              --sbindir=/usr/bin \
+              --with-systemdsystemdunitdir=/usr/lib/systemd/system \
+              --enable-jpeg \
+              --enable-simplesound \
+              --enable-fuse \
+              --enable-loadpulsemodules
     make
 }
 
 package() {
     cd "${pkgname}-${pkgver}"
     make DESTDIR="$pkgdir" install
-    cd ${pkgdir}
-    # Install systemd service files
-    mkdir -p usr/lib/systemd/system
-    cp ${srcdir}/*.service usr/lib/systemd/system
+
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums=('ada45a1e8ca0be779b6ef0eda782aa13'
-         '0cb760b3e8a34f9bdf4daa871444d74c'
-         '58eb44bdc7ca5bb436d6fd66826f9b0f')
diff --git a/arch-config.diff b/arch-config.diff
new file mode 100644
index 000000000000..cdc5b942cdce
--- /dev/null
+++ b/arch-config.diff
@@ -0,0 +1,98 @@
+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
+ 
+ SUBDIRS = \
+   pam.d \
+-  init.d \
+-  default \
+   pulse
+ 
+ if HAVE_SYSTEMD
+ systemdsystemunit_DATA = \
+         xrdp-sesman.service \
+         xrdp.service
++else
++SUBDIRS+= \
++  init.d \
++  default
+ endif
+ 
+ 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
+@@ -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 -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