- rediff config patch

- disable Werror due to deprecated OpenSSL APIs used here
- rel 3

diff --git a/config.patch b/config.patch
index 06d8ce82059daa2f0f517ca597ecf3d06fc2fb7e..15fd951eb840c08d932824e6afd8f12e283e6ba8 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,7 +1,7 @@
-diff -ur xrdp-0.9.7.orig/sesman/sesman.ini xrdp-0.9.7/sesman/sesman.ini
---- xrdp-0.9.7.orig/sesman/sesman.ini  2018-06-29 08:18:27.000000000 +0000
-+++ xrdp-0.9.7/sesman/sesman.ini       2018-09-06 09:10:42.289218472 +0000
-@@ -12,13 +12,13 @@
+diff -urNp -x '*.orig' xrdp-0.9.14.org/sesman/sesman.ini xrdp-0.9.14/sesman/sesman.ini
+--- xrdp-0.9.14.org/sesman/sesman.ini  2020-08-31 08:33:40.000000000 +0200
++++ xrdp-0.9.14/sesman/sesman.ini      2021-10-03 00:01:41.525736996 +0200
+@@ -12,13 +12,13 @@ DefaultWindowManager=startwm.sh
  ReconnectScript=reconnectwm.sh
  
  [Security]
@@ -19,7 +19,7 @@ diff -ur xrdp-0.9.7.orig/sesman/sesman.ini xrdp-0.9.7/sesman/sesman.ini
  ; When RestrictOutboundClipboard=true clipboard from the
  ; server is not pushed to the client.
  RestrictOutboundClipboard=false
-@@ -55,10 +55,10 @@
+@@ -64,10 +64,10 @@ IdleTimeLimit=0
  Policy=Default
  
  [Logging]
@@ -33,7 +33,7 @@ diff -ur xrdp-0.9.7.orig/sesman/sesman.ini xrdp-0.9.7/sesman/sesman.ini
  
  ;
  ; Session definitions - startup command-line parameters for each session type
-@@ -81,8 +81,8 @@
+@@ -92,8 +92,8 @@ param=xrdp/xorg.conf
  param=-noreset
  param=-nolisten
  param=tcp
@@ -42,12 +42,12 @@ diff -ur xrdp-0.9.7.orig/sesman/sesman.ini xrdp-0.9.7/sesman/sesman.ini
 +#param=-logfile
 +#param=.xorgxrdp.%s.log
  
- [X11rdp]
- param=X11rdp
-diff -ur xrdp-0.9.7.orig/xrdp/xrdp.ini xrdp-0.9.7/xrdp/xrdp.ini
---- xrdp-0.9.7.orig/xrdp/xrdp.ini      2018-06-29 08:18:27.000000000 +0000
-+++ xrdp-0.9.7/xrdp/xrdp.ini   2018-09-06 09:13:13.540216769 +0000
-@@ -4,6 +4,8 @@
+ [Xvnc]
+ param=Xvnc
+diff -urNp -x '*.orig' xrdp-0.9.14.org/xrdp/xrdp.ini xrdp-0.9.14/xrdp/xrdp.ini
+--- xrdp-0.9.14.org/xrdp/xrdp.ini      2020-08-31 08:33:40.000000000 +0200
++++ xrdp-0.9.14/xrdp/xrdp.ini  2021-10-03 00:01:41.525736996 +0200
+@@ -4,6 +4,8 @@ ini_version=1
  
  ; fork a new process for each incoming connection
  fork=true
@@ -56,7 +56,7 @@ diff -ur xrdp-0.9.7.orig/xrdp/xrdp.ini xrdp-0.9.7/xrdp/xrdp.ini
  
  ; ports to listen on, number alone means listen on all interfaces
  ; 0.0.0.0 or :: if ipv6 is configured
-@@ -118,10 +120,10 @@
+@@ -143,10 +145,10 @@ ls_btn_cancel_width=85
  ls_btn_cancel_height=30
  
  [Logging]
@@ -70,7 +70,7 @@ diff -ur xrdp-0.9.7.orig/xrdp/xrdp.ini xrdp-0.9.7/xrdp/xrdp.ini
  ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
  
  [Channels]
-@@ -155,14 +155,14 @@
+@@ -178,14 +180,14 @@ tcutils=true
  ; Some session types such as Xorg, X11rdp 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.
@@ -93,9 +93,9 @@ diff -ur xrdp-0.9.7.orig/xrdp/xrdp.ini xrdp-0.9.7/xrdp/xrdp.ini
  
  [Xvnc]
  name=Xvnc
-@@ -174,25 +174,25 @@
- #xserverbpp=24
- #delay_ms=2000
+@@ -201,25 +203,25 @@ port=-1
+ #disabled_encodings_mask=0
+ 
  
 -[vnc-any]
 -name=vnc-any

diff --git a/openssl3.patch b/openssl3.patch
new file mode 100644 (file)
index 0000000..15288c5
--- /dev/null
+++ b/openssl3.patch
@@ -0,0 +1,12 @@
+--- xrdp-0.9.14/configure.ac~  2020-08-31 08:06:13.000000000 +0200
++++ xrdp-0.9.14/configure.ac   2021-10-03 00:18:09.863644956 +0200
+@@ -156,9 +156,6 @@
+ AX_CFLAGS_WARN_ALL
+ AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
+ 
+-AM_COND_IF([LINUX],
+-  [AX_APPEND_COMPILE_FLAGS([-Werror])]) # bsd has warnings that have not been fixed yet
+-
+ AM_COND_IF([XRDP_DEBUG],
+   [AX_APPEND_COMPILE_FLAGS([-g -O0])],
+   [AX_APPEND_COMPILE_FLAGS([-O2])])

diff --git a/xrdp.spec b/xrdp.spec
index d561595a442d37aaa3e9193d41eb0e4f232a39de..de2049737cdedcb8bc4b0bfe9f4bc9eb4996b2bd 100644 (file)
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -2,7 +2,7 @@ Summary:        Remote desktop server
 Summary(pl.UTF-8):     Serwer remote desktop
 Name:          xrdp
 Version:       0.9.14
-Release:       2
+Release:       3
 License:       Apache v2.0
 Group:         X11/Applications/Networking
 #Source0Download: https://github.com/neutrinolabs/xrdp/releases
@@ -17,6 +17,7 @@ Patch0:               config.patch
 Patch1:                quiet.patch
 Patch2:                x32.patch
 Patch3:                %{name}-int_ptr.patch
+Patch4:                openssl3.patch
 URL:           http://xrdp.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.7.2
@@ -109,6 +110,7 @@ Statyczne biblioteki xrdp.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 install %{SOURCE3} README.PLD
 install %{SOURCE4} README.PLD.pl