update

Signed-off-by: Jat <jat@sinosky.org>
author: Jat 2023-04-28 10:44:23 +0800
committer: Jat 2023-04-28 10:44:23 +0800
commit: 7ea48069084f48d300296a0abc6ee79e9146b762 (patch)
tree: 69d9f22ae91d073df8cbd758d2905ebd3b4dbb31
parent: 0dbdaba9f22e9d4a563e5c6935ec7b0b90f3e946 (diff)
download: aur-7ea48069084f48d300296a0abc6ee79e9146b762.tar.gz
4 files changed, 101 insertions, 80 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..31abcbad1fec
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!xrdp-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 4d300907d1e2..e3d16085f340 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,85 @@
-# Maintainer: Brian Bidulock <bidulock@openss7.org>
-# Contributor: Tau Tsao <realturner at gmail.com>
-pkgname=xrdp-git
-_pkgname=xrdp
-pkgver=0.9.18.r35.ge1c6afa3
+# Maintainer: Jat <chat@jat.email>
+
+_pkgname='xrdp'
+pkgname="$_pkgname-git"
+pkgver=0.9.18.r444.g184287d8
 pkgrel=1
-epoch=1
-pkgdesc="An open source remote desktop protocol (RDP) server - GIT version"
-url="https://github.com/neutrinolabs/$_pkgname"
-arch=(i686 x86_64 armv6h armv7l aarch64)
+pkgdesc='An open source remote desktop protocol (RDP) server. Git version, devel branch.'
+url='https://github.com/neutrinolabs/xrdp'
+arch=('i686' 'x86_64' 'armv6h' 'armv7l' 'aarch64')
 license=('Apache')
-makedepends=('git' 'nasm')
-depends=('tigervnc' 'libxrandr' 'fuse' 'libfdk-aac' 'ffmpeg' 'imlib2')
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver%%.r*}-${pkgrel}")
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+makedepends=('nasm')
+depends=('libxrandr' 'fuse' 'libfdk-aac' 'ffmpeg' 'imlib2')
+checkdepends=('check')
+optdepends=('tigervnc' 'tightvnc' 'realvnc-vnc-server')
 backup=('etc/xrdp/sesman.ini'
-	'etc/xrdp/xrdp.ini'
-	'etc/xrdp/cert.pem'
-	'etc/xrdp/key.pem'
-	'etc/xrdp/startwm.sh')
-install="${pkgname}.install"
-source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git#branch=devel"
+        'etc/xrdp/xrdp.ini'
+        'etc/xrdp/cert.pem'
+        'etc/xrdp/key.pem'
+        'etc/xrdp/startwm.sh')
+source=("git+$url#branch=devel"
         "arch-config.diff")
 sha256sums=('SKIP'
-            '30fc3ab273bbde55966eadc117e02a85ae331ce6136995fd34309cc3c57ea619')
+            'dea15a32e498332a83a3835bda013863ff3be5713f3de63553a0e881513d9fcb')
+install="$pkgname.install"
 
 pkgver() {
-  cd $pkgname
-  git describe --tags --long|sed -E 's,^[^0-9]*,,;s,([0-9]*-g),r\1,;s,-,.,g'
+    cd "$srcdir/$_pkgname"
 
+    git describe --long --tags | sed -E 's,^[^0-9]*,,;s,([0-9]*-g),r\1,;s,-,.,g'
 }
 
 prepare() {
-  cd $pkgname
-  patch -Np2 -b -z .orig <../arch-config.diff
-  ./bootstrap
+    cd "$srcdir/$_pkgname"
+
+    # https://github.com/neutrinolabs/xrdp/pull/2649
+    sed -i '/^#include <check\.h>$/d' tests/libxrdp/test_libxrdp_main.c
+    patch -p2 -i"$srcdir/arch-config.diff"
 }
 
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --localstatedir=/var \
-              --sbindir=/usr/bin \
-              --with-systemdsystemunitdir=/usr/lib/systemd/system \
-              --enable-jpeg \
-              --enable-tjpeg \
-              --enable-fuse \
-	      --enable-fdkaac \
-	      --enable-opus \
-	      --enable-rfxcodec \
-	      --enable-mp3lame \
-	      --enable-pixman \
-	      --enable-painter \
-	      --enable-vsock \
-	      --enable-ipv6 \
-	      --enable-pam-config=arch \
-	      --enable-rdpsndaudin \
-	      --with-imlib2
+    cd "$srcdir/$_pkgname"
+
+    ./bootstrap
+    ./configure --prefix=/usr \
+                --sysconfdir=/etc \
+                --localstatedir=/var \
+                --sbindir=/usr/bin \
+                --with-systemdsystemunitdir=/usr/lib/systemd/system \
+                --enable-jpeg \
+                --enable-tjpeg \
+                --enable-fuse \
+                --enable-fdkaac \
+                --enable-opus \
+                --enable-rfxcodec \
+                --enable-mp3lame \
+                --enable-pixman \
+                --enable-painter \
+                --enable-vsock \
+                --enable-ipv6 \
+                --enable-pam-config=arch \
+                --enable-rdpsndaudin \
+                --with-imlib2
+
   # 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
