Hello community,
here is the log from the commit of package xrdp
checked in at Fri Sep 12 18:00:56 CEST 2008.
--------
--- xrdp/xrdp.changes 2008-09-03 00:02:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/xrdp/xrdp.changes 2008-09-12 03:15:04.741885000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 11 19:41:49 EDT 2008 - hfiguiere@suse.de
+
+- Add Avahi support.
+- More comprehensive support of NOMAD.
+
+-------------------------------------------------------------------
Old:
----
xrdp-0.4.0-docs.patch
xrdp-0.4.0-sesman.patch
xrdp-0.4.0-sesmantools.patch
xrdp-lsb.patch
xrdp-rpath-fix.patch
New:
----
xrdp-0.4.1..48f00f.diff.bz2
xrdp-avahi.diff
xrdp-NOMAD.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xrdp.spec ++++++
--- /var/tmp/diff_new_pack.C19829/_old 2008-09-12 18:00:50.000000000 +0200
+++ /var/tmp/diff_new_pack.C19829/_new 2008-09-12 18:00:50.000000000 +0200
@@ -20,20 +20,17 @@
Name: xrdp
Version: 0.4.1
-Release: 2
+Release: 4
License: GPL v2 or later
+Requires: dbus-1 xorg-x11-server-dmx xorg-x11-server-rdp
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gcc-c++ glibc-devel openssl-devel pam-devel
+BuildRequires: dbus-1-devel gcc-c++ glibc-devel libavahi-devel openssl-devel pam-devel pkg-config
Group: System/X11/Utilities
Summary: Open Source remo desktop protocol (RDP) server
Source: http://dl.sf.net/xrdp/xrdp-%{version}.tar.bz2
-Patch0: xrdp-0.4.0-sesman.patch
-Patch1: xrdp-0.4.0-sesmantools.patch
-Patch2: xrdp-0.4.0-docs.patch
-# misuse of rpath
-Patch3: xrdp-rpath-fix.patch
-# LSB compliance
-Patch4: xrdp-lsb.patch
+Patch0: xrdp-0.4.1..48f00f.diff.bz2
+Patch1: xrdp-NOMAD.diff
+Patch2: xrdp-avahi.diff
%description
A full functionnal Linux terminal server, capable of accepting
@@ -44,54 +41,54 @@
%prep
%setup
-%patch0
-%patch1
-%patch2
-%patch3 -p1
-%patch4 -p1
-%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' Makefile */Makefile
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' instfiles/*.sh
%build
-%{__make} %{?_smp_mflags}
+sh ./bootstrap
+%configure
+make
%install
-%{__rm} -rf %{buildroot}
-%{__make} installdeb DESTDIRDEB="%{buildroot}"
-%{__install} -Dp -m0755 sesman/libscp/libscp.so %{buildroot}%{_libdir}/xrdp/libscp.so
-#%{__rm} -rf %{buildroot}%{_sysconfdir}/init.d/xrdp_control.sh
-mv %{buildroot}%{_sysconfdir}/init.d/xrdp_control.sh %{buildroot}%{_sysconfdir}/init.d/xrdp
-mkdir %{buildroot}%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}"/xrdp" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/xrdp.conf
-#too generous on the executable
-chmod a-x %{buildroot}%{_sysconfdir}/ld.so.conf.d/xrdp.conf
-chmod a-x %{buildroot}%{_sysconfdir}/pam.d/sesman
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
chmod a-x %{buildroot}%{_sysconfdir}/xrdp/*.ini
+rm -f %{buildroot}/%{_libdir}/%{name}/*.*a
+rm -f %{buildroot}/%{_libdir}/%{name}/*.so
%clean
rm -rf "$RPM_BUILD_ROOT"
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%{fillup_and_insserv -f -y xrdp}
+/usr/bin/xrdp-keygen xrdp /etc/xrdp/rsakeys.ini
%preun
-%stop_on_removal
+%stop_on_removal xrdp
%postun
-/sbin/ldconfig > /dev/null 2>&1
-%insserv_cleanup
+/sbin/ldconfig
+%restart_on_update xrdp
+%{insserv_cleanup}
%files
%defattr(-,root,root)
%doc COPYING *.txt
%{_libdir}/xrdp/
%{_sysconfdir}/init.d/xrdp
-%{_sysconfdir}/ld.so.conf.d/xrdp.conf
%doc %{_mandir}/man5/*.5*
%doc %{_mandir}/man8/*.8*
+%{_bindir}/xrdp*
+%{_sbindir}/xrdp*
+%{_datadir}/xrdp/
%config(noreplace) %{_sysconfdir}/xrdp/
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/xrdp.conf
-%config(noreplace) %{_sysconfdir}/pam.d/sesman
+%config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
%changelog
+* Thu Sep 11 2008 hfiguiere@suse.de
+- Add Avahi support.
+- More comprehensive support of NOMAD.
* Tue Sep 02 2008 hfiguiere@suse.de
- Initial release.
++++++ xrdp-0.4.1..48f00f.diff.bz2 ++++++
++++ 26482 lines (skipped)
++++++ xrdp-avahi.diff ++++++
diff --git a/configure.ac b/configure.ac
index 788c8a0..228deca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ AM_INIT_AUTOMAKE([1.6 foreign])
AC_PROG_CC
AC_C_CONST
AC_PROG_LIBTOOL
+PKG_CHECK_MODULES(AVAHI, avahi-client >= 0.6.4)
AC_ARG_ENABLE(nopam, AS_HELP_STRING([--enable-nopam],
[Build no PAM support (default: no)]),
[nopam=true], [nopam=false])
diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index 32dd412..8a5dd67 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir)/common \
- -I$(top_srcdir)/libxrdp
+ -I$(top_srcdir)/libxrdp \
+ $(AVAHI_CFLAGS)
sbin_PROGRAMS = \
xrdp
@@ -18,11 +19,13 @@ xrdp_SOURCES = \
xrdp_painter.c \
xrdp_process.c \
xrdp_region.c \
- xrdp_wm.c
+ xrdp_wm.c \
+ xrdp_avahi.c
xrdp_LDADD = \
$(top_srcdir)/common/libcommon.la \
- $(top_srcdir)/libxrdp/libxrdp.la
+ $(top_srcdir)/libxrdp/libxrdp.la \
+ $(AVAHI_LIBS)
xrdpsysconfdir=$(sysconfdir)/xrdp
diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h
index 94e6ed5..3520285 100644
--- a/xrdp/xrdp.h
+++ b/xrdp/xrdp.h
@@ -149,6 +149,8 @@ xrdp_listen_create(void);
void APP_CC
xrdp_listen_delete(struct xrdp_listen* self);
int APP_CC
+xrdp_listen_get_port(char* port, int port_bytes);
+int APP_CC
xrdp_listen_main_loop(struct xrdp_listen* self);
/* xrdp_region.c */
@@ -395,3 +397,9 @@ server_get_channel_id(struct xrdp_mod* mod, char* name);
int DEFAULT_CC
server_send_to_channel(struct xrdp_mod* mod, int channel_id,
char* data, int data_len);
+
+/* xrdp_avahi.c */
+int APP_CC
+xrdp_avahi_init(void);
+void APP_CC
+xrdp_avahi_fini(void);
diff --git a/xrdp/xrdp_avahi.c b/xrdp/xrdp_avahi.c
new file mode 100644
index 0000000..e98ab6d
--- /dev/null
+++ b/xrdp/xrdp_avahi.c
@@ -0,0 +1,110 @@
+/*
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ xrdp: A Remote Desktop Protocol server.
+ Copyright (C) Novell, Inc. 2008
+
+ avahi integration
+
+*/
+
+#include "xrdp.h"
+
+#include