uppkg

3 files changed, 12 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2664af0cb8a3..fac91d1d1ed3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xrdp-devel-git
 	pkgdesc = An open source remote desktop protocol (RDP) server - GIT version
-	pkgver = 0.9.1.r255.ga094c65a
+	pkgver = 0.9.12.r25.g6d7cce3d
 	pkgrel = 1
 	url = https://github.com/neutrinolabs/xrdp
 	install = xrdp-devel-git.install
@@ -15,14 +15,14 @@ pkgbase = xrdp-devel-git
 	depends = lame
 	depends = opus
 	depends = fuse
-	provides = xrdp=0.9.1
+	provides = xrdp=0.9.12-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 = d43731272860b236d49dd643312ee03e
+	md5sums = 5b0c7390d6380cc05cb76980426af9fc
 
 pkgname = xrdp-devel-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ca0294b50de..a64d84088fb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,27 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Tau Tsao <realturner at gmail.com>
 pkgname=xrdp-devel-git
-pkgver=0.9.1.r255.ga094c65a
+_pkgname=xrdp
+pkgver=0.9.12.r25.g6d7cce3d
 pkgrel=1
 pkgdesc="An open source remote desktop protocol (RDP) server - GIT version"
-url="https://github.com/neutrinolabs/xrdp"
+url="https://github.com/neutrinolabs/$_pkgname"
 arch=('i686' 'x86_64' 'armv6h')
 license=('Apache')
 makedepends=('git' 'nasm')
 depends=('tigervnc' 'libxrandr' 'lame' 'opus' 'fuse')
-conflicts=('xrdp')
-provides=('xrdp=0.9.1')
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver%%.r*}-${pkgrel}")
 backup=('etc/xrdp/sesman.ini' 'etc/xrdp/xrdp.ini')
 install="${pkgname}.install"
 source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git#branch=devel"
         "arch-config.diff")
 md5sums=('SKIP'
-         'b41c3d596a582d00e83cd55c756e9ee4')
+         '5b0c7390d6380cc05cb76980426af9fc')
 
 pkgver() {
   cd $pkgname
-  printf "0.9.1.r%s.g%s" "$(git rev-list --count v0.9.1..HEAD)" "$(git rev-parse --short HEAD)"
+  printf "0.9.12.r%s.g%s" "$(git rev-list --count v0.9.12..HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
@@ -43,6 +44,8 @@ build() {
 	      --enable-rfxcodec \
 	      --enable-mp3lame \
 	      --enable-pixman
+  # Fight unused direct deps
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make V=0
 }
 
@@ -52,5 +55,3 @@ package() {
   rm -f "$pkgdir"/etc/xrdp/rsakeys.ini
   install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums=('SKIP'
-         'd43731272860b236d49dd643312ee03e')
diff --git a/arch-config.diff b/arch-config.diff
index 3fb11d258000..655de09eaa37 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -30,18 +30,6 @@ diff -up src/xrdp-devel-git/instfiles/xrdp-sesman.service.in.orig src/xrdp-devel
  
  [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-08-30 00:27:28.000000000 -0600
-+++ src/xrdp-devel-git/instfiles/xrdp.sh	2017-08-30 00:28:00.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-devel-git/sesman/startwm.sh.orig src/xrdp-devel-git/sesman/startwm.sh
 --- src/xrdp-devel-git/sesman/startwm.sh.orig	2017-08-30 00:27:30.000000000 -0600
 +++ src/xrdp-devel-git/sesman/startwm.sh	2017-08-30 00:28:00.000000000 -0600