[packages/xrdp] - up to 0.10.0
mrozowik
mrozowik at pld-linux.org
Thu May 23 09:32:29 CEST 2024
commit 2896d6549e89ef7ba0d3c0ba513361cd9d3130e4
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Thu May 23 06:16:49 2024 +0000
- up to 0.10.0
config.patch | 26 ++++++++++++--------------
xrdp.spec | 50 ++++++++++++++++++--------------------------------
2 files changed, 30 insertions(+), 46 deletions(-)
---
diff --git a/xrdp.spec b/xrdp.spec
index 568731a..1f15533 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -1,13 +1,13 @@
Summary: Remote desktop server
Summary(pl.UTF-8): Serwer remote desktop
Name: xrdp
-Version: 0.9.25
+Version: 0.10.0
Release: 1
License: Apache v2.0
Group: X11/Applications/Networking
#Source0Download: https://github.com/neutrinolabs/xrdp/releases
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 2003b90ea01b36bf010bfd4c0d91f6f7
+# Source0-md5: 2221e0a307fbf553d6d99416496525ab
Source1: %{name}.init
Source2: %{name}.pamd
Source3: %{name}.README.PLD
@@ -17,7 +17,7 @@ Patch0: config.patch
Patch1: quiet.patch
Patch2: x32.patch
URL: https://www.xrdp.org/
-BuildRequires: autoconf >= 2.65
+BuildRequires: autoconf >= 2.69
BuildRequires: automake >= 1:1.7.2
BuildRequires: fdk-aac-devel >= 0.1.0
BuildRequires: imlib2-devel >= 1.4.5
@@ -41,7 +41,6 @@ Requires(post,preun,postun): systemd-units >= 38
Requires(postun): /usr/sbin/groupdel
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
-Requires: %{name}-libs = %{version}-%{release}
Requires: /usr/bin/Xvnc
Requires: fdk-aac >= 0.1.0
Requires: imlib2 >= 1.4.5
@@ -51,6 +50,7 @@ Requires: pixman >= 0.1.0
Requires: rc-scripts
Requires: systemd-units >= 38
Requires: xinitrc-ng
+Obsoletes: xrdp-libs < 0.10
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -70,22 +70,10 @@ klientami protokołu rdp Microsoftu.
xrdp używa jako backendu Xvnc lub X11rdp.
-%package libs
-Summary: xrdp shared libraries
-Summary(pl.UTF-8): Biblioteki współdzielone xrdp
-Group: Libraries
-
-%description libs
-xrdp shared libraries.
-
-%description libs -l pl.UTF-8
-Biblioteki współdzielone xrdp.
-
%package devel
Summary: Header files for xrdp libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek xrdp
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
%description devel
Header files for xrdp libraries.
@@ -156,14 +144,14 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},/etc/{pam.d,rc.d/init.d,securi
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/xrdp
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sesman
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/xrdp
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sesman
%{__rm} $RPM_BUILD_ROOT/etc/pam.d/xrdp-sesman
%{__ln_s} sesman $RPM_BUILD_ROOT/etc/pam.d/xrdp-sesman
:> $RPM_BUILD_ROOT/etc/security/blacklist.sesman
%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/startwm.sh
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/startwm.sh
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/startwm.sh
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.{a,la}
# obsoleted by pkg-config
@@ -193,9 +181,6 @@ fi
%clean
rm -rf $RPM_BUILD_ROOT
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
%files
%defattr(644,root,root,755)
%doc COPYING NEWS.md README.md README.PLD
@@ -217,6 +202,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_sysconfdir}/xrdp/reconnectwm.sh
%attr(755,root,root) %{_sysconfdir}/xrdp/startwm.sh
%attr(755,root,root) %{_bindir}/xrdp-dis
+%attr(755,root,root) %{_bindir}/xrdp-dumpfv1
%attr(755,root,root) %{_bindir}/xrdp-genkeymap
%attr(755,root,root) %{_bindir}/xrdp-keygen
%attr(755,root,root) %{_bindir}/xrdp-sesadmin
@@ -226,12 +212,17 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_sbindir}/xrdp-sesman
%dir %{_libdir}/xrdp
%attr(755,root,root) %{_libdir}/xrdp/libcommon.so*
+%attr(755,root,root) %{_libdir}/xrdp/libipm.so*
%attr(755,root,root) %{_libdir}/xrdp/libmc.so*
-%attr(755,root,root) %{_libdir}/xrdp/libscp.so*
+%attr(755,root,root) %{_libdir}/xrdp/libsesman.so*
+%attr(755,root,root) %{_libdir}/xrdp/libtoml.so*
%attr(755,root,root) %{_libdir}/xrdp/libvnc.so*
%attr(755,root,root) %{_libdir}/xrdp/libxrdp.so*
%attr(755,root,root) %{_libdir}/xrdp/libxrdpapi.so*
%attr(755,root,root) %{_libdir}/xrdp/libxup.so*
+%dir %{_prefix}/libexec/xrdp
+%attr(755,root,root) %{_prefix}/libexec/xrdp/waitforx
+%attr(755,root,root) %{_prefix}/libexec/xrdp/xrdp-sesexec
%{systemdunitdir}/xrdp.service
%{systemdunitdir}/xrdp-sesman.service
%dir %{_datadir}/xrdp
@@ -243,10 +234,14 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/xrdp/xrdp24b.bmp
%{_datadir}/xrdp/xrdp256.bmp
%{_datadir}/xrdp/xrdp_logo.bmp
+%{_datadir}/xrdp/README.logo
+%{_datadir}/xrdp/sans-18.fv1
+%{_datadir}/xrdp/xrdp_logo.png
%{_mandir}/man1/xrdp-dis.1*
%{_mandir}/man5/sesman.ini.5*
%{_mandir}/man5/xrdp.ini.5*
%{_mandir}/man8/xrdp-chansrv.8*
+%{_mandir}/man8/xrdp-dumpfv1.8*
%{_mandir}/man8/xrdp-genkeymap.8*
%{_mandir}/man8/xrdp-keygen.8*
%{_mandir}/man8/xrdp-sesadmin.8*
@@ -254,17 +249,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/xrdp-sesrun.8*
%{_mandir}/man8/xrdp.8*
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpainter.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpainter.so.0
-%attr(755,root,root) %{_libdir}/librfxencode.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librfxencode.so.0
-
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpainter.so
-%attr(755,root,root) %{_libdir}/librfxencode.so
%{_includedir}/ms-*.h
%{_includedir}/painter.h
%{_includedir}/rfxcodec_common.h
diff --git a/config.patch b/config.patch
index bff09f1..e9b4f8d 100644
--- a/config.patch
+++ b/config.patch
@@ -1,5 +1,5 @@
---- xrdp-0.9.19/sesman/sesman.ini~ 2022-03-17 06:21:20.000000000 +0000
-+++ xrdp-0.9.19/sesman/sesman.ini 2022-03-22 06:06:23.939319489 +0000
+--- xrdp-0.10.0/sesman/sesman.ini~ 2024-05-10 14:14:05.000000000 +0000
++++ xrdp-0.10.0/sesman/sesman.ini 2024-05-22 22:27:17.925196022 +0000
@@ -12,13 +12,13 @@
ReconnectScript=reconnectwm.sh
@@ -18,7 +18,7 @@
; When RestrictOutboundClipboard=all clipboard from the
; server is not pushed to the client.
; In addition, you can control text/file/image transfer restrictions
-@@ -65,10 +65,10 @@
+@@ -109,10 +109,10 @@
[Logging]
; Note: Log levels can be any of: core, error, warning, info, debug, or trace
@@ -31,7 +31,7 @@
#EnableConsole=false
#ConsoleLevel=INFO
#EnableProcessId=false
-@@ -102,8 +102,8 @@
+@@ -147,8 +147,8 @@
param=-noreset
param=-nolisten
param=tcp
@@ -42,8 +42,8 @@
[Xvnc]
param=Xvnc
---- xrdp-0.9.18.1/xrdp/xrdp.ini~ 2022-02-07 13:41:27.000000000 +0000
-+++ xrdp-0.9.18.1/xrdp/xrdp.ini 2022-02-22 17:22:28.239696963 +0000
+--- xrdp-0.10.0/xrdp/xrdp.ini~ 2024-05-10 14:14:05.000000000 +0000
++++ xrdp-0.10.0/xrdp/xrdp.ini 2024-05-22 22:32:36.840354476 +0000
@@ -4,6 +4,8 @@
; fork a new process for each incoming connection
@@ -53,7 +53,7 @@
; ports to listen on, number alone means listen on all interfaces
; 0.0.0.0 or :: if ipv6 is configured
-@@ -178,10 +180,10 @@
+@@ -195,10 +197,10 @@
[Logging]
; Note: Log levels can be any of: core, error, warning, info, debug, or trace
@@ -66,8 +66,8 @@
#EnableConsole=false
#ConsoleLevel=INFO
#EnableProcessId=false
-@@ -218,14 +220,14 @@
- ; Some session types such as Xorg, X11rdp and Xvnc start a display server.
+@@ -234,13 +236,13 @@
+ ; Some session types such as Xorg and Xvnc start a display server.
; Startup command-line parameters for the display server are configured
; in sesman.ini. See and configure also sesman.ini.
-[Xorg]
@@ -75,7 +75,6 @@
-lib=libxup.so
-username=ask
-password=ask
--ip=127.0.0.1
-port=-1
-code=20
+#[Xorg]
@@ -83,13 +82,12 @@
+#lib=libxup.so
+#username=ask
+#password=ask
-+#ip=127.0.0.1
+#port=-1
+#code=20
[Xvnc]
name=Xvnc
-@@ -247,13 +249,13 @@
+@@ -262,13 +264,13 @@
; Generic VNC Proxy
; Tailor this to specific hosts and VNC instances by specifying an ip
; and port and setting a suitable name.
@@ -109,8 +107,8 @@
+#password=ask
#pamusername=asksame
#pampassword=asksame
- #pamsessionmng=127.0.0.1
-@@ -262,15 +264,15 @@
+ #delay_ms=2000
+@@ -276,15 +278,15 @@
; Generic RDP proxy using NeutrinoRDP
; Tailor this to specific hosts by specifying an ip and port and setting
; a suitable name.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xrdp.git/commitdiff/2896d6549e89ef7ba0d3c0ba513361cd9d3130e4
More information about the pld-cvs-commit
mailing list