X-Git-Url: https://git.tld-linux.org/?p=packages%2Fxrdp.git;a=blobdiff_plain;f=xrdp.spec;h=a1f54d9db3ff554f3477dd9e7c9497c5e670aa95;hp=dc65ae3f91bb4a1e9712d9448665020305199967;hb=HEAD;hpb=98c0c55bc4aa046b870e942a99dac55d77e357d7

diff --git a/xrdp.spec b/xrdp.spec
index dc65ae3..aea575b 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -1,35 +1,51 @@
 Summary:	Remote desktop server
 Summary(pl.UTF-8):	Serwer remote desktop
 Name:		xrdp
-Version:	0.6.1
-Release:	3
-License:	GPL
+Version:	0.9.25.1
+Release:	1
+License:	Apache v2.0
 Group:		X11/Applications/Networking
-Source0:	http://download.sourceforge.net/xrdp/%{name}-v%{version}.tar.gz
-# Source0-md5:	26099c6588943262023607c1b4e774d8
+#Source0Download: https://github.com/neutrinolabs/xrdp/releases
+Source0:	https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	f30ad85ce78c8542d4f7b03c28c8815f
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.README.TLD
 Source4:	%{name}.README.TLD.pl
 Source5:	startwm.sh
-Patch0:		format-security.patch
-Patch1:		build.patch
-Patch2:		link.patch
-Patch3:		quiet_start.patch
-Patch4:		default_keymap.patch
-Patch5:		pidfile_early.patch
-Patch6:		reuse_session.patch
-Patch7:		config.patch
-URL:		http://xrdp.sourceforge.net/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	freerdp-devel
+Patch0:		config.patch
+Patch1:		quiet.patch
+Patch2:		x32.patch
+URL:		http://xrdp.org/
+BuildRequires:	autoconf >= 2.65
+BuildRequires:	automake >= 1:1.7.2
+BuildRequires:	fdk-aac-devel >= 0.1.0
+BuildRequires:	imlib2-devel >= 1.4.5
+BuildRequires:	lame-libs-devel
+BuildRequires:	libfuse-devel >= 2.6
+BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	libtool
-BuildRequires:	openssl-devel
+BuildRequires:	nasm
+BuildRequires:	openssl-devel >= 0.9.8
+BuildRequires:	opus-devel
 BuildRequires:	pam-devel
+BuildRequires:	pixman-devel >= 0.1.0
+BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXfixes-devel
+BuildRequires:	xorg-lib-libXrandr-devel
 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
+Requires:	libfuse >= 2.6
+Requires:	openssl >= 0.9.8
+Requires:	pixman >= 0.1.0
 Requires:	rc-scripts
 Requires:	xinitrc-ng
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,44 +67,107 @@ 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.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek xrdp.
+
+%package static
+Summary:	Static xrdp libraries
+Summary(pl.UTF-8):	Statyczne biblioteki xrdp
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static xrdp libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki xrdp.
+
 %prep
-%setup -q -n %{name}-v%{version}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 install %{SOURCE3} README.TLD
 install %{SOURCE4} README.TLD.pl
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd libpainter
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ../librfxcodec
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+cd ..
 %configure \
