From b7b366bd29b76da2c741117cc8e2181a265ed144da02602a94339f8c8693c178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 27 Mar 2018 12:47:28 +0000
Subject: [PATCH] Accepting request 591500 from
 home:zhangxiaofei:branches:X11:RemoteDesktop

- Update to version 0.9.6
- Enable IPv6 (boo#1083105)

OBS-URL: https://build.opensuse.org/request/show/591500
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=36
---
 xrdp-0.9.5.tar.gz     |  3 ---
 xrdp-0.9.5.tar.gz.asc | 16 ----------------
 xrdp-0.9.6.tar.gz     |  3 +++
 xrdp-0.9.6.tar.gz.asc | 16 ++++++++++++++++
 xrdp.changes          | 20 ++++++++++++++++++++
 xrdp.spec             |  3 ++-
 6 files changed, 41 insertions(+), 20 deletions(-)
 delete mode 100644 xrdp-0.9.5.tar.gz
 delete mode 100644 xrdp-0.9.5.tar.gz.asc
 create mode 100644 xrdp-0.9.6.tar.gz
 create mode 100644 xrdp-0.9.6.tar.gz.asc

diff --git a/xrdp-0.9.5.tar.gz b/xrdp-0.9.5.tar.gz
deleted file mode 100644
index d4bc4e8..0000000
--- a/xrdp-0.9.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c66b06204237745be3f0a75bfdd22a2b27de97740490256964bb5082efb0042
-size 3082700
diff --git a/xrdp-0.9.5.tar.gz.asc b/xrdp-0.9.5.tar.gz.asc
deleted file mode 100644
index 1bbdd7a..0000000
--- a/xrdp-0.9.5.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEYezqu/K7QOOjXfMKn3LNvAG/EOsFAlpDsoAACgkQn3LNvAG/
-EOteVw/7B0IejeTHWlnk4XZ9bSSX6v6n3QPDbAAPa9tPW4gzS8pIbteOUXmPv4Dx
-88LVgn80U3rjU+Dkm3F7unfqV7Ath8xQjzPSS98YkMwYKTKDqMtr0RNY6/+CMKBH
-6GN1jSCcKNd+wqCLA4+ySdMO5/llL8r3qmNrOAllSd6THcxyTcVNLF9b73J5RObU
-okbTK0lz6KUDHyiCiibHfKbgm0hpowIzsNiKiBzlmaaHdpkNKW1Z93DyT5DXJFse
-wjiy3FCGSB/KLv07015ZH72jkNetttgZ/GKGozFWWbdPrl39NjJlJMyzv+LU152x
-5tEAYdblyVdGQMDFwxwXMA685EIk1D7ee098d+JmsPhujMy89+GLf1hD/obr2yCk
-DrvTgPyTJpK8YXHDomg0NKwGdiilh3oMcv4/IgVKdqqTUqQXOnkcLmm7PSBy6c8Q
-tWRVz23xUhqoBbvLTL48REuCx3QyjS2zQnh1UQ/WBNkpwpSSV3ePlgLyqhT3lFNR
-kWa0SD6lwODPih2U1VJs9q8J4l905ZjAr9jTNF4v3WFRrIyZANs1je9y+EkCCneS
-/sBeo5RaBGEZtufA3XrUiWig8jvMPZssmFcvtqe83KB5sxaNrBmb/eCBHLwcjVdp
-5SJjH672FmCGDw0EFwcu9+QGbhajckFjlBVvCS5m9Np8MGKn9xc=
-=wQUi
------END PGP SIGNATURE-----
diff --git a/xrdp-0.9.6.tar.gz b/xrdp-0.9.6.tar.gz
new file mode 100644
index 0000000..4f3eca7
--- /dev/null
+++ b/xrdp-0.9.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7d0d5bb3fe090f4c9d8984508e446b8b64a39bf098cda0ab2c5b95ef9291c91
+size 3078001
diff --git a/xrdp-0.9.6.tar.gz.asc b/xrdp-0.9.6.tar.gz.asc
new file mode 100644
index 0000000..2262d00
--- /dev/null
+++ b/xrdp-0.9.6.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEYezqu/K7QOOjXfMKn3LNvAG/EOsFAlq4jUUACgkQn3LNvAG/
+EOuetA//bfgYcUehiAzaOFbft88nQjeYW3dURTH4jhz2Dvy7R86RgvsPdJoNZiV8
+caOET9o+EHK4XNs4GHwgxuNNkFxtwyiiTRFN8c5HUbWsUd53FZT4WR35CCXcVo2B
+WpBJMkp8gyidFB5bNtVaUDP7s7DFBgo+7QwdLCjqTN/Yj3hO9Q61bNcLxuuG9OOo
+SSBdAnrxC7VDeqKrErAnySzHHn5ro8e7Jiu0drzPTb6QtHY54kUVt0bT7dS3bk4V
+B677MaoPltAmwlaLZPfUJR7HHXhTiFeyQLqd247gIsWEKvSFCvQx4hiTYJWAJy7c
+YBHUMjl3F0twSn5Tvhgt1GIlDGFZ9j841dsRHbuWjezRlIVaVL9mDMNiAO6JjskP
+REVLqDc7VhSlPS3PF32MbdiDO01TcdiXF000NeniJmL7RpkYEW8efIvvNADY3Ens
+rs9UUx5HuCDHfvJYtylWO2dMM4wh9FouQton1a+bIZXu4MswClq4+aeFUy57V4vm
+jVPKgghz831sOKDztMgWk9ZcZlL4xHvSc4PqO47UEEDvmduI/hoXLIwRq4iTayr/
+BmtTjiXwSPkYGwJHAjZawwr9Pa3tUybLHV06QkdT3gTyC7kJiSmozQeIsfGddhXb
+LMauLJNlbteusEo1ks3F+k41bekcKrQ0XUkKndvXXRC1k/JZPps=
+=9ElU
+-----END PGP SIGNATURE-----
diff --git a/xrdp.changes b/xrdp.changes
index 7060f57..6b08c3b 100644
--- a/xrdp.changes
+++ b/xrdp.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Mar 27 03:05:52 UTC 2018 - fezhang@suse.com
+
+- Update to version 0.9.6
+  + Compatibility notice
+    - Exclamation mark has been removed from comment out symbol of
+      config files #1033
+  + Bug fixes
+    - Make listen check before daemon fork #988
+    - Fix xrdp sometimes become zombie processes #1000
+    - Include hostname in sesman password file name #1006 #1007
+      #1076
+    - Fix default startwm.sh to use bash explicitly #1009 #1049
+  + Other changes
+    - Add Swiss French keyboard #1053
+    - Improve perfect forward secrecy, explicitly enable ECDHE/DHE
+      #1024 #1052 #1063
+    - Lots of leak fixes, cleanups and refactoring
+- Enable IPv6 (boo#1083105)
+
 -------------------------------------------------------------------
 Thu Mar 22 10:21:51 UTC 2018 - fezhang@suse.com
 
diff --git a/xrdp.spec b/xrdp.spec
index e74f078..f9b39e8 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -23,7 +23,7 @@
 
 %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 Name:           xrdp
-Version:        0.9.5
+Version:        0.9.6
 Release:        0
 Summary:        Remote desktop protocol (RDP) server
 License:        Apache-2.0 and GPL-2.0+
@@ -112,6 +112,7 @@ This package contains libraries for the JPEG2000 codec for RDP.
 %build
 sh ./bootstrap
 %configure \
+   --enable-ipv6 \
    --with-systemdsystemunitdir=%{_unitdir}
 make %{?_smp_mflags}