+  sed -i -e "s| -shared | $LDFLAGS\0 |g" -e "s|    if test \"\$export_dynamic\" = yes && test -n \"\$export_dynamic_flag_spec\"; then|      func_append compile_command \" $LDFLAGS\"\n      func_append finalize_command \" $LDFLAGS\"\n\0|" libtool
+
+  make
+}
+
+check () {
+    cd "$srcdir/$_pkgname"
+
+    make check
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-  rm -f "$pkgdir"/etc/xrdp/rsakeys.ini
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+    cd "$srcdir/$_pkgname"
+
+    make DESTDIR="$pkgdir" install
+    install -Dm644 'COPYING' -t "$pkgdir/usr/share/licenses/$_pkgname"
+
+    rm "$pkgdir/etc/xrdp/rsakeys.ini"
 }
diff --git a/arch-config.diff b/arch-config.diff
index 946f25866ac2..522634d9ec3a 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,54 +1,55 @@
-diff -up src/xrdp-git/instfiles/xrdp.service.in.orig src/xrdp-git/instfiles/xrdp.service.in
---- src/xrdp-git/instfiles/xrdp.service.in.orig	2021-05-12 17:14:14.530000000 -0600
-+++ src/xrdp-git/instfiles/xrdp.service.in	2021-05-12 17:14:15.300000000 -0600
-@@ -7,10 +7,8 @@ After=network.target xrdp-sesman.service
+diff -up src/xrdp/instfiles/xrdp.service.in.orig src/xrdp/instfiles/xrdp.service.in
+--- src/xrdp/instfiles/xrdp.service.in.orig	2020-06-26 05:13:58.000000000 -0600
++++ src/xrdp/instfiles/xrdp.service.in	2021-05-12 17:06:31.680000000 -0600
+@@ -6,11 +6,9 @@ After=network.target xrdp-sesman.service
+
  [Service]
  Type=forking
- PIDFile=@localstatedir@/run/xrdp.pid
+-PIDFile=@localstatedir@/run/xrdp.pid
 -EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
 -EnvironmentFile=-@sysconfdir@/default/xrdp
 -ExecStart=@sbindir@/xrdp $XRDP_OPTIONS
 -ExecStop=@sbindir@/xrdp $XRDP_OPTIONS --kill
++PIDFile=/run/xrdp.pid
 +ExecStart=@sbindir@/xrdp
 +ExecStop=@sbindir@/xrdp --kill
