Revert "Bump up to 0.8.0, rework patches."
This reverts commit d4d3c59ba6.
This commit is contained in:
Bojan Smojver
parent
3c85a76e4c
commit
6ef183b5dd
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,4 +2,3 @@ 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
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
2b0c3affc65ee77ad251514c62896757 xrdp-0.8.0.tar.gz
|
||||
26099c6588943262023607c1b4e774d8 xrdp-v0.6.1.tar.gz
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
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 = \
|
||||
@ -1,12 +1,11 @@
|
||||
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,5 +1,12 @@
|
||||
@@ -1,4 +1,12 @@
|
||||
#%PAM-1.0
|
||||
-@include common-auth
|
||||
-@include common-account
|
||||
-@include common-session
|
||||
-@include common-password
|
||||
-auth required pam_unix.so shadow nullok
|
||||
-auth required pam_env.so readenv=1
|
||||
-account required pam_unix.so
|
||||
+# Generic Fedora config
|
||||
+auth include password-auth
|
||||
+account include password-auth
|
||||
|
||||
@ -12,6 +12,6 @@ diff -ruNp a/xrdp-HEAD-a9cfc23/sesman/startwm.sh b/xrdp-HEAD-a9cfc23/sesman/star
|
||||
+ exit 0
|
||||
+fi
|
||||
+
|
||||
#start the window manager
|
||||
wm_start()
|
||||
{
|
||||
# change the order in line below to run to run whatever window manager you
|
||||
# want, default to kde
|
||||
|
||||
|
||||
36
xrdp.spec
36
xrdp.spec
@ -1,18 +1,21 @@
|
||||
Summary: Open source remote desktop protocol (RDP) server
|
||||
Name: xrdp
|
||||
Version: 0.8.0
|
||||
Release: 1%{?dist}
|
||||
Version: 0.6.1
|
||||
Release: 5%{?dist}
|
||||
License: GPLv2+ with exceptions
|
||||
Group: Applications/Internet
|
||||
URL: http://www.xrdp.org/
|
||||
Source0: https://github.com/neutrinolabs/xrdp/archive/xrdp-%{version}.tar.gz
|
||||
URL: http://xrdp.sourceforge.net/
|
||||
Source0: http://sourceforge.net/projects/xrdp/files/xrdp/%{version}/xrdp-v%{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
|
||||
Patch7: xrdp-0.8.0-no-rpath.patch
|
||||
Patch4: xrdp-0.6.1-syslog-format.patch
|
||||
Patch5: xrdp-0.6.1-memset.patch
|
||||
Patch6: xrdp-0.6.1-implicit-decl.patch
|
||||
|
||||
Source1: xrdp.service
|
||||
Source2: xrdp-sesman.service
|
||||
@ -42,12 +45,15 @@ 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
|
||||
%patch7 -p1 -b .no-rpath
|
||||
%patch4 -p1 -b .syslog-format
|
||||
%patch5 -p1 -b .memset
|
||||
%patch6 -p1 -b .implicit-decl
|
||||
|
||||
# remove unused modules from xrdp login combobox
|
||||
%{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
|
||||
@ -80,10 +86,6 @@ 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
|
||||
|
||||
@ -162,6 +164,7 @@ fi
|
||||
%{_bindir}/xrdp-sesadmin
|
||||
%{_bindir}/xrdp-keygen
|
||||
%{_bindir}/xrdp-sesrun
|
||||
%{_bindir}/xrdp-sestest
|
||||
%{_bindir}/xrdp-dis
|
||||
%{_sbindir}/xrdp-chansrv
|
||||
%{_sbindir}/xrdp
|
||||
@ -174,8 +177,6 @@ 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.*
|
||||
@ -186,7 +187,6 @@ 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,12 +194,6 @@ fi
|
||||
%attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
|
||||
|
||||
%changelog
|
||||
* Fri Sep 5 2014 Bojan Smojver <bojan@rexursive.com> - 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 <kevin@scrye.com> - 0.6.1-5
|
||||
- Rebuild for rpm bug 1131960
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user