-	--enable-freerdp1
+	--enable-fdkaac \
+	--enable-fuse \
+	--enable-ipv6 \
+	--enable-mp3lame \
+	--enable-opus \
+	--enable-pam-config=redhat \
+	--enable-painter \
+	--enable-pixman \
+	--disable-silent-rules \
+	--enable-tjpeg \
+	--enable-vsock \
+	--with-imlib2
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name},pam.d,rc.d/init.d}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},/etc/{pam.d,rc.d/init.d,security}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/xrdp
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/sesman
-%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xrdp-sesman
-%{__ln} -s sesman $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xrdp-sesman
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/xrdp
+install %{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
+
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.{a,la}
-%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/xrdp/startwm.sh
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xrdp/startwm.sh
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+%pre
+%groupadd -g 183 xrdp
 
 %post
 /sbin/chkconfig --add xrdp
@@ -100,46 +179,52 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del xrdp
 fi
 
+%postun
+if [ "$1" = "0" ]; then
+	%groupremove xrdp
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc *.txt
-%doc README.TLD
-%doc README.TLD.pl
+%doc COPYING NEWS.md README.md README.TLD
+%lang(pl) %doc README.TLD.pl
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sesman
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.sesman
 %attr(640,root,root) /etc/pam.d/xrdp-sesman
 %attr(754,root,root) /etc/rc.d/init.d/xrdp
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/xrdp.ini
+%dir %{_sysconfdir}/%{name}/pulse
+%config(noreplace) %{_sysconfdir}/%{name}/cert.pem
+%config(noreplace) %{_sysconfdir}/%{name}/key.pem
 %config(noreplace) %{_sysconfdir}/%{name}/rsakeys.ini
 %config(noreplace) %{_sysconfdir}/%{name}/sesman.ini
-%{_sysconfdir}/%{name}/km-0407.ini
-%{_sysconfdir}/%{name}/km-0409.ini
-%{_sysconfdir}/%{name}/km-040c.ini
-%{_sysconfdir}/%{name}/km-0410.ini
-%{_sysconfdir}/%{name}/km-0419.ini
-%{_sysconfdir}/%{name}/km-041d.ini
+%config(noreplace) %{_sysconfdir}/%{name}/xrdp.ini
+%config(noreplace) %{_sysconfdir}/%{name}/xrdp_keyboard.ini
+%{_sysconfdir}/%{name}/km-*.ini
+%config(noreplace) %{_sysconfdir}/%{name}/pulse/default.pa
+%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-genkeymap
 %attr(755,root,root) %{_bindir}/xrdp-keygen
 %attr(755,root,root) %{_bindir}/xrdp-sesadmin
 %attr(755,root,root) %{_bindir}/xrdp-sesrun
-%attr(755,root,root) %{_bindir}/xrdp-sestest
 %attr(755,root,root) %{_sbindir}/xrdp
 %attr(755,root,root) %{_sbindir}/xrdp-chansrv
 %attr(755,root,root) %{_sbindir}/xrdp-sesman
-%attr(755,root,root) %{_sbindir}/xrdp-sessvc
 %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/librdp.so*
 %attr(755,root,root) %{_libdir}/xrdp/libscp.so*
 %attr(755,root,root) %{_libdir}/xrdp/libvnc.so*
 %attr(755,root,root) %{_libdir}/xrdp/libxrdp.so*
-%attr(755,root,root) %{_libdir}/xrdp/libxrdpfreerdp1.so*
+%attr(755,root,root) %{_libdir}/xrdp/libxrdpapi.so*
 %attr(755,root,root) %{_libdir}/xrdp/libxup.so*
 %dir %{_datadir}/xrdp
 %{_datadir}/xrdp/ad24b.bmp
@@ -149,8 +234,43 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xrdp/sans-10.fv1
 %{_datadir}/xrdp/xrdp24b.bmp
 %{_datadir}/xrdp/xrdp256.bmp
+%{_datadir}/xrdp/xrdp_logo.bmp
+%{_mandir}/man1/xrdp-dis.1*
 %{_mandir}/man5/sesman.ini.5*
 %{_mandir}/man5/xrdp.ini.5*
+%{_mandir}/man8/xrdp-chansrv.8*
+%{_mandir}/man8/xrdp-genkeymap.8*
+%{_mandir}/man8/xrdp-keygen.8*
+%{_mandir}/man8/xrdp-sesadmin.8*
 %{_mandir}/man8/xrdp-sesman.8*
 %{_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
+%{_includedir}/rfxcodec_decode.h
+%{_includedir}/rfxcodec_encode.h
+%{_includedir}/xrdp_client_info.h
+%{_includedir}/xrdp_constants.h
+%{_includedir}/xrdp_rail.h
+%{_includedir}/xrdp_sockets.h
+%{_pkgconfigdir}/libpainter.pc
+%{_pkgconfigdir}/rfxcodec.pc
+%{_pkgconfigdir}/xrdp.pc
+
+%files static
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpainter.a
+%attr(755,root,root) %{_libdir}/librfxencode.a