$ git show --format=fuller --patch-with-stat --summary bb721dcc22f8d2e16f1e345e2043abbb785423ad
commit bb721dcc22f8d2e16f1e345e2043abbb785423ad
Author: Alex <alexander@mezon.ru>
AuthorDate: Thu Nov 14 00:04:11 2019 +0000
Commit: Alex <alexander@mezon.ru>
CommitDate: Thu Nov 14 00:04:11 2019 +0000
new pkg
---
.abf.yml | 2 +-
make-fix.patch | 24 +++
openssl.conf | 46 +++++
xrdp-0.4.0-docs.patch | 16 --
xrdp-0.4.0-mdv_libifictions.diff | 173 -----------------
xrdp-0.4.0-sesman.patch | 69 -------
xrdp-0.4.0-sesmantools.patch | 21 --
xrdp-0.4.1-fix-link.patch | 90 ---------
xrdp-0.4.1-wformat_fix.diff | 11 --
xrdp-0.9.10-scripts-libexec.patch | 37 ++++
xrdp-0.9.2-setpriv.patch | 55 ++++++
xrdp-0.9.4-service.patch | 49 +++++
xrdp-0.9.6-script-interpreter.patch | 9 +
xrdp-0.9.9-sesman.patch | 12 ++
xrdp-0.9.9-xrdp-ini.patch | 43 ++++
xrdp-mdv_conf.diff | 22 ---
xrdp-no_rpath.diff | 24 ---
xrdp-optflags.diff | 96 ---------
xrdp-sesman.pamd | 5 +
xrdp-window_managers.diff | 15 --
xrdp.init | 107 ----------
xrdp.logrotate | 7 +-
xrdp.spec | 378 ++++++++++++++++++------------------
xrdp.sysconfig | 4 +-
24 files changed, 469 insertions(+), 846 deletions(-)
create mode 100644 make-fix.patch
create mode 100644 openssl.conf
delete mode 100644 xrdp-0.4.0-docs.patch
delete mode 100644 xrdp-0.4.0-mdv_libifictions.diff
delete mode 100644 xrdp-0.4.0-sesman.patch
delete mode 100644 xrdp-0.4.0-sesmantools.patch
delete mode 100644 xrdp-0.4.1-fix-link.patch
delete mode 100644 xrdp-0.4.1-wformat_fix.diff
create mode 100644 xrdp-0.9.10-scripts-libexec.patch
create mode 100644 xrdp-0.9.2-setpriv.patch
create mode 100644 xrdp-0.9.4-service.patch
create mode 100644 xrdp-0.9.6-script-interpreter.patch
create mode 100644 xrdp-0.9.9-sesman.patch
create mode 100644 xrdp-0.9.9-xrdp-ini.patch
delete mode 100644 xrdp-mdv_conf.diff
delete mode 100644 xrdp-no_rpath.diff
delete mode 100644 xrdp-optflags.diff
create mode 100644 xrdp-sesman.pamd
delete mode 100644 xrdp-window_managers.diff
delete mode 100644 xrdp.init
diff --git a/.abf.yml b/.abf.yml
index 3cec58b..d63770b 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- "xrdp-0.4.1.tar.gz": bbe320c049c47c28d3250627ad72481215a8763e
+ xrdp-0.9.11.tar.gz: d7b1b6b777ce47018e591ba79a9db19d210a609b
diff --git a/make-fix.patch b/make-fix.patch
new file mode 100644
index 0000000..a086c4c
--- /dev/null
+++ b/make-fix.patch
@@ -0,0 +1,24 @@
+diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
+index fe14d88..3a78ce2 100644
+--- a/xrdp/Makefile.am
++++ b/xrdp/Makefile.am
+@@ -23,7 +23,7 @@ endif
+ if XRDP_RFXCODEC
+ AM_CPPFLAGS += -DXRDP_RFXCODEC
+ AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
+-XRDP_EXTRA_LIBS += $(top_builddir)/librfxcodec/src/.libs/librfxencode.a
++XRDP_EXTRA_LIBS += $(top_builddir)/librfxcodec/src/.libs/librfxencode.la
+ endif
+
+ if XRDP_PIXMAN
+diff --git a/xrdpapi/Makefile.am b/xrdpapi/Makefile.am
+index d40109a..bb5e49c 100644
+--- a/xrdpapi/Makefile.am
++++ b/xrdpapi/Makefile.am
+@@ -13,3 +13,6 @@ module_LTLIBRARIES = \
+ libxrdpapi_la_SOURCES = \
+ xrdpapi.c \
+ xrdpapi.h
++
++libxrdpapi_la_LIBADD = \
++ $(top_builddir)/common/libcommon.la
diff --git a/openssl.conf b/openssl.conf
new file mode 100644
index 0000000..faa269c
--- /dev/null
+++ b/openssl.conf
@@ -0,0 +1,46 @@
+[req]
+distinguished_name = req_distinguished_name
+# The extensions to add to the self signed cert
+x509_extensions = v3_ca
+# Run non-interactively
+prompt = no
+
+[req_distinguished_name]
+# Certificate subject
+#countryName = US
+#stateOrProvinceName = CA
+#localityName = Sunnyvale
+#organizationName = xrdp
+#organizationalUnitName =
+commonName = XRDP
+#emailAddress =
+
+[v3_ca]
+# Extensions for a typical CA - PKIX recommendation.
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always, issuer
+
+# This is what PKIX recommends but some broken software chokes on critical
+# extensions.
+#basicConstraints = critical, CA:true
+# So we do this instead.
+basicConstraints = CA:true
+
+# Key usage: this is typical for a CA certificate. However since it will
+# prevent it being used as an test self-signed certificate it is best
+# left out by default.
+#keyUsage = cRLSign, keyCertSign
+
+# Some might want this also
+#nsCertType = sslCA, emailCA
+
+# Include email address in subject alt name: another PKIX recommendation
+#subjectAltName = email:copy
+# Copy issuer details
+#issuerAltName = issuer:copy
+
+# DER hex encoding of an extension: experts only!
+#obj = DER:02:03
+# Where 'obj' is a standard or added object
+# You can even override a supported extension:
+#basicConstraints = critical, DER:30:03:01:01:FF
diff --git a/xrdp-0.4.0-docs.patch b/xrdp-0.4.0-docs.patch
deleted file mode 100644
index c36aa96..0000000
--- a/xrdp-0.4.0-docs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- docs/Makefile 2006-03-04 04:02:02 +0300
-+++ docs/Makefile 2007-08-27 15:36:47 +0400
-@@ -12,8 +12,8 @@
- install:
-
- installdeb:
-- install man/sesman.8 $(DESTDIRDEB)/usr/man/man8/sesman.8
-- install man/sesrun.8 $(DESTDIRDEB)/usr/man/man8/sesrun.8
-- install man/xrdp.8 $(DESTDIRDEB)/usr/man/man8/xrdp.8
-- install man/sesman.ini.5 $(DESTDIRDEB)/usr/man/man5/sesman.ini.5
-- install man/xrdp.ini.5 $(DESTDIRDEB)/usr/man/man5/xrdp.ini.5
-+ install -Dp -m0644 man/sesman.8 $(DESTDIRDEB)/usr/share/man/man8/sesman.8
-+ install -Dp -m0644 man/sesrun.8 $(DESTDIRDEB)/usr/share/man/man8/sesrun.8
-+ install -Dp -m0644 man/xrdp.8 $(DESTDIRDEB)/usr/share/man/man8/xrdp.8
-+ install -Dp -m0644 man/sesman.ini.5 $(DESTDIRDEB)/usr/share/man/man5/sesman.ini.5
-+ install -Dp -m0644 man/xrdp.ini.5 $(DESTDIRDEB)/usr/share/man/man5/xrdp.ini.5
diff --git a/xrdp-0.4.0-mdv_libifictions.diff b/xrdp-0.4.0-mdv_libifictions.diff
deleted file mode 100644
index c41d67a..0000000
--- a/xrdp-0.4.0-mdv_libifictions.diff
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -Naur xrdp-0.4.0/libxrdp/Makefile xrdp-0.4.0.oden/libxrdp/Makefile
---- xrdp-0.4.0/libxrdp/Makefile 2008-06-03 11:35:06.000000000 +0200
-+++ xrdp-0.4.0.oden/libxrdp/Makefile 2008-06-03 11:32:23.000000000 +0200
-@@ -16,7 +16,7 @@
- CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
- #CFLAGS += -DXRDP_DEBUG
- C_OS_FLAGS = $(CFLAGS) -c
--LDFLAGS = -shared
-+LDFLAGS = -shared -Wl,-soname=libxrdp.so.0
- LIBS = -ldl
- LIBS += -lcrypto
- CC = gcc
-@@ -28,16 +28,17 @@
- ranlib libxrdp.a
-
- libxrdp: $(LIBXRDPOBJ)
-- $(CC) $(LDFLAGS) -o libxrdp.so $(LIBXRDPOBJ) $(LIBS)
-+ $(CC) $(LDFLAGS) -o libxrdp.so.0 $(LIBXRDPOBJ) $(LIBS)
-+ ln -snf libxrdp.so.0 libxrdp.so
-
- clean:
-- rm -f $(LIBXRDPOBJ) libxrdp.a libxrdp.so
-+ rm -f $(LIBXRDPOBJ) libxrdp.a libxrdp.so.0
-
- install:
-- install libxrdp.so $(DESTDIR)/libxrdp.so
-+ install libxrdp.so.0 $(DESTDIR)/libxrdp.so.0
-
- installdeb:
-- install libxrdp.so $(DESTDIRDEB)/usr/lib/xrdp/libxrdp.so
-+ install libxrdp.so.0 $(DESTDIRDEB)/usr/lib/libxrdp.so.0
-
- file.o: ../common/file.c
- $(CC) $(C_OS_FLAGS) ../common/file.c
-diff -Naur xrdp-0.4.0/rdp/Makefile xrdp-0.4.0.oden/rdp/Makefile
---- xrdp-0.4.0/rdp/Makefile 2008-06-03 11:35:06.000000000 +0200
-+++ xrdp-0.4.0.oden/rdp/Makefile 2008-06-03 11:36:24.000000000 +0200
-@@ -13,7 +13,7 @@
- CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
- #CFLAGS += -DXRDP_DEBUG
- C_OS_FLAGS = $(CFLAGS) -c
--LDFLAGS = -shared
-+LDFLAGS = -shared -Wl,-soname=librdp.so.0
- LIBS = -ldl
- LIBS += -lcrypto
- CC = gcc
-@@ -21,10 +21,11 @@
- all: rdp
-
- rdp: $(RDPOBJ)
-- $(CC) $(LDFLAGS) -o librdp.so $(RDPOBJ) $(LIBS)
-+ $(CC) $(LDFLAGS) -o librdp.so.0 $(RDPOBJ) $(LIBS)
-+ ln -snf librdp.so.0 librdp.so
-
- clean:
-- rm -f $(RDPOBJ) librdp.so
-+ rm -f $(RDPOBJ) librdp.so.0
-
- os_calls.o: ../common/os_calls.c
- $(CC) $(C_OS_FLAGS) ../common/os_calls.c
-@@ -33,7 +34,7 @@
- $(CC) $(C_OS_FLAGS) ../common/ssl_calls.c
-
- install:
-- install librdp.so $(DESTDIR)/librdp.so
-+ install librdp.so.0 $(DESTDIR)/librdp.so.0
-
- installdeb:
-- install librdp.so $(DESTDIRDEB)/usr/lib/xrdp/librdp.so
-+ install librdp.so.0 $(DESTDIRDEB)/usr/lib/librdp.so.0
-diff -Naur xrdp-0.4.0/sesman/libscp/Makefile xrdp-0.4.0.oden/sesman/libscp/Makefile
---- xrdp-0.4.0/sesman/libscp/Makefile 2008-06-03 11:35:06.000000000 +0200
-+++ xrdp-0.4.0.oden/sesman/libscp/Makefile 2008-06-03 11:33:11.000000000 +0200
-@@ -12,19 +12,20 @@
-
- DESTDIRDEB = /tmp
-
--LIBSCPLNAME = libscp.so
-+LIBSCPLNAME = libscp.so.0
-
- DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \
- -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
- -DSESMAN_SESSVC_FILE=\"sessvc\"
-
- CFLAGS = $(RPM_OPT_FLAGS) -I../../common -I/usr/include/nptl -fPIC $(DEFINES)
--LDFLAGS = -shared -L/usr/gnu/lib -L/usr/lib/nptl -lpthread
-+LDFLAGS = -shared -Wl,-soname=libscp.so.0 -lpthread
- C_OS_FLAGS = $(CFLAGS) -c
- CC = gcc
-
- all: $(LIBSCPOBJ)
- $(CC) $(LDFLAGS) -o $(LIBSCPLNAME) $(LIBSCPOBJ)
-+ ln -snf $(LIBSCPLNAME) libscp.so
-
- clean:
- rm -f $(LIBSCPOBJ) $(LIBSCPLNAME)
-@@ -33,7 +34,7 @@
- install $(LIBSCPLNAME) $(DESTDIR)/$(LIBSCPLNAME)
-
- installdeb:
-- install $(LIBSCPLNAME) $(DESTDIRDEB)/usr/lib/xrdp/$(LIBSCPLNAME)
-+ install $(LIBSCPLNAME) $(DESTDIRDEB)/usr/lib/$(LIBSCPLNAME)
-
- os_calls.o: ../../common/os_calls.c
- $(CC) $(C_OS_FLAGS) ../../common/os_calls.c
-diff -Naur xrdp-0.4.0/vnc/Makefile xrdp-0.4.0.oden/vnc/Makefile
---- xrdp-0.4.0/vnc/Makefile 2008-06-03 11:35:06.000000000 +0200
-+++ xrdp-0.4.0.oden/vnc/Makefile 2008-06-03 11:37:07.000000000 +0200
-@@ -12,17 +12,18 @@
-
- CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
- C_OS_FLAGS = $(CFLAGS) -c -g
--LDFLAGS = -shared
-+LDFLAGS = -shared -Wl,-soname=libvnc.so.0
- LIBS = -ldl
- CC = gcc
-
- all: vnc
-
- vnc: $(VNCOBJ)
-- $(CC) $(LDFLAGS) -o libvnc.so $(VNCOBJ) $(LIBS)
-+ $(CC) $(LDFLAGS) -o libvnc.so.0 $(VNCOBJ) $(LIBS)
-+ ln -snf libvnc.so.0 libvnc.so
-
- clean:
-- rm -f $(VNCOBJ) libvnc.so
-+ rm -f $(VNCOBJ) libvnc.so.0
-
- os_calls.o: ../common/os_calls.c
- $(CC) $(C_OS_FLAGS) ../common/os_calls.c
-@@ -31,7 +32,7 @@
- $(CC) $(C_OS_FLAGS) ../common/d3des.c
-
- install:
-- install libvnc.so $(DESTDIR)/libvnc.so
-+ install libvnc.so.0 $(DESTDIR)/libvnc.so.0
-
- installdeb:
-- install libvnc.so $(DESTDIRDEB)/usr/lib/xrdp/libvnc.so
-+ install libvnc.so.0 $(DESTDIRDEB)/usr/lib/libvnc.so.0
-diff -Naur xrdp-0.4.0/xup/Makefile xrdp-0.4.0.oden/xup/Makefile
---- xrdp-0.4.0/xup/Makefile 2008-06-03 11:35:06.000000000 +0200
-+++ xrdp-0.4.0.oden/xup/Makefile 2008-06-03 11:37:47.000000000 +0200
-@@ -13,23 +13,24 @@
- CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
- #CFLAGS += -DXRDP_DEBUG
- C_OS_FLAGS = $(CFLAGS) -c
--LDFLAGS = -shared
-+LDFLAGS = -shared -Wl,-soname=libxup.so.0
- LIBS = -ldl
- CC = gcc
-
- all: xup
-
- xup: $(XUPOBJ)
-- $(CC) $(LDFLAGS) -o libxup.so $(XUPOBJ) $(LIBS)
-+ $(CC) $(LDFLAGS) -o libxup.so.0 $(XUPOBJ) $(LIBS)
-+ ln -snf libxup.so.0 libxup.so
-
- clean:
-- rm -f $(XUPOBJ) libxup.so
-+ rm -f $(XUPOBJ) libxup.so.0
-
- os_calls.o: ../common/os_calls.c
- $(CC) $(C_OS_FLAGS) ../common/os_calls.c
-
- install:
-- install libxup.so $(DESTDIR)/libxup.so
-+ install libxup.so.0 $(DESTDIR)/libxup.so.0
-
- installdeb:
-- install libxup.so $(DESTDIRDEB)/usr/lib/xrdp/libxup.so
-+ install libxup.so.0 $(DESTDIRDEB)/usr/lib/libxup.so.0
diff --git a/xrdp-0.4.0-sesman.patch b/xrdp-0.4.0-sesman.patch
deleted file mode 100644
index 2b4779a..0000000
--- a/xrdp-0.4.0-sesman.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- sesman/Makefile 2007-05-28 03:18:14 +0400
-+++ sesman/Makefile 2007-08-27 13:17:23 +0400
-@@ -2,7 +2,9 @@
-
- SESMANOBJ = sesman.o config.o sig.o session.o env.o \
- os_calls.o d3des.o list.o file.o log.o access.o \
-- scp.o scp_v0.o scp_v1.o thread.o lock.o
-+ scp.o scp_v0.o scp_v1.o thread.o lock.o libscp/libscp_init.o \
-+ libscp/libscp_tcp.o libscp/libscp_lock.o libscp/libscp_vX.o \
-+ libscp/libscp_v0.o libscp/libscp_v1s.o
-
- SESSVCOBJ = sessvc.o os_calls.o
-
-@@ -16,31 +18,32 @@
- -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
- -DSESMAN_SESSVC_FILE=\"sessvc\"
-
--CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
--LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,. -lpthread -ldl -lscp
-+CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
-+LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp
- C_OS_FLAGS = $(CFLAGS) -c
-+LDADD = -ldl -lpthread -lscp
- CC = gcc
-
--all: libscp_ pam tools
-+all: libscp_ pam tools
-
- nopam: libscp_ no-pam tools
-
- kerberos: libscp_ kerberos-base tools
-
- no-pam: $(SESMANOBJ) verify_user.o
-- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt
-+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt $(LDADD)
-
- pam: $(SESMANOBJ) verify_user_pam.o
-- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam
-+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam $(LDADD)
-
- pam_userpass: $(SESMANOBJ) verify_user_pam_userpass.o
-- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass
-+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass $(LDADD)
-
- kerberos-base: $(SESMANOBJ) verify_user_kerberos.o
-- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5
-+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5 $(LDADD)
-
- sessvc: $(SESSVCOBJ)
-- $(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ)
-+ $(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ) $(LDADD)
-
- tools: sessvc
- make -C tools
-@@ -67,7 +70,7 @@
- install sesman.ini $(DESTDIRDEB)/etc/xrdp/sesman.ini
-
- os_calls.o: ../common/os_calls.c
-- $(CC) $(C_OS_FLAGS) ../common/os_calls.c
-+ $(CC) $(C_OS_FLAGS) ../common/os_calls.c $(LDADD)
-
- d3des.o: ../common/d3des.c
- $(CC) $(C_OS_FLAGS) ../common/d3des.c
-@@ -79,4 +82,4 @@
- $(CC) $(C_OS_FLAGS) ../common/file.c
-
- log.o: ../common/log.c
-- $(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c
-+ $(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c -ldl
diff --git a/xrdp-0.4.0-sesmantools.patch b/xrdp-0.4.0-sesmantools.patch
deleted file mode 100644
index e1314f0..0000000
--- a/xrdp-0.4.0-sesmantools.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- sesman/tools/Makefile 2007-05-23 10:56:18 +0400
-+++ sesman/tools/Makefile 2007-08-27 13:22:03 +0400
-@@ -16,15 +16,16 @@
- CFLAGS = -Wall -O2 -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
- LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,. -lpthread -ldl -lscp
- C_OS_FLAGS = $(CFLAGS) -c
-+LDADD = -ldl -lpthread -lscp
- CC = gcc
-
- all: stest srun
-
- stest: $(SESTESTOBJ)
-- $(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ)
-+ $(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ) $(LDADD)
-
- srun: $(SESRUNOBJ)
-- $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ)
-+ $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ) $(LDADD)
-
- os_calls.o: ../../common/os_calls.c
- $(CC) $(C_OS_FLAGS) ../../common/os_calls.c
diff --git a/xrdp-0.4.1-fix-link.patch b/xrdp-0.4.1-fix-link.patch
deleted file mode 100644
index b716034..0000000
--- a/xrdp-0.4.1-fix-link.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- sesman/libscp/Makefile.link 2010-04-19 11:48:25.000000000 +0200
-+++ sesman/libscp/Makefile 2010-04-19 11:49:01.000000000 +0200
-@@ -19,12 +19,12 @@
- -DSESMAN_SESSVC_FILE=\"sessvc\"
-
- CFLAGS = $(RPM_OPT_FLAGS) -I../../common -I/usr/include/nptl -fPIC $(DEFINES)
--LDFLAGS = -shared -Wl,-soname=libscp.so.0 -lpthread
-+LDFLAGS = -shared -Wl,-soname=libscp.so.0
- C_OS_FLAGS = $(CFLAGS) -c
- CC = gcc
-
- all: $(LIBSCPOBJ)
-- $(CC) $(LDFLAGS) -o $(LIBSCPLNAME) $(LIBSCPOBJ)
-+ $(CC) $(LDFLAGS) -o $(LIBSCPLNAME) $(LIBSCPOBJ) -ldl -lpthread
- ln -snf $(LIBSCPLNAME) libscp.so
-
- clean:
---- libxrdp/Makefile.link 2010-04-19 11:58:37.000000000 +0200
-+++ libxrdp/Makefile 2010-04-19 11:59:03.000000000 +0200
-@@ -2,7 +2,7 @@
- LIBXRDPOBJ = libxrdp.o xrdp_tcp.o xrdp_iso.o xrdp_mcs.o \
- xrdp_sec.o xrdp_rdp.o xrdp_orders.o \
- xrdp_bitmap_compress.o xrdp_channel.o \
-- os_calls.o ssl_calls.o file.o
-+ os_calls.o ssl_calls.o file.o list.o
-
- DESTDIR = /usr/local/xrdp
- CFGDIR = /etc/xrdp
-@@ -40,6 +40,9 @@
- installdeb:
- install libxrdp.so.0 $(DESTDIRDEB)/usr/lib/libxrdp.so.0
-
-+list.o: ../common/list.c
-+ $(CC) $(C_OS_FLAGS) ../common/list.c
-+
- file.o: ../common/file.c
- $(CC) $(C_OS_FLAGS) ../common/file.c
-
---- sesman/Makefile.link 2010-04-19 12:01:36.000000000 +0200
-+++ sesman/Makefile 2010-04-19 12:04:38.000000000 +0200
-@@ -21,7 +21,7 @@
- CFLAGS = $(RPM_OPT_FLAGS) -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
- LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp
- C_OS_FLAGS = $(CFLAGS) -c
--LDADD = -ldl -lpthread -lscp
-+LDADD = -ldl -lpthread
- CC = gcc
-
- all: libscp_ pam tools
---- sesman/tools/Makefile.link 2010-04-19 12:19:08.000000000 +0200
-+++ sesman/tools/Makefile 2010-04-19 12:20:55.000000000 +0200
-@@ -3,7 +3,7 @@
- os_calls.o
-
- SESRUNOBJ = sesrun.o config.o tcp.o \
-- os_calls.o d3des.o list.o file.o log.o
-+ os_calls.o d3des.o file.o log.o
-
- DESTDIR = /usr/local/xrdp
- CFGDIR = /etc/xrdp
-@@ -14,25 +14,22 @@
- DEFINES = -DLIBSCP_CLIENT
-
- CFLAGS = $(RPM_OPT_FLAGS) -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
--LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -lpthread -ldl -lscp
-+LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -L../../libxrdp
- C_OS_FLAGS = $(CFLAGS) -c
--LDADD = -ldl -lpthread -lscp
-+LDADD = -ldl -lpthread
- CC = gcc
-
- all: stest srun
-
- stest: $(SESTESTOBJ)
-- $(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ) $(LDADD)
-+ $(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ) $(LDADD) -lscp
-
- srun: $(SESRUNOBJ)
-- $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ) $(LDADD)
-+ $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ) $(LDADD) -lxrdp
-
- os_calls.o: ../../common/os_calls.c
- $(CC) $(C_OS_FLAGS) ../../common/os_calls.c
-
--list.o: ../../common/list.c
-- $(CC) $(C_OS_FLAGS) ../../common/list.c
--
- file.o: ../../common/file.c
- $(CC) $(C_OS_FLAGS) ../../common/file.c
-
diff --git a/xrdp-0.4.1-wformat_fix.diff b/xrdp-0.4.1-wformat_fix.diff
deleted file mode 100644
index 179863f..0000000
--- a/xrdp-0.4.1-wformat_fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/log.c 2007-02-03 07:21:58.000000000 +0100
-+++ common/log.c.oden 2009-08-26 14:35:48.000000000 +0200
-@@ -172,7 +172,7 @@ log_message(const unsigned int lvl, cons
- if (l_cfg->enable_syslog && (lvl <= l_cfg->log_level))
- {
- /* log to syslog */
-- syslog(log_xrdp2syslog(lvl), buff + 20);
-+ syslog("%s", log_xrdp2syslog(lvl), buff + 20);
- }
-
- if (lvl <= l_cfg->log_level)
diff --git a/xrdp-0.9.10-scripts-libexec.patch b/xrdp-0.9.10-scripts-libexec.patch
new file mode 100644
index 0000000..893bd75
--- /dev/null
+++ b/xrdp-0.9.10-scripts-libexec.patch
@@ -0,0 +1,37 @@
+diff -Nrup a/sesman/config.c b/sesman/config.c
+--- a/sesman/config.c 2019-04-18 07:38:26.000000000 +0200
++++ b/sesman/config.c 2019-04-18 14:32:25.987906549 +0200
+@@ -179,13 +179,13 @@ config_read_globals(int file, struct con
+ g_free(cf->default_wm);
+ cf->default_wm = g_strdup("startwm.sh");
+ }
+- /* if default_wm doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */
++ /* if default_wm doesn't begin with '/', it's a relative path to /usr/libexec/xrdp */
+ if (cf->default_wm[0] != '/')
+ {
+ /* sizeof operator returns string length including null terminator */
+- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->default_wm) + 1; /* '/' */
++ length = sizeof("/usr/libexec/xrdp") + g_strlen(cf->default_wm) + 1; /* '/' */
+ buf = (char *)g_malloc(length, 0);
+- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->default_wm);
++ g_sprintf(buf, "%s/%s", "/usr/libexec/xrdp", cf->default_wm);
+ g_free(cf->default_wm);
+ cf->default_wm = g_strdup(buf);
+ g_free(buf);
+@@ -200,13 +200,13 @@ config_read_globals(int file, struct con
+ g_free(cf->reconnect_sh);
+ cf->reconnect_sh = g_strdup("reconnectwm.sh");
+ }
+- /* if reconnect_sh doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */
++ /* if reconnect_sh doesn't begin with '/', it's a relative path to /usr/libexec/xrdp */
+ if (cf->reconnect_sh[0] != '/')
+ {
+ /* sizeof operator returns string length including null terminator */
+- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->reconnect_sh) + 1; /* '/' */
++ length = sizeof("/usr/libexec/xrdp") + g_strlen(cf->reconnect_sh) + 1; /* '/' */
+ buf = (char *)g_malloc(length, 0);
+- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->reconnect_sh);
++ g_sprintf(buf, "%s/%s", "/usr/libexec/xrdp", cf->reconnect_sh);
+ g_free(cf->reconnect_sh);
+ cf->reconnect_sh = g_strdup(buf);
+ g_free(buf);
diff --git a/xrdp-0.9.2-setpriv.patch b/xrdp-0.9.2-setpriv.patch
new file mode 100644
index 0000000..2484bb9
--- /dev/null
+++ b/xrdp-0.9.2-setpriv.patch
@@ -0,0 +1,55 @@
+Index: xrdp-0.9.6/sesman/session.c
+===================================================================
+--- xrdp-0.9.6/sesman/session.c
++++ xrdp-0.9.6/sesman/session.c 2018-04-18 13:15:16.165858818 +0200
+@@ -33,10 +33,6 @@
+ #include "config_ac.h"
+ #endif
+
+-#ifdef HAVE_SYS_PRCTL_H
+-#include <sys/prctl.h>
+-#endif
+-
+ #include "sesman.h"
+ #include "libscp_types.h"
+ #include "xauth.h"
+@@ -661,20 +657,7 @@
+
+ if (type == SESMAN_SESSION_TYPE_XORG)
+ {
+-#ifdef HAVE_SYS_PRCTL_H
+- /*
+- * Make sure Xorg doesn't run setuid root. Root access is not
+- * needed. Xorg can fail when run as root and the user has no
+- * console permissions.
+- * PR_SET_NO_NEW_PRIVS requires Linux kernel 3.5 and newer.
+- */
+- if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) < 0)
+- {
+- log_message(LOG_LEVEL_WARNING,
+- "Failed to disable setuid on X server: %s",
+- g_get_strerror());
+- }
+-#endif
++ char *setpriv = g_strdup("setpriv");
+
+ xserver_params = list_create();
+ xserver_params->auto_free = 1;
+@@ -683,6 +666,8 @@
+ xserver = g_strdup((const char *)list_get_item(g_cfg->xorg_params, 0));
+
+ /* these are the must have parameters */
++ list_add_item(xserver_params, (tintptr) setpriv);
++ list_add_item(xserver_params, (tintptr) g_strdup("--no-new-privs"));
+ list_add_item(xserver_params, (tintptr) g_strdup(xserver));
+ list_add_item(xserver_params, (tintptr) g_strdup(screen));
+ list_add_item(xserver_params, (tintptr) g_strdup("-auth"));
+@@ -706,7 +691,7 @@
+ g_setenv("XRDP_START_HEIGHT", geometry, 1);
+
+ /* fire up Xorg */
+- g_execvp(xserver, pp1);
++ g_execvp(setpriv, pp1);
+ }
+ else if (type == SESMAN_SESSION_TYPE_XVNC)
+ {
diff --git a/xrdp-0.9.4-service.patch b/xrdp-0.9.4-service.patch
new file mode 100644
index 0000000..f85742a
--- /dev/null
+++ b/xrdp-0.9.4-service.patch
@@ -0,0 +1,49 @@
+Index: xrdp-0.9.6/instfiles/xrdp-sesman.service.in
+===================================================================
+--- xrdp-0.9.6/instfiles/xrdp-sesman.service.in
++++ xrdp-0.9.6/instfiles/xrdp-sesman.service.in 2018-04-18 13:11:30.295858474 +0200
+@@ -1,17 +1,14 @@
+ [Unit]
+ Description=xrdp session manager
+ Documentation=man:xrdp-sesman(8) man:sesman.ini(5)
+-After=network.target
++Wants=network-online.target nss-lookup.target nss-user-lookup.target
++After=network-online.target nss-lookup.target nss-user-lookup.target
+ StopWhenUnneeded=true
+ BindsTo=xrdp.service
+
+ [Service]
+-Type=forking
+-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
++EnvironmentFile=@sysconfdir@/sysconfig/xrdp
++ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --nodaemon
+
+ [Install]
+ WantedBy=multi-user.target
+Index: xrdp-0.9.6/instfiles/xrdp.service.in
+===================================================================
+--- xrdp-0.9.6/instfiles/xrdp.service.in
++++ xrdp-0.9.6/instfiles/xrdp.service.in 2018-04-18 13:10:48.305858410 +0200
+@@ -2,15 +2,11 @@
+ Description=xrdp daemon
+ Documentation=man:xrdp(8) man:xrdp.ini(5)
+ Requires=xrdp-sesman.service
+-After=network.target xrdp-sesman.service
++After=xrdp-sesman.service
+
+ [Service]
+-Type=forking
+-PIDFile=@localstatedir@/run/xrdp.pid
+-EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
+-EnvironmentFile=-@sysconfdir@/default/xrdp
+-ExecStart=@sbindir@/xrdp $XRDP_OPTIONS
+-ExecStop=@sbindir@/xrdp $XRDP_OPTIONS --kill
++EnvironmentFile=@sysconfdir@/sysconfig/xrdp
++ExecStart=@sbindir@/xrdp $XRDP_OPTIONS --nodaemon
+
+ [Install]
+ WantedBy=multi-user.target
diff --git a/xrdp-0.9.6-script-interpreter.patch b/xrdp-0.9.6-script-interpreter.patch
new file mode 100644
index 0000000..15de583
--- /dev/null
+++ b/xrdp-0.9.6-script-interpreter.patch
@@ -0,0 +1,9 @@
+diff -ruN xrdp-0.9.6-v/sesman/startwm.sh xrdp-0.9.6/sesman/startwm.sh
+--- xrdp-0.9.6-v/sesman/startwm.sh 2018-03-26 15:29:21.000000000 +1100
++++ xrdp-0.9.6/sesman/startwm.sh 2018-04-23 14:48:12.320386375 +1000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/bash
+ #
+ # This script is an example. You might need to edit this script
+ # depending on your distro if it doesn't work for you.
diff --git a/xrdp-0.9.9-sesman.patch b/xrdp-0.9.9-sesman.patch
new file mode 100644
index 0000000..75ae711
--- /dev/null
+++ b/xrdp-0.9.9-sesman.patch
@@ -0,0 +1,12 @@
+diff -Nru a/sesman/sesman.ini b/sesman/sesman.ini
+--- a/sesman/sesman.ini 2018-12-25 05:49:32.000000000 +0100
++++ b/sesman/sesman.ini 2018-12-26 06:21:31.333355288 +0100
+@@ -7,7 +7,7 @@
+ ; Give in relative path to user's home directory
+ UserWindowManager=startwm.sh
+ ; Give in full path or relative path to /etc/xrdp
+-DefaultWindowManager=startwm.sh
++DefaultWindowManager=startwm-bash.sh
+ ; Give in full path or relative path to /etc/xrdp
+ ReconnectScript=reconnectwm.sh
+
diff --git a/xrdp-0.9.9-xrdp-ini.patch b/xrdp-0.9.9-xrdp-ini.patch
new file mode 100644
index 0000000..c36d4fb
--- /dev/null
+++ b/xrdp-0.9.9-xrdp-ini.patch
@@ -0,0 +1,43 @@
+diff -Nru a/xrdp/xrdp.ini b/xrdp/xrdp.ini
+--- a/xrdp/xrdp.ini 2018-12-25 05:49:32.000000000 +0100
++++ b/xrdp/xrdp.ini 2018-12-26 06:27:27.995493206 +0100
+@@ -172,25 +172,25 @@
+ #xserverbpp=24
+ #delay_ms=2000
+
+-[vnc-any]
+-name=vnc-any
+-lib=libvnc.so
+-ip=ask
+-port=ask5900
+-username=na
+-password=ask
++#[vnc-any]
++#name=vnc-any
++#lib=libvnc.so
++#ip=ask
++#port=ask5900
++#username=na
++#password=ask
+ #pamusername=asksame
+ #pampassword=asksame
+ #pamsessionmng=127.0.0.1
+ #delay_ms=2000
+
+-[neutrinordp-any]
+-name=neutrinordp-any
+-lib=libxrdpneutrinordp.so
+-ip=ask
+-port=ask3389
+-username=ask
+-password=ask
++#[neutrinordp-any]
++#name=neutrinordp-any
++#lib=libxrdpneutrinordp.so
++#ip=ask
++#port=ask3389
++#username=ask
++#password=ask
+
+ ; You can override the common channel settings for each session type
+ #channel.rdpdr=true
diff --git a/xrdp-mdv_conf.diff b/xrdp-mdv_conf.diff
deleted file mode 100644
index 4d088ba..0000000
--- a/xrdp-mdv_conf.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- sesman/sesman.ini 2007-04-07 18:20:08.000000000 +0200
-+++ sesman/sesman.ini.oden 2008-06-02 09:17:01.000000000 +0200
-@@ -2,8 +2,8 @@
- ListenAddress=127.0.0.1
- ListenPort=3350
- EnableUserWindowManager=1
--UserWindowManager=startwm.sh
--DefaultWindowManager=startwm.sh
-+UserWindowManager=/usr/sbin/xrdp-startwm
-+DefaultWindowManager=/usr/sbin/xrdp-startwm
-
- [Security]
- AllowRootLogin=1
-@@ -18,7 +18,7 @@
- DisconnectedTimeLimit=0
-
- [Logging]
--LogFile=./sesman.log
-+LogFile=/var/log/xrdp/sesman.log
- LogLevel=DEBUG
- EnableSyslog=0
- SyslogLevel=DEBUG
diff --git a/xrdp-no_rpath.diff b/xrdp-no_rpath.diff
deleted file mode 100644
index 09d5692..0000000
--- a/xrdp-no_rpath.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur xrdp-0.4.0/sesman/tools/Makefile xrdp-0.4.0.oden/sesman/tools/Makefile
---- xrdp-0.4.0/sesman/tools/Makefile 2008-05-15 17:29:00.000000000 +0200
-+++ xrdp-0.4.0.oden/sesman/tools/Makefile 2008-05-15 17:28:39.000000000 +0200
-@@ -14,7 +14,7 @@
- DEFINES = -DLIBSCP_CLIENT
-
- CFLAGS = $(RPM_OPT_FLAGS) -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
--LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,. -lpthread -ldl -lscp
-+LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -lpthread -ldl -lscp
- C_OS_FLAGS = $(CFLAGS) -c
- LDADD = -ldl -lpthread -lscp
- CC = gcc
-diff -Naur xrdp-0.4.0/xrdp/Makefile xrdp-0.4.0.oden/xrdp/Makefile
---- xrdp-0.4.0/xrdp/Makefile 2008-05-15 17:29:00.000000000 +0200
-+++ xrdp-0.4.0.oden/xrdp/Makefile 2008-05-15 17:28:52.000000000 +0200
-@@ -18,7 +18,7 @@
- CFLAGS = $(RPM_OPT_FLAGS) -I../common -I../libxrdp $(DEFINES)
- #CFLAGS += -DXRDP_DEBUG
- C_OS_FLAGS = $(CFLAGS) -c
--LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,.
-+LDFLAGS = -L/usr/gnu/lib -L../libxrdp
- LIBS = -ldl -lpthread -lxrdp
- CC = gcc
-
diff --git a/xrdp-optflags.diff b/xrdp-optflags.diff
deleted file mode 100644
index 926d615..0000000
--- a/xrdp-optflags.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -Naur xrdp-0.4.0/libxrdp/Makefile xrdp-0.4.0.oden/libxrdp/Makefile
---- xrdp-0.4.0/libxrdp/Makefile 2007-04-08 23:19:42.000000000 +0200
-+++ xrdp-0.4.0.oden/libxrdp/Makefile 2008-05-15 17:22:55.000000000 +0200
-@@ -13,7 +13,7 @@
- DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
- -DXRDP_KEY_FILE=\"$(CFGDIR)/rsakeys.ini\"
-
--CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-+CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
- #CFLAGS += -DXRDP_DEBUG
- C_OS_FLAGS = $(CFLAGS) -c
- LDFLAGS = -shared
-diff -Naur xrdp-0.4.0/rdp/Makefile xrdp-0.4.0.oden/rdp/Makefile
---- xrdp-0.4.0/rdp/Makefile 2006-08-07 08:03:17.000000000 +0200
-+++ xrdp-0.4.0.oden/rdp/Makefile 2008-05-15 17:23:20.000000000 +0200
-@@ -10,7 +10,7 @@
-
- DEFINES =
-
--CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-+CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
- #CFLAGS += -DXRDP_DEBUG
- C_OS_FLAGS = $(CFLAGS) -c
- LDFLAGS = -shared
-diff -Naur xrdp-0.4.0/sesman/libscp/Makefile xrdp-0.4.0.oden/sesman/libscp/Makefile
---- xrdp-0.4.0/sesman/libscp/Makefile 2007-05-28 01:20:48.000000000 +0200
-+++ xrdp-0.4.0.oden/sesman/libscp/Makefile 2008-05-15 17:24:43.000000000 +0200
-@@ -18,7 +18,7 @@
- -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
- -DSESMAN_SESSVC_FILE=\"sessvc\"
-
--CFLAGS = -Wall -O2 -I../../common -I/usr/include/nptl -fPIC $(DEFINES)
-+CFLAGS = $(RPM_OPT_FLAGS) -I../../common -I/usr/include/nptl -fPIC $(DEFINES)
- LDFLAGS = -shared -L/usr/gnu/lib -L/usr/lib/nptl -lpthread
- C_OS_FLAGS = $(CFLAGS) -c
- CC = gcc
-diff -Naur xrdp-0.4.0/sesman/Makefile xrdp-0.4.0.oden/sesman/Makefile
---- xrdp-0.4.0/sesman/Makefile 2008-05-15 17:25:45.000000000 +0200
-+++ xrdp-0.4.0.oden/sesman/Makefile 2008-05-15 17:23:47.000000000 +0200
-@@ -18,7 +18,7 @@
- -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
- -DSESMAN_SESSVC_FILE=\"sessvc\"
-
--CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
-+CFLAGS = $(RPM_OPT_FLAGS) -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
- LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp
- C_OS_FLAGS = $(CFLAGS) -c
- LDADD = -ldl -lpthread -lscp
-diff -Naur xrdp-0.4.0/sesman/tools/Makefile xrdp-0.4.0.oden/sesman/tools/Makefile
---- xrdp-0.4.0/sesman/tools/Makefile 2008-05-15 17:25:45.000000000 +0200
-+++ xrdp-0.4.0.oden/sesman/tools/Makefile 2008-05-15 17:24:14.000000000 +0200
-@@ -13,7 +13,7 @@
-
- DEFINES = -DLIBSCP_CLIENT
-
--CFLAGS = -Wall -O2 -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
-+CFLAGS = $(RPM_OPT_FLAGS) -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
- LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,. -lpthread -ldl -lscp
- C_OS_FLAGS = $(CFLAGS) -c
- LDADD = -ldl -lpthread -lscp
-diff -Naur xrdp-0.4.0/vnc/Makefile xrdp-0.4.0.oden/vnc/Makefile
---- xrdp-0.4.0/vnc/Makefile 2007-05-12 06:19:43.000000000 +0200
-+++ xrdp-0.4.0.oden/vnc/Makefile 2008-05-15 17:25:00.000000000 +0200
-@@ -10,7 +10,7 @@
-
- DEFINES =
-
--CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-+CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
- C_OS_FLAGS = $(CFLAGS) -c -g
- LDFLAGS = -shared
- LIBS = -ldl
-diff -Naur xrdp-0.4.0/xrdp/Makefile xrdp-0.4.0.oden/xrdp/Makefile
---- xrdp-0.4.0/xrdp/Makefile 2007-04-13 05:50:59.000000000 +0200
-+++ xrdp-0.4.0.oden/xrdp/Makefile 2008-05-15 17:25:16.000000000 +0200
-@@ -15,7 +15,7 @@
- DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
- -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\"
-
--CFLAGS = -Wall -O2 -I../common -I../libxrdp $(DEFINES)
-+CFLAGS = $(RPM_OPT_FLAGS) -I../common -I../libxrdp $(DEFINES)
- #CFLAGS += -DXRDP_DEBUG
- C_OS_FLAGS = $(CFLAGS) -c
- LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,.
-diff -Naur xrdp-0.4.0/xup/Makefile xrdp-0.4.0.oden/xup/Makefile
---- xrdp-0.4.0/xup/Makefile 2007-05-12 06:20:14.000000000 +0200
-+++ xrdp-0.4.0.oden/xup/Makefile 2008-05-15 17:25:32.000000000 +0200
-@@ -10,7 +10,7 @@
-
- DEFINES =
-
--CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
-+CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
- #CFLAGS += -DXRDP_DEBUG
- C_OS_FLAGS = $(CFLAGS) -c
- LDFLAGS = -shared
diff --git a/xrdp-sesman.pamd b/xrdp-sesman.pamd
new file mode 100644
index 0000000..fcb7a46
--- /dev/null
+++ b/xrdp-sesman.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/xrdp-window_managers.diff b/xrdp-window_managers.diff
deleted file mode 100644
index bdb26ba..0000000
--- a/xrdp-window_managers.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- sesman/startwm.sh 2006-08-14 06:57:43.000000000 +0200
-+++ sesman/startwm.sh.oden 2008-06-02 09:27:45.000000000 +0200
-@@ -28,6 +28,12 @@
- exit 0
- fi
-
-+# icewm
-+if [ "'which starticewm'" != "" ]; then
-+ starticewm
-+ exit 0
-+fi
-+
- # blackbox
- #if [ "'which blackbox'" != "" ]; then
- # blackbox
diff --git a/xrdp.init b/xrdp.init
deleted file mode 100644
index 17d518f..0000000
--- a/xrdp.init
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-#
-# Startup script for xrdp
-#
-# chkconfig: 345 91 35
-# description: Open source remote desktop protocol (RDP) server
-# processname: xrdp
-# pidfile: /var/run/xrdp.pid
-# config: /etc/xrdp/xrdp.ini
-
-### BEGIN INIT INFO
-# Provides: xrdp
-# Required-Start: $network
-# Required-Stop: $network
-# Should-Start: $named
-# Should-Stop: $named
-# Default-Start: 3 4 5
-# Short-Description: Starts the xrdp daemon
-# Description: Open source remote desktop protocol (RDP) server
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-# source the xrdp configuration
-[ -f /etc/sysconfig/xrdp ] && . /etc/sysconfig/xrdp
-
-RETVAL=0
-
-start() {
- echo -n "Starting xrdp and sasman: "
- cd @libexecdir@
-
- if [ -n "`/sbin/pidof xrdp`" ]; then
- echo "xrdp: already running"
- echo
- return 1
- fi
- daemon xrdp ${XRDP_OPTIONS} >&/dev/null
- RETVAL=$?
- [ "`pidof xrdp`" -ne "0" ] && success || failure
-
- if [ -n "`/sbin/pidof sesman`" ]; then
- echo "sesman: already running"
- echo
- return 1
- fi
- daemon sesman ${SESMAN_OPTIONS} >&/dev/null
- [ "`pidof sesman`" -ne "0" ] && success || failure
-
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xrdp
- return $RETVAL
-}
-
-stop() {
- echo -n "Shutting down xrdp and sasman: "
- cd @libexecdir@
-
- xrdp --kill >&/dev/null
- [ "`pidof xrdp`" == "0" ] && failure || success
-
- sesman --kill >&/dev/null
- [ "`pidof sesman`" == "0" ] && failure || success
-
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xrdp /var/run/xrdp.pid
- return $RETVAL
-}
-
-restart() {
- stop
- start
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart|reload)
- restart
- ;;
- condrestart)
- [ -e /var/lock/subsys/xrdp ] && restart
- RETVAL=$?
- ;;
- status)
- status xrdp
- status sesman
- RETVAL=$?
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|reload|condrestart|status}"
- RETVAL=1
-esac
-
-exit $RETVAL
diff --git a/xrdp.logrotate b/xrdp.logrotate
index e6de593..1c5f1b4 100644
--- a/xrdp.logrotate
+++ b/xrdp.logrotate
@@ -1,9 +1,6 @@
-/var/log/xrdp/sesman.log {
- create 644 root root
+/var/log/xrdp*.log {
daily
compress
missingok
- postrotate
- /etc/rc.d/init.d/xrdp condrestart > /dev/null 2>/dev/null || :
- endscript
+ copytruncate
}
diff --git a/xrdp.spec b/xrdp.spec
index f1bb151..0ed1b5c 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -1,217 +1,207 @@
-%define major 0
-%define libname %mklibname %{name} %{major}
-
-Summary: Open source remote desktop protocol (RDP) server
-Name: xrdp
-Version: 0.4.1
-Release: %mkrel 5
-License: GPL
-Group: System/Servers
-URL: http://xrdp.sourceforge.net/
-Source0: http://dl.sf.net/xrdp/xrdp-%{version}.tar.gz
-Source1: xrdp.init
-Source2: xrdp.logrotate
-Source3: xrdp.sysconfig
-Patch0: xrdp-0.4.0-sesman.patch
-Patch1: xrdp-0.4.0-sesmantools.patch
-Patch2: xrdp-0.4.0-docs.patch
-Patch3: xrdp-optflags.diff
-Patch4: xrdp-no_rpath.diff
-Patch5: xrdp-mdv_conf.diff
-Patch6: xrdp-window_managers.diff
-Patch7: xrdp-0.4.0-mdv_libifictions.diff
-Patch8: xrdp-0.4.1-wformat_fix.diff
-Patch9: xrdp-0.4.1-fix-link.patch
+Summary: Open source remote desktop protocol (RDP) server
+Name: xrdp
+Epoch: 1
+Version: 0.9.11
+Release: 1
+License: ASL 2.0
+Group: Networking/Remote access
+URL: http://www.xrdp.org/
+Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%{version}.tar.gz
+Source1: xrdp-sesman.pamd
+Source2: xrdp.sysconfig
+Source3: xrdp.logrotate
+Source4: openssl.conf
+Patch0: xrdp-0.9.9-sesman.patch
+Patch1: xrdp-0.9.9-xrdp-ini.patch
+Patch2: xrdp-0.9.4-service.patch
+Patch3: xrdp-0.9.2-setpriv.patch
+Patch4: xrdp-0.9.10-scripts-libexec.patch
+Patch5: xrdp-0.9.6-script-interpreter.patch
+Patch6: make-fix.patch
+
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: openssl
+BuildRequires: lame-devel
+BuildRequires: pam-devel
+BuildRequires: pkgconfig(libjpeg)
+BuildRequires: pkgconfig(fuse)
+BuildRequires: pkgconfig(openssl) >= 1.1
+BuildRequires: pkgconfig(opus)
+BuildRequires: pkgconfig(pixman-1)
+BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: nasm
+
+
+# tigervnc-server-minimal provides Xvnc (default for now)
+Requires: tigervnc-server
+Requires: xinitrc
Requires(post): rpm-helper
Requires(preun): rpm-helper
-BuildRequires: pam-devel
-BuildRequires: openssl-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Requires(posttrans): openssl
%description
-The goal of this project is to provide a fully functional Linux terminal
-server, capable of accepting connections from rdesktop and Microsoft's own
-terminal server / remote desktop clients.
+xrdp provides a fully functional RDP server compatible with a wide range
+of RDP clients, including FreeRDP and Microsoft RDP client.
-%package -n %{libname}
-Summary: Shared libraries and plugins for xrdp
-Group: System/Libraries
+%package devel
+Summary: Headers and pkg-config files needed to compile xrdp backends
-%description -n %{libname}
-The goal of this project is to provide a fully functional Linux terminal
-server, capable of accepting connections from rdesktop and Microsoft's own
-terminal server / remote desktop clients.
-
-This package contains the shared libraries and plugins for xrdp.
+%description devel
+This package contains headers necessary for developing xrdp backends that
+talk to xrdp.
%prep
-%setup -q
-%patch0
-%patch1
-%patch2
-%patch3 -p1
-%patch4 -p1
-%patch5 -p0
-%patch6 -p0
-%patch7 -p1
-%patch8 -p0
-%patch9 -p0 -b .link
-
-cp %{SOURCE1} xrdp.init
-cp %{SOURCE2} xrdp.logrotate
-cp %{SOURCE3} xrdp.sysconfig
-
-perl -pi -e 's|/lib\b|/%{_lib}|g' Makefile */Makefile
-perl -pi -e "s|\@libexecdir\@|%{_libdir}/xrdp|g" xrdp.init
+%autosetup -p1
+
+# create 'bash -l' based startwm, to pick up PATH etc.
+echo '#!/bin/bash -l
+. %{_libexecdir}/xrdp/startwm.sh' > sesman/startwm-bash.sh
%build
-%serverbuild
-make
+
+pushd librfxcodec
+%configure \
+ --disable-shared \
+ --enable-static
+%make_build
+popd
+
+pushd libpainter
+%configure \
+ --disable-shared \
+ --enable-static
+%make_build
+popd
+
+%configure --enable-fuse \
+ --enable-pixman \
+ --enable-rfxcodec \
+ --enable-painter \
+ --enable-ipv6 \
+ --enable-mp3lame \
+ --enable-opus \
+ --enable-jpeg \
+ --enable-tjpeg
+
+%make_build
%install
-rm -rf %{buildroot}
-
-install -d %{buildroot}%{_initrddir}
-install -d %{buildroot}%{_sbindir}
-install -d %{buildroot}%{_sysconfdir}/logrotate.d
-install -d %{buildroot}%{_sysconfdir}/sysconfig
-install -d %{buildroot}%{_sysconfdir}/xrdp
-install -d %{buildroot}%{_sysconfdir}/pam.d
-install -d %{buildroot}/var/log/xrdp
-install -d %{buildroot}%{_libdir}/xrdp
-install -d %{buildroot}%{_mandir}/man5
-install -d %{buildroot}%{_mandir}/man8
-
-install -m0755 rdp/librdp.so.%{major} %{buildroot}%{_libdir}/
-install -m0755 vnc/libvnc.so.%{major} %{buildroot}%{_libdir}/
-install -m0755 xup/libxup.so.%{major} %{buildroot}%{_libdir}/
-install -m0755 libxrdp/libxrdp.so.%{major} %{buildroot}%{_libdir}/
-install -m0755 sesman/libscp/libscp.so.%{major} %{buildroot}%{_libdir}/
-
-install -m0755 sesman/sesman %{buildroot}%{_sbindir}/
-install -m0755 sesman/sessvc %{buildroot}%{_sbindir}/
-install -m0755 sesman/startwm.sh %{buildroot}%{_sbindir}/xrdp-startwm
-install -m0755 sesman/tools/sesrun %{buildroot}%{_sbindir}/
-install -m0755 sesman/tools/sestest %{buildroot}%{_sbindir}/
-install -m0644 sesman/sesman.ini %{buildroot}%{_sysconfdir}/xrdp/
-
-install -m0755 xrdp/xrdp %{buildroot}%{_sbindir}/
-install -m0644 xrdp/ad256.bmp %{buildroot}%{_libdir}/xrdp/
-install -m0644 xrdp/xrdp256.bmp %{buildroot}%{_libdir}/xrdp/
-install -m0644 xrdp/cursor0.cur %{buildroot}%{_libdir}/xrdp/
-install -m0644 xrdp/cursor1.cur %{buildroot}%{_libdir}/xrdp/
-install -m0644 xrdp/Tahoma-10.fv1 %{buildroot}%{_libdir}/xrdp/
-install -m0644 xrdp/xrdp.ini %{buildroot}%{_sysconfdir}/xrdp/
-install -m0644 xrdp/rsakeys.ini %{buildroot}%{_sysconfdir}/xrdp/
-
-install -m0644 instfiles/pam.d/sesman %{buildroot}%{_sysconfdir}/pam.d/
-install -m0644 docs/man/*.5 %{buildroot}%{_mandir}/man5/
-install -m0644 docs/man/*.5 %{buildroot}%{_mandir}/man8/
-
-install -m0755 xrdp.init %{buildroot}%{_initrddir}/xrdp
-
-install -m0644 xrdp.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/xrdp
-touch %{buildroot}/var/log/xrdp/sesman.log
-install -m0644 xrdp.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/xrdp
-
-# cleanup
-rm -rf %{buildroot}%{_sysconfdir}/init.d
+%make_install
-%post
-if [ $1 = 1 ]; then
- %create_ghostfile /var/log/xrdp/sesman.log root root 644
-fi
+#remove .la and .a files
+find %{buildroot} -name '*.a' -delete
+find %{buildroot} -name '*.la' -delete
-%_post_service xrdp
+# remove libpainter devel files
+rm -f %{buildroot}%{_includedir}/painter.h \
+ %{buildroot}%{_libdir}/libpainter.* \
+ %{buildroot}%{_libdir}/pkgconfig/libpainter.pc
-%preun
-%_preun_service xrdp
+# remove .so files for non-modules
+rm -f %{buildroot}%{_libdir}/xrdp/libcommon.so \
+ %{buildroot}%{_libdir}/xrdp/libscp.so \
+ %{buildroot}%{_libdir}/xrdp/libxrdp.so \
+ %{buildroot}%{_libdir}/xrdp/libxrdpapi.so \
+ %{buildroot}%{_libdir}/librfxencode.so
+
+#install sesman pam config /etc/pam.d/xrdp-sesman
+%{__install} -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/xrdp-sesman
+
+#install xrdp sysconfig /etc/sysconfig/xrdp
+%{__install} -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/xrdp
-%post -n %{libname} -p /sbin/ldconfig
+#install logrotate /etc/logrotate.d/xrdp
+%{__install} -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/xrdp
-%postun -n %{libname} -p /sbin/ldconfig
+#install openssl.conf /etc/xrdp
+%{__install} -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/xrdp/openssl.conf
-%clean
-rm -rf %{buildroot}
+#install 'bash -l' startwm script
+%{__install} -Dp -m 755 sesman/startwm-bash.sh %{buildroot}%{_libexecdir}/xrdp/startwm-bash.sh
+
+#move startwm and reconnectwm scripts to libexec
+%{__mv} -f %{buildroot}%{_sysconfdir}/xrdp/startwm.sh %{buildroot}%{_libexecdir}/xrdp/
+%{__mv} -f %{buildroot}%{_sysconfdir}/xrdp/reconnectwm.sh %{buildroot}%{_libexecdir}/xrdp/
+
+%post
+%_create_ssl_certificate %{name}
+%_post_service %{name}
+
+%preun
+%_preun_service %{name}
+
+%posttrans
+if [ ! -s %{_sysconfdir}/xrdp/rsakeys.ini ]; then
+ (umask 377; %{_bindir}/xrdp-keygen xrdp %{_sysconfdir}/xrdp/rsakeys.ini >/dev/null)
+fi
+chmod 400 %{_sysconfdir}/xrdp/rsakeys.ini
+
+if [ ! -s %{_sysconfdir}/xrdp/cert.pem ]; then
+ (umask 377; openssl req -x509 -newkey rsa:2048 -sha256 -nodes -days 3652 \
+ -keyout %{_sysconfdir}/xrdp/key.pem \
+ -out %{_sysconfdir}/xrdp/cert.pem \
+ -config %{_sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1)
+fi
+chmod 400 %{_sysconfdir}/xrdp/cert.pem
+chmod 400 %{_sysconfdir}/xrdp/key.pem
-%files -n %{libname}
-%defattr(-,root,root,-)
-%attr(0755,root,root) %{_libdir}/lib*.so.%{major}*
%files
-%defattr(-,root,root)
%doc COPYING *.txt
-%attr(0755,root,root) %{_initrddir}/xrdp
-%dir %{_sysconfdir}/xrdp
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/xrdp/*
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/sesman
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/xrdp
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/xrdp
-%attr(0755,root,root) %{_sbindir}/sesman
-%attr(0755,root,root) %{_sbindir}/sesrun
-%attr(0755,root,root) %{_sbindir}/sessvc
-%attr(0755,root,root) %{_sbindir}/sestest
-%attr(0755,root,root) %{_sbindir}/xrdp
-%attr(0755,root,root) %{_sbindir}/xrdp-startwm
%dir %{_libdir}/xrdp
-%attr(0644,root,root) %{_libdir}/xrdp/ad256.bmp
-%attr(0644,root,root) %{_libdir}/xrdp/cursor0.cur
-%attr(0644,root,root) %{_libdir}/xrdp/cursor1.cur
-%attr(0644,root,root) %{_libdir}/xrdp/Tahoma-10.fv1
-%attr(0644,root,root) %{_libdir}/xrdp/xrdp256.bmp
-%dir /var/log/xrdp
-%ghost /var/log/xrdp/sesman.log
-%attr(0644,root,root) %{_mandir}/man5/*
-%attr(0644,root,root) %{_mandir}/man8/*
-
-
-%changelog
-* Wed Dec 08 2010 Oden Eriksson <oeriksson@mandriva.com> 0.4.1-5mdv2011.0
-+ Revision: 615733
-- the mass rebuild of 2010.1 packages
-
-* Mon Apr 19 2010 Funda Wang <fwang@mandriva.org> 0.4.1-4mdv2010.1
-+ Revision: 536652
-- bump rel
-- fix link
-
-* Mon Apr 19 2010 Funda Wang <fwang@mandriva.org> 0.4.1-3mdv2010.1
-+ Revision: 536635
-- rebuild
-
-* Wed Aug 26 2009 Oden Eriksson <oeriksson@mandriva.com> 0.4.1-2mdv2010.0
-+ Revision: 421521
-- fix build with -Werror=format-security
-
-* Sun Sep 07 2008 Oden Eriksson <oeriksson@mandriva.com> 0.4.1-1mdv2009.0
-+ Revision: 282318
-- 0.4.1
-
-* Sat Aug 09 2008 Thierry Vignaud <tv@mandriva.org> 0.4.0-6.5mdv2009.0
-+ Revision: 269840
-- rebuild early 2009.0 package (before pixel changes)
-
-* Tue Jun 03 2008 Oden Eriksson <oeriksson@mandriva.com> 0.4.0-0.5mdv2009.0
-+ Revision: 214767
-- another approach at fixing it...
-
-* Mon Jun 02 2008 Oden Eriksson <oeriksson@mandriva.com> 0.4.0-0.4mdv2009.0
-+ Revision: 214245
-- added more fixes
-
-* Thu May 29 2008 Oden Eriksson <oeriksson@mandriva.com> 0.4.0-0.3mdv2009.0
-+ Revision: 213143
-- replaced the ldconfig hack with another hack in the new initscript :)
-
-* Thu May 29 2008 Oden Eriksson <oeriksson@mandriva.com> 0.4.0-0.2mdv2009.0
-+ Revision: 213053
-- instead of rpath use a ldconfig file
-- use a temporary initscript
-
-* Thu May 15 2008 Oden Eriksson <oeriksson@mandriva.com> 0.4.0-0.1mdv2009.0
-+ Revision: 207658
-- import xrdp
-
-
-* Thu May 15 2008 Oden Eriksson <oeriksson@mandriva.com> 0.4.0-0.1mdv2008.0
-- initial Mandriva package (dag import)
+%dir %{_sysconfdir}/xrdp
+%dir %{_sysconfdir}/xrdp/pulse
+%dir %{_datadir}/xrdp
+%dir %{_libexecdir}/xrdp
+%config(noreplace) %{_sysconfdir}/xrdp/xrdp.ini
+%config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
+%config(noreplace) %{_sysconfdir}/logrotate.d/xrdp
+%config(noreplace) %{_sysconfdir}/sysconfig/xrdp
+%config(noreplace) %{_sysconfdir}/xrdp/sesman.ini
+%exclude %{_sysconfdir}/xrdp/xrdp.sh
+%exclude %ghost %{_sysconfdir}/xrdp/*.pem
+%exclude %ghost %{_sysconfdir}/xrdp/rsakeys.ini
+%{_sysconfdir}/xrdp/km*.ini
+%{_sysconfdir}/xrdp/openssl.conf
+%{_sysconfdir}/xrdp/xrdp_keyboard.ini
+%{_libexecdir}/xrdp/startwm*.sh
+%{_libexecdir}/xrdp/reconnectwm.sh
+%{_bindir}/xrdp-genkeymap
+%{_bindir}/xrdp-sesadmin
+%{_bindir}/xrdp-keygen
+%{_bindir}/xrdp-sesrun
+%{_bindir}/xrdp-dis
+%{_sbindir}/xrdp-chansrv
+%{_sbindir}/xrdp
+%{_sbindir}/xrdp-sesman
+%{_datadir}/xrdp/ad256.bmp
+%{_datadir}/xrdp/cursor0.cur
+%{_datadir}/xrdp/cursor1.cur
+%{_datadir}/xrdp/xrdp256.bmp
+%{_datadir}/xrdp/sans-10.fv1
+%{_datadir}/xrdp/ad24b.bmp
+%{_datadir}/xrdp/xrdp24b.bmp
+%{_datadir}/xrdp/xrdp_logo.bmp
+%{_mandir}/man5/*
+%{_mandir}/man8/*
+%{_mandir}/man1/*
+#% {_libdir}/lib*.so.*
+%{_libdir}/xrdp/lib*.so.*
+%{_libdir}/xrdp/libmc.so
+%{_libdir}/xrdp/libvnc.so
+%{_libdir}/xrdp/libxup.so
+%{_sysconfdir}/xrdp/pulse/default.pa
+%{_unitdir}/xrdp-sesman.service
+%{_unitdir}/xrdp.service
+%ghost %{_localstatedir}/log/xrdp.log
+%ghost %{_localstatedir}/log/xrdp-sesman.log
+%attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
+
+%files devel
+%{_includedir}/xrdp*
+%{_includedir}/rfxcodec_*.h
+%{_libdir}/pkgconfig/xrdp.pc
+%{_libdir}/pkgconfig/rfxcodec.pc
diff --git a/xrdp.sysconfig b/xrdp.sysconfig
index ab0904b..53ea3aa 100644
--- a/xrdp.sysconfig
+++ b/xrdp.sysconfig
@@ -1,5 +1,5 @@
# put some options here
-# XRDP_OPTIONS=""
+#XRDP_OPTIONS=""
+#SESMAN_OPTIONS=""
-# SESMAN_OPTIONS=""