- 
+
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-git/instfiles/xrdp-sesman.service.in.orig src/xrdp-git/instfiles/xrdp-sesman.service.in
---- src/xrdp-git/instfiles/xrdp-sesman.service.in.orig	2021-05-12 17:14:14.530000000 -0600
-+++ src/xrdp-git/instfiles/xrdp-sesman.service.in	2021-05-12 17:14:15.310000000 -0600
-@@ -8,10 +8,8 @@ BindsTo=xrdp.service
+diff -up src/xrdp/instfiles/xrdp-sesman.service.in.orig src/xrdp/instfiles/xrdp-sesman.service.in
+--- src/xrdp/instfiles/xrdp-sesman.service.in.orig	2020-06-26 05:13:58.000000000 -0600
++++ src/xrdp/instfiles/xrdp-sesman.service.in	2021-05-12 17:06:31.690000000 -0600
+@@ -7,12 +7,10 @@ BindsTo=xrdp.service
+
  [Service]
  Type=forking
- PIDFile=@localstatedir@/run/xrdp-sesman.pid
+-PIDFile=@localstatedir@/run/xrdp-sesman.pid
 -EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
 -EnvironmentFile=-@sysconfdir@/default/xrdp
 -ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS
 -ExecStop=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --kill
+-ExecReload=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --reload
++PIDFile=/run/xrdp-sesman.pid
 +ExecStart=@sbindir@/xrdp-sesman
 +ExecStop=@sbindir@/xrdp-sesman --kill
- 
++ExecReload=@sbindir@/xrdp-sesman --reload
+
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-git/sesman/sesman.ini.in.orig src/xrdp-git/sesman/sesman.ini.in
---- src/xrdp-git/sesman/sesman.ini.in.orig	2021-05-12 17:14:14.880000000 -0600
-+++ src/xrdp-git/sesman/sesman.ini.in	2021-05-12 17:15:56.580000000 -0600
-@@ -94,7 +94,7 @@ EnableSyslog=true
- ; CentOS 7              :  param=/usr/bin/Xorg or param=Xorg
- ; CentOS 8              :  param=/usr/libexec/Xorg
- ;
--param=Xorg
-+param=/usr/lib/Xorg
- ; Leave the rest paramaters as-is unless you understand what will happen.
- param=-config
- param=xrdp/xorg.conf
-diff -up src/xrdp-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh
---- src/xrdp-git/sesman/startwm.sh.orig	2021-05-12 17:14:14.890000000 -0600
-+++ src/xrdp-git/sesman/startwm.sh	2021-05-12 17:14:15.310000000 -0600
-@@ -63,6 +63,21 @@ wm_start()
+diff -up src/xrdp/sesman/startwm.sh.orig src/xrdp/sesman/startwm.sh
+--- src/xrdp/sesman/startwm.sh.orig	2020-12-28 07:03:43.000000000 -0700
++++ src/xrdp/sesman/startwm.sh	2021-05-12 17:06:31.690000000 -0600
+@@ -75,11 +75,26 @@ get_xdg_session_startupcmd()
+ #start the window manager
+ wm_start()
+ {
+-  if [ -r /etc/default/locale ]; then
+-    . /etc/default/locale
++  if [ -r /etc/locale.conf ]; then
++    . /etc/locale.conf
      export LANG LANGUAGE
    fi
- 
+
 +  # arch user
 +  if [ -r ~/.xinitrc ]; then
 +    pre_start
diff --git a/archlinux.bmp b/archlinux.bmp
deleted file mode 100644
index f50beae8c1f1..000000000000
--- a/archlinux.bmp
+++ /dev/null
author	Jat	2023-04-28 10:44:23 +0800
committer	Jat	2023-04-28 10:44:23 +0800
commit	7ea48069084f48d300296a0abc6ee79e9146b762 (patch)
tree	69d9f22ae91d073df8cbd758d2905ebd3b4dbb31
parent	0dbdaba9f22e9d4a563e5c6935ec7b0b90f3e946 (diff)
download	aur-7ea48069084f48d300296a0abc6ee79e9146b762.tar.gz