- updated to 0.10.0

diff --git a/config.patch b/config.patch
index 02c2704cb73d9ca85eb4c2a4d89ccd1f54458981..fddebd73f6fef65b88808fed32294581b4d411e0 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,6 @@
-diff -ur xrdp-0.9.19.orig/sesman/sesman.ini xrdp-0.9.19/sesman/sesman.ini
---- xrdp-0.9.19.orig/sesman/sesman.ini 2022-03-17 07:21:20.000000000 +0100
-+++ xrdp-0.9.19/sesman/sesman.ini      2022-04-01 00:52:52.926266171 +0200
+diff -ur xrdp-0.10.0.orig/sesman/sesman.ini xrdp-0.10.0/sesman/sesman.ini
+--- xrdp-0.10.0.orig/sesman/sesman.ini 2024-05-10 16:14:05.000000000 +0200
++++ xrdp-0.10.0/sesman/sesman.ini      2024-06-13 19:35:30.492411263 +0200
 @@ -12,13 +12,13 @@
  ReconnectScript=reconnectwm.sh
  
@@ -19,7 +19,7 @@ diff -ur xrdp-0.9.19.orig/sesman/sesman.ini xrdp-0.9.19/sesman/sesman.ini
  ; When RestrictOutboundClipboard=all clipboard from the
  ; server is not pushed to the client.
  ; In addition, you can control text/file/image transfer restrictions
-@@ -80,13 +80,13 @@
+@@ -109,13 +109,13 @@
  
  [Logging]
  ; Note: Log levels can be any of: core, error, warning, info, debug, or trace
@@ -38,7 +38,7 @@ diff -ur xrdp-0.9.19.orig/sesman/sesman.ini xrdp-0.9.19/sesman/sesman.ini
  
  [LoggingPerLogger]
  ; Note: per logger configuration is only used if xrdp is built with
-@@ -117,8 +117,8 @@
+@@ -147,8 +147,8 @@
  param=-noreset
  param=-nolisten
  param=tcp
@@ -49,9 +49,9 @@ diff -ur xrdp-0.9.19.orig/sesman/sesman.ini xrdp-0.9.19/sesman/sesman.ini
  
  [Xvnc]
  param=Xvnc
-diff -ur xrdp-0.9.19.orig/xrdp/xrdp.ini xrdp-0.9.19/xrdp/xrdp.ini
---- xrdp-0.9.19.orig/xrdp/xrdp.ini     2022-03-17 07:16:35.000000000 +0100
-+++ xrdp-0.9.19/xrdp/xrdp.ini  2022-04-01 00:53:37.547367844 +0200
+diff -ur xrdp-0.10.0.orig/xrdp/xrdp.ini xrdp-0.10.0/xrdp/xrdp.ini
+--- xrdp-0.10.0.orig/xrdp/xrdp.ini     2024-05-10 16:14:05.000000000 +0200
++++ xrdp-0.10.0/xrdp/xrdp.ini  2024-06-13 19:36:33.477301111 +0200
 @@ -5,6 +5,9 @@
  ; fork a new process for each incoming connection
  fork=true
@@ -62,7 +62,7 @@ diff -ur xrdp-0.9.19.orig/xrdp/xrdp.ini xrdp-0.9.19/xrdp/xrdp.ini
  ; ports to listen on, number alone means listen on all interfaces
  ; 0.0.0.0 or :: if ipv6 is configured
  ; space between multiple occurrences
-@@ -178,13 +181,13 @@
+@@ -195,13 +198,13 @@
  
  [Logging]
  ; Note: Log levels can be any of: core, error, warning, info, debug, or trace
@@ -81,8 +81,8 @@ diff -ur xrdp-0.9.19.orig/xrdp/xrdp.ini xrdp-0.9.19/xrdp/xrdp.ini
  
  [LoggingPerLogger]
  ; Note: per logger configuration is only used if xrdp is built with
-@@ -218,14 +221,15 @@
- ; Some session types such as Xorg, X11rdp and Xvnc start a display server.
+@@ -234,13 +237,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]
@@ -90,22 +90,19 @@ diff -ur xrdp-0.9.19.orig/xrdp/xrdp.ini xrdp-0.9.19/xrdp/xrdp.ini
 -lib=libxup.so
 -username=ask
 -password=ask
--ip=127.0.0.1
 -port=-1
 -code=20
-+
 +#[Xorg]
 +#name=Xorg
 +#lib=libxup.so
 +#username=ask
 +#password=ask
