From d4d3c59ba6ba7c699ad561b42f17837b2166c274 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Sep 05 2014 00:07:43 +0000 Subject: Bump up to 0.8.0, rework patches. --- diff --git a/.gitignore b/.gitignore index 5fcb8aa..f4b09de 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xrdp-cvs-03-17-2010.tar.gz /xrdp-cvs-03-17-2010.tar.gz /xrdp-HEAD-a9cfc23.tar.gz /xrdp-v0.6.1.tar.gz +/xrdp-0.8.0.tar.gz diff --git a/sources b/sources index e2f4711..95cb4e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26099c6588943262023607c1b4e774d8 xrdp-v0.6.1.tar.gz +2b0c3affc65ee77ad251514c62896757 xrdp-0.8.0.tar.gz diff --git a/xrdp-0.8.0-no-rpath.patch b/xrdp-0.8.0-no-rpath.patch new file mode 100644 index 0000000..ab48c65 --- /dev/null +++ b/xrdp-0.8.0-no-rpath.patch @@ -0,0 +1,24 @@ +diff -ruN xrdp-0.8.0-vanilla/libxrdp/Makefile.am xrdp-0.8.0/libxrdp/Makefile.am +--- xrdp-0.8.0-vanilla/libxrdp/Makefile.am 2014-05-20 15:41:42.000000000 +1000 ++++ xrdp-0.8.0/libxrdp/Makefile.am 2014-09-05 09:53:11.968767922 +1000 +@@ -30,7 +30,7 @@ + + if GOT_PREFIX + EXTRA_INCLUDES += -I$(prefix)/include +-EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib ++EXTRA_FLAGS += -L$(prefix)/lib + endif + + AM_CFLAGS = \ +diff -ruN xrdp-0.8.0-vanilla/xrdp/Makefile.am xrdp-0.8.0/xrdp/Makefile.am +--- xrdp-0.8.0-vanilla/xrdp/Makefile.am 2014-05-20 15:41:42.000000000 +1000 ++++ xrdp-0.8.0/xrdp/Makefile.am 2014-09-05 09:50:40.032961115 +1000 +@@ -12,7 +12,7 @@ + + if GOT_PREFIX + EXTRA_INCLUDES += -I$(prefix)/include +-EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib ++EXTRA_FLAGS += -L$(prefix)/lib + endif + + AM_CFLAGS = \ diff --git a/xrdp-pam-auth.patch b/xrdp-pam-auth.patch index 73d819e..2bcb610 100644 --- a/xrdp-pam-auth.patch +++ b/xrdp-pam-auth.patch @@ -1,11 +1,12 @@ diff -ruNp a/xrdp/instfiles/pam.d/xrdp-sesman b/xrdp/instfiles/pam.d/xrdp-sesman --- a/xrdp/instfiles/pam.d/xrdp-sesman 2009-09-20 16:06:14.000000000 -0300 +++ b/xrdp/instfiles/pam.d/xrdp-sesman 2009-09-16 16:39:16.000000000 -0300 -@@ -1,4 +1,12 @@ +@@ -1,5 +1,12 @@ #%PAM-1.0 --auth required pam_unix.so shadow nullok --auth required pam_env.so readenv=1 --account required pam_unix.so +-@include common-auth +-@include common-account +-@include common-session +-@include common-password +# Generic Fedora config +auth include password-auth +account include password-auth diff --git a/xrdp-use-xinitrc-in-startwm-sh.patch b/xrdp-use-xinitrc-in-startwm-sh.patch index 8a27cc3..dcb799f 100644 --- a/xrdp-use-xinitrc-in-startwm-sh.patch +++ b/xrdp-use-xinitrc-in-startwm-sh.patch @@ -12,6 +12,6 @@ diff -ruNp a/xrdp-HEAD-a9cfc23/sesman/startwm.sh b/xrdp-HEAD-a9cfc23/sesman/star + exit 0 +fi + - # change the order in line below to run to run whatever window manager you - # want, default to kde - + #start the window manager + wm_start() + { diff --git a/xrdp.spec b/xrdp.spec index be2f092..5ca1110 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -1,21 +1,18 @@ Summary: Open source remote desktop protocol (RDP) server Name: xrdp -Version: 0.6.1 -Release: 5%{?dist} +Version: 0.8.0 +Release: 1%{?dist} License: GPLv2+ with exceptions Group: Applications/Internet -URL: http://xrdp.sourceforge.net/ -Source0: http://sourceforge.net/projects/xrdp/files/xrdp/%{version}/xrdp-v%{version}.tar.gz +URL: http://www.xrdp.org/ +Source0: https://github.com/neutrinolabs/xrdp/archive/xrdp-%{version}.tar.gz Patch0: xrdp-pam-auth.patch Patch1: xrdp-use-xinitrc-in-startwm-sh.patch -Patch2: xrdp-pam_session.patch # https://sourceforge.net/tracker/?group_id=112022&atid=665248 # https://bugzilla.redhat.com/show_bug.cgi?id=905411 Patch3: xrdp-endian.patch -Patch4: xrdp-0.6.1-syslog-format.patch -Patch5: xrdp-0.6.1-memset.patch -Patch6: xrdp-0.6.1-implicit-decl.patch +Patch7: xrdp-0.8.0-no-rpath.patch Source1: xrdp.service Source2: xrdp-sesman.service @@ -45,15 +42,12 @@ server, capable of accepting connections from rdesktop and Microsoft's own terminal server / remote desktop clients. %prep -#%setup -q -n %{name}-%{version} -%setup -q -n %{name}-v%{version} +%setup -q -n %{name}-%{version} +#%setup -q -n %{name}-v%{version} %patch0 -p2 %patch1 -p2 -%patch2 -p1 %patch3 -p1 -b .endian -%patch4 -p1 -b .syslog-format -%patch5 -p1 -b .memset -%patch6 -p1 -b .implicit-decl +%patch7 -p1 -b .no-rpath # remove unused modules from xrdp login combobox %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini @@ -86,6 +80,10 @@ echo '#!/bin/bash -l find %{buildroot} -name '*.a' -exec rm {} \; find %{buildroot} -name '*.la' -exec rm {} \; +#remove unused SysV init file and its defaults +%{__rm} -f %{buildroot}/etc/init.d/xrdp +%{__rm} -f %{buildroot}/etc/default/xrdp + #install sesman pam config /etc/pam.d/xrdp-sesman %{__install} -Dp -m 644 instfiles/pam.d/xrdp-sesman %{buildroot}%{_sysconfdir}/pam.d/xrdp-sesman @@ -164,7 +162,6 @@ fi %{_bindir}/xrdp-sesadmin %{_bindir}/xrdp-keygen %{_bindir}/xrdp-sesrun -%{_bindir}/xrdp-sestest %{_bindir}/xrdp-dis %{_sbindir}/xrdp-chansrv %{_sbindir}/xrdp @@ -177,6 +174,8 @@ fi %{_datadir}/xrdp/sans-10.fv1 %{_datadir}/xrdp/ad24b.bmp %{_datadir}/xrdp/xrdp24b.bmp +%{_datadir}/xrdp/xrdp_logo.bmp +%{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* %{_libdir}/xrdp/lib*.so.* @@ -187,6 +186,7 @@ fi %{_libdir}/xrdp/libvnc.so %{_libdir}/xrdp/libxrdp.so %{_libdir}/xrdp/libxup.so +%{_libdir}/xrdp/libxrdpapi.so /lib/systemd/system/xrdp-sesman.service /lib/systemd/system/xrdp.service @@ -194,6 +194,12 @@ fi %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini %changelog +* Fri Sep 5 2014 Bojan Smojver - 0.8.0-1 +- bump up to 0.8.0 +- new URLs for the project +- do not specify rpaths +- remove some merged patches, rework others + * Thu Aug 21 2014 Kevin Fenzi - 0.6.1-5 - Rebuild for rpm bug 1131960