diff options
author | Brian Bidulock | 2015-07-13 18:22:51 -0600 |
---|---|---|
committer | Brian Bidulock | 2015-07-13 18:23:16 -0600 |
commit | 244db3eedcb620702ab9628f0e0604f3ecce90c3 (patch) | |
tree | 7412c644713d0bcf3585cca5403c0c6696c033ce | |
parent | 1a74347e32d8f6e095618c4538a79e8a9563f770 (diff) | |
download | aur-244db3eedcb620702ab9628f0e0604f3ecce90c3.tar.gz |
version 1:0.8.0.r432.g2ed8108-1
-rw-r--r-- | .SRCINFO | 24 | ||||
-rw-r--r-- | PKGBUILD | 54 | ||||
-rw-r--r-- | arch-config.diff | 163 |
3 files changed, 78 insertions, 163 deletions
@@ -1,29 +1,29 @@ pkgbase = xrdp-git - pkgdesc = An open source remote desktop protocol(rdp) server - GIT version - pkgver = 0.9.0.8904252 + pkgdesc = An open source remote desktop protocol (RDP) server - GIT version + pkgver = 0.8.0.r432.g2ed8108 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 - makedepends = autoconf - makedepends = automake - makedepends = libtool - depends = libxrandr depends = tigervnc - depends = fuse - optdepends = autocutsel: easy clipboard handling + depends = libxrandr + optdepends = libpulse: to use the pule audio module + optdepends = fuse: to use the file clipboard module + provides = xrdp=0.8.0 conflicts = xrdp backup = etc/xrdp/sesman.ini backup = etc/xrdp/xrdp.ini - source = xrdp-git::git+https://github.com/neutrinolabs/xrdp.git#commit=8904252 + source = xrdp-git::git+https://github.com/neutrinolabs/xrdp.git source = arch-config.diff - source = archlinux.bmp md5sums = SKIP - md5sums = 44a4b78459738b76db1d3fe8605aa1f2 - md5sums = fc66ae93316811ac5fa1e0960a88f157 + md5sums = d08f0984fc543e2478eaa79337726da7 pkgname = xrdp-git @@ -1,47 +1,53 @@ -# Maintainer: Jianhui Z <jianhui@outlook.com> +# Maintainer: Brian Bidulock <bidulock@openss7.org> # Contributor: Tau Tsao <realturner at gmail.com> -_githash=8904252 pkgname=xrdp-git -pkgver=0.9.0.$_githash +pkgver=0.8.0.r432.g2ed8108 pkgrel=1 -pkgdesc="An open source remote desktop protocol(rdp) server - GIT version" -arch=('i686' 'x86_64') +epoch=1 +pkgdesc="An open source remote desktop protocol (RDP) server - GIT version" url="https://github.com/neutrinolabs/xrdp" +arch=('i686' 'x86_64' 'armv6h') license=('Apache') -groups=() -depends=('libxrandr' 'tigervnc' 'fuse') -makedepends=('git' 'autoconf' 'automake' 'libtool') -optdepends=('autocutsel: easy clipboard handling') -provides=() +makedepends=('libpulse' 'fuse' 'git') +depends=('tigervnc' 'libxrandr') +optdepends=('libpulse: to use the pule audio module' + 'fuse: to use the file clipboard module') conflicts=('xrdp') -replaces=() +provides=('xrdp=0.8.0') backup=('etc/xrdp/sesman.ini' 'etc/xrdp/xrdp.ini') -options=() install=xrdp-git.install -changelog= -source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git#commit=$_githash" - "arch-config.diff" - "archlinux.bmp") -noextract=() +source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git" + "arch-config.diff") md5sums=('SKIP' - '44a4b78459738b76db1d3fe8605aa1f2' - 'fc66ae93316811ac5fa1e0960a88f157') + '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)" +} prepare() { cd $pkgname - patch -p1 < ../arch-config.diff + patch -Np2 -b -z .orig <../arch-config.diff + ./bootstrap } build() { cd $pkgname - ./bootstrap - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin --enable-fuse + ./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 - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING - install -Dm644 "$srcdir/archlinux.bmp" "$pkgdir/usr/share/xrdp/archlinux.bmp" } diff --git a/arch-config.diff b/arch-config.diff index f409cd57f368..9be6651d65d4 100644 --- a/arch-config.diff +++ b/arch-config.diff @@ -1,6 +1,6 @@ -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-05-08 02:11:57.617641140 +0200 -+++ xrdp-git-new/instfiles/pam.d/xrdp-sesman 2015-05-08 02:15:40.454759756 +0200 +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 @@ #%PAM-1.0 -@include common-auth @@ -10,40 +10,42 @@ diff -upr xrdp-git/instfiles/pam.d/xrdp-sesman xrdp-git-new/instfiles/pam.d/xrdp +auth include system-auth +account include system-auth +password include system-auth -+session include system-login -diff -upr xrdp-git/instfiles/xrdp.service xrdp-git-new/instfiles/xrdp.service ---- xrdp-git/instfiles/xrdp.service 2015-05-08 02:11:57.617641140 +0200 -+++ xrdp-git-new/instfiles/xrdp.service 2015-05-08 02:15:40.458093047 +0200 -@@ -6,9 +6,8 @@ After=syslog.target network.target xrdp- ++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 -+ExecStart=/usr/bin/xrdp -+ExecStop=/usr/bin/xrdp --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 -upr xrdp-git/instfiles/xrdp-sesman.service xrdp-git-new/instfiles/xrdp-sesman.service ---- xrdp-git/instfiles/xrdp-sesman.service 2015-05-08 02:11:57.617641140 +0200 -+++ xrdp-git-new/instfiles/xrdp-sesman.service 2015-05-08 02:15:40.458093047 +0200 -@@ -6,9 +6,8 @@ StopWhenUnneeded=true +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 -+ExecStart=/usr/bin/xrdp-sesman -+ExecStop=/usr/bin/xrdp-sesman --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 -upr xrdp-git/instfiles/xrdp.sh xrdp-git-new/instfiles/xrdp.sh ---- xrdp-git/instfiles/xrdp.sh 2015-05-08 02:11:57.617641140 +0200 -+++ xrdp-git-new/instfiles/xrdp.sh 2015-05-08 02:15:40.458093047 +0200 +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 @@ -53,68 +55,30 @@ diff -upr xrdp-git/instfiles/xrdp.sh xrdp-git-new/instfiles/xrdp.sh LOG=/dev/null CFGDIR=/etc/xrdp -diff -upr xrdp-git/sesman/sesman.ini xrdp-git-new/sesman/sesman.ini ---- xrdp-git/sesman/sesman.ini 2015-05-08 02:11:57.657640614 +0200 -+++ xrdp-git-new/sesman/sesman.ini 2015-05-08 02:29:13.184254406 +0200 -@@ -57,7 +57,7 @@ DisconnectedTimeLimit=0 - Policy=Default - - [Logging] --LogFile=xrdp-sesman.log -+LogFile=/dev/null - LogLevel=DEBUG - EnableSyslog=1 - SyslogLevel=DEBUG -@@ -90,7 +90,7 @@ param8=tcp - - [Chansrv] - # drive redirection, defaults to xrdp_client if not set --FuseMountName=thinclient_drives -+FuseMountName=xrdp - - [SessionVariables] - PULSE_SCRIPT=/etc/xrdp/pulse/default.pa -diff -upr xrdp-git/sesman/startwm.sh xrdp-git-new/sesman/startwm.sh ---- xrdp-git/sesman/startwm.sh 2015-05-08 02:11:57.660973904 +0200 -+++ xrdp-git-new/sesman/startwm.sh 2015-05-08 02:15:40.461426338 +0200 -@@ -3,26 +3,20 @@ - #start the window manager - wm_start() - { -- if [ -r /etc/default/locale ]; then -- . /etc/default/locale -+ if [ -r /etc/locale.conf ]; then -+ . /etc/locale.conf +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 +@@ -8,6 +8,17 @@ wm_start() export LANG LANGUAGE fi -- # debian -- if [ -r /etc/X11/Xsession ]; then -- . /etc/X11/Xsession + # arch user + if [ -r ~/.xinitrc ]; then + . ~/.xinitrc - exit 0 - fi - -- # el -- if [ -r /etc/X11/xinit/Xsession ]; then -- . /etc/X11/xinit/Xsession -- exit 0 -- fi -- -- # suse -- if [ -r /etc/X11/xdm/Xsession ]; then -- . /etc/X11/xdm/Xsession ++ exit 0 ++ fi + # arch + if [ -r /etc/X11/xinit/xinitrc ]; then + . /etc/X11/xinit/xinitrc - exit 0 - fi - -diff -upr xrdp-git/xrdp/xrdp.ini xrdp-git-new/xrdp/xrdp.ini ---- xrdp-git/xrdp/xrdp.ini 2015-05-08 02:11:57.724306405 +0200 -+++ xrdp-git-new/xrdp/xrdp.ini 2015-05-08 02:49:45.958735044 +0200 ++ exit 0 ++ fi ++ + # 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 @@ -51,7 +51,7 @@ grey=dedede # require_credentials=yes @@ -124,61 +88,6 @@ diff -upr xrdp-git/xrdp/xrdp.ini xrdp-git-new/xrdp/xrdp.ini bulk_compression=yes -@@ -67,14 +67,14 @@ use_fastpath=both - # - - # Login Screen Window Title --#ls_title=My Login Title -+ls_title=Archlinux Login - - # top level window background color in RGB format - ls_top_window_bg_color=009cb5 - - # width and height of login screen - ls_width=350 --ls_height=430 -+ls_height=330 - - # login screen background color in RGB format - ls_bg_color=dedede -@@ -84,8 +84,8 @@ ls_bg_color=dedede - - # logo - # full path to bmp-file or file in shared folder --ls_logo_filename= --ls_logo_x_pos=55 -+ls_logo_filename=/usr/share/xrdp/archlinux.bmp -+ls_logo_x_pos=35 - ls_logo_y_pos=50 - - # for positioning labels such as username, password etc -@@ -97,22 +97,22 @@ ls_input_x_pos=110 - ls_input_width=210 - - # y pos for first label and combo box --ls_input_y_pos=220 -+ls_input_y_pos=180 - - # OK button - ls_btn_ok_x_pos=142 --ls_btn_ok_y_pos=370 -+ls_btn_ok_y_pos=280 - ls_btn_ok_width=85 - ls_btn_ok_height=30 - - # Cancel button - ls_btn_cancel_x_pos=237 --ls_btn_cancel_y_pos=370 -+ls_btn_cancel_y_pos=280 - ls_btn_cancel_width=85 - ls_btn_cancel_height=30 - - [Logging] --LogFile=xrdp.log -+LogFile=/dev/null - LogLevel=DEBUG - EnableSyslog=1 - SyslogLevel=DEBUG @@ -139,6 +139,15 @@ tcutils=true # for debugging xrdp, add following line to section xrdp1 # chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210 |