-+#ip=127.0.0.1
 +#port=-1
 +#code=20
  
  [Xvnc]
  name=Xvnc
-@@ -247,13 +251,13 @@
+@@ -262,13 +265,13 @@
  ; Generic VNC Proxy
  ; Tailor this to specific hosts and VNC instances by specifying an ip
  ; and port and setting a suitable name.
@@ -125,8 +122,8 @@ diff -ur xrdp-0.9.19.orig/xrdp/xrdp.ini xrdp-0.9.19/xrdp/xrdp.ini
 +#password=ask
  #pamusername=asksame
  #pampassword=asksame
- #pamsessionmng=127.0.0.1
-@@ -262,15 +266,15 @@
+ #delay_ms=2000
+@@ -276,15 +279,15 @@
  ; Generic RDP proxy using NeutrinoRDP
  ; Tailor this to specific hosts by specifying an ip and port and setting
  ; a suitable name.

diff --git a/quiet.patch b/quiet.patch
index 2dd922239b003568581c619ba76470cc519a0785..0f2359daeb2f961d8d2f2236e199f68bdae487bb 100644 (file)
--- a/quiet.patch
+++ b/quiet.patch
@@ -1,7 +1,7 @@
-diff -ur xrdp-0.9.19.orig/xrdp/xrdp.c xrdp-0.9.19/xrdp/xrdp.c
---- xrdp-0.9.19.orig/xrdp/xrdp.c       2022-03-17 07:19:24.000000000 +0100
-+++ xrdp-0.9.19/xrdp/xrdp.c    2022-04-01 00:54:41.104512664 +0200
-@@ -504,7 +504,7 @@
+diff -ur xrdp-0.10.0.orig/xrdp/xrdp.c xrdp-0.10.0/xrdp/xrdp.c
+--- xrdp-0.10.0.orig/xrdp/xrdp.c       2024-05-10 16:13:36.000000000 +0200
++++ xrdp-0.10.0/xrdp/xrdp.c    2024-06-13 21:48:24.249262920 +0200
+@@ -368,7 +368,7 @@
  
      if (startup_params.kill)
      {
@@ -10,7 +10,7 @@ diff -ur xrdp-0.9.19.orig/xrdp/xrdp.c xrdp-0.9.19/xrdp/xrdp.c
          /* read the xrdp.pid file */
          fd = -1;
  
-@@ -522,7 +522,7 @@
+@@ -386,7 +386,7 @@
              g_memset(text, 0, 32);
              g_file_read(fd, text, 31);
              pid = g_atoi(text);

diff --git a/xrdp.spec b/xrdp.spec
index aea575b2d8b9b15db068f1bed7e8b401427168dd..96c71dab7fd953d54813c08d89ab4077603f1507 100644 (file)
--- 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.1
+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: f30ad85ce78c8542d4f7b03c28c8815f
+# Source0-md5: 2221e0a307fbf553d6d99416496525ab
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.README.TLD
@@ -39,7 +39,6 @@ Requires(post,preun): /sbin/chkconfig
 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
@@ -48,6 +47,7 @@ Requires:     openssl >= 0.9.8
 Requires:      pixman >= 0.1.0
 Requires:      rc-scripts
 Requires:      xinitrc-ng
+Obsoletes:     xrdp-libs < 0.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -67,22 +67,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.
@@ -187,9 +175,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.TLD
@@ -211,6 +196,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
@@ -221,24 +207,33 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/xrdp
 %attr(755,root,root) %{_libdir}/xrdp/libcommon.so*
 %attr(755,root,root) %{_libdir}/xrdp/libmc.so*
-%attr(755,root,root) %{_libdir}/xrdp/libscp.so*
+%attr(755,root,root) %{_libdir}/xrdp/libipm.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
 %dir %{_datadir}/xrdp
 %{_datadir}/xrdp/ad24b.bmp
 %{_datadir}/xrdp/ad256.bmp
 %{_datadir}/xrdp/cursor0.cur
 %{_datadir}/xrdp/cursor1.cur
 %{_datadir}/xrdp/sans-10.fv1
+%{_datadir}/xrdp/sans-18.fv1
 %{_datadir}/xrdp/xrdp24b.bmp
 %{_datadir}/xrdp/xrdp256.bmp
 %{_datadir}/xrdp/xrdp_logo.bmp
+%{_datadir}/xrdp/xrdp_logo.png
+%{_datadir}/xrdp/README.logo
 %{_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*
@@ -246,17 +241,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