version 0.9.0.04b729c-1

3 files changed, 85 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 582fef628e00..4831719a6cde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,25 @@
 pkgbase = xrdp-git
-	pkgdesc = An open source remote desktop protocol (RDP) server - GIT version
-	pkgver = 0.8.0.r432.g2ed8108
+	pkgdesc = An open source remote desktop protocol(rdp) server - GIT version
+	pkgver = 0.9.0.04b729c
 	pkgrel = 1
-	epoch = 1
 	url = https://github.com/neutrinolabs/xrdp
 	install = xrdp-git.install
 	arch = i686
 	arch = x86_64
-	arch = armv6h
 	license = Apache
-	makedepends = libpulse
-	makedepends = fuse
 	makedepends = git
-	depends = tigervnc
+	makedepends = autoconf
+	makedepends = automake
+	makedepends = libtool
 	depends = libxrandr
-	optdepends = libpulse: to use the pule audio module
-	optdepends = fuse: to use the file clipboard module
-	provides = xrdp=0.8.0
+	depends = tigervnc
 	conflicts = xrdp
 	backup = etc/xrdp/sesman.ini
 	backup = etc/xrdp/xrdp.ini
-	source = xrdp-git::git+https://github.com/neutrinolabs/xrdp.git
+	source = xrdp-git::git+https://github.com/neutrinolabs/xrdp.git#commit=04b729c
 	source = arch-config.diff
 	md5sums = SKIP
-	md5sums = d08f0984fc543e2478eaa79337726da7
+	md5sums = 12bcbdf83cae9754da5e39aaf5e013e8
 
 pkgname = xrdp-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5e78c5ccb122..84e4df7507bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,51 @@
-# Maintainer: Brian Bidulock <bidulock@openss7.org>
+# Maintainer: Jianhui Z <jianhui@outlook.com>
 # Contributor: Tau Tsao <realturner at gmail.com>
+_githash=04b729c
 pkgname=xrdp-git
-pkgver=0.8.0.r432.g2ed8108
+pkgver=0.9.0.$_githash
 pkgrel=1
-epoch=1
-pkgdesc="An open source remote desktop protocol (RDP) server - GIT version"
+pkgdesc="An open source remote desktop protocol(rdp) server - GIT version"
+arch=('i686' 'x86_64')
 url="https://github.com/neutrinolabs/xrdp"
-arch=('i686' 'x86_64' 'armv6h')
 license=('Apache')
-makedepends=('libpulse' 'fuse' 'git')
-depends=('tigervnc' 'libxrandr')
-optdepends=('libpulse: to use the pule audio module'
-            'fuse: to use the file clipboard module')
+groups=()
+depends=('libxrandr' 'tigervnc')
+makedepends=('git' 'autoconf' 'automake' 'libtool')
+optdepends=()
+provides=()
 conflicts=('xrdp')
-provides=('xrdp=0.8.0')
+replaces=()
 backup=('etc/xrdp/sesman.ini' 'etc/xrdp/xrdp.ini')
+options=()
 install=xrdp-git.install
-source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git"
+changelog=
+source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git#commit=$_githash"
         "arch-config.diff")
+noextract=()
 md5sums=('SKIP'
-         'd08f0984fc543e2478eaa79337726da7')
-
-pkgver() {
-  cd $pkgname
-  printf "0.8.0.r%s.g%s" "$(git rev-list --count v0.8.0..HEAD)" "$(git rev-parse --short HEAD)"
-}
+         '12bcbdf83cae9754da5e39aaf5e013e8')
 
 prepare() {
   cd $pkgname
-  patch -Np2 -b -z .orig <../arch-config.diff
-  ./bootstrap
+
+  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
 }
 
 build() {
   cd $pkgname
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --localstatedir=/var \
-              --sbindir=/usr/bin \
-              --with-systemdsystemdunitdir=/usr/lib/systemd/system \
-              --enable-jpeg \
-              --enable-simplesound \
-              --enable-fuse \
-              --enable-loadpulsemodules
+  ./bootstrap
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
   make
 }
 
 package() {
   cd $pkgname
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir/" install
   install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/arch-config.diff b/arch-config.diff
index 9be6651d65d4..cdc5b942cdce 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,63 +1,55 @@
-diff -up src/xrdp-git/instfiles/pam.d/xrdp-sesman.orig src/xrdp-git/instfiles/pam.d/xrdp-sesman
---- src/xrdp-git/instfiles/pam.d/xrdp-sesman.orig	2015-07-13 18:05:56.000000000 -0600
-+++ src/xrdp-git/instfiles/pam.d/xrdp-sesman	2015-07-13 18:06:11.000000000 -0600
-@@ -1,5 +1,5 @@
+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 -up src/xrdp-git/instfiles/xrdp.service.orig src/xrdp-git/instfiles/xrdp.service
---- src/xrdp-git/instfiles/xrdp.service.orig	2015-07-13 18:04:27.000000000 -0600
-+++ src/xrdp-git/instfiles/xrdp.service	2015-07-13 18:04:30.000000000 -0600
-@@ -6,9 +6,9 @@ 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
-+EnvironmentFile=/etc/xrdp/xrdp.ini
-+ExecStart=/usr/bin/xrdp $XRDP_OPTIONS
-+ExecStop=/usr/bin/xrdp $XRDP_OPTIONS --kill
- 
- [Install]
- WantedBy=multi-user.target
-diff -up src/xrdp-git/instfiles/xrdp-sesman.service.orig src/xrdp-git/instfiles/xrdp-sesman.service
---- src/xrdp-git/instfiles/xrdp-sesman.service.orig	2015-07-13 18:04:27.000000000 -0600
-+++ src/xrdp-git/instfiles/xrdp-sesman.service	2015-07-13 18:04:30.000000000 -0600
-@@ -6,9 +6,9 @@ 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
-+EnvironmentFile=/etc/xrdp/xrdp.ini
-+ExecStart=/usr/bin/xrdp-sesman $SESMAN_OPTIONS
-+ExecStop=/usr/bin/xrdp-sesman $SESMAN_OPTIONS --kill
- 
- [Install]
- WantedBy=multi-user.target
-diff -up src/xrdp-git/instfiles/xrdp.sh.orig src/xrdp-git/instfiles/xrdp.sh
---- src/xrdp-git/instfiles/xrdp.sh.orig	2015-07-13 18:04:27.000000000 -0600
-+++ src/xrdp-git/instfiles/xrdp.sh	2015-07-13 18:04:30.000000000 -0600
-@@ -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-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh
---- src/xrdp-git/sesman/startwm.sh.orig	2015-07-13 18:09:26.000000000 -0600
-+++ src/xrdp-git/sesman/startwm.sh	2015-07-13 18:09:45.000000000 -0600
+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
@@ -76,22 +68,22 @@ diff -up src/xrdp-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh
    # debian
    if [ -r /etc/X11/Xsession ]; then
      . /etc/X11/Xsession
-diff -up src/xrdp-git/xrdp/xrdp.ini.orig src/xrdp-git/xrdp/xrdp.ini
---- src/xrdp-git/xrdp/xrdp.ini.orig	2015-07-13 18:12:33.000000000 -0600
-+++ src/xrdp-git/xrdp/xrdp.ini	2015-07-13 18:12:42.000000000 -0600
+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