Revision: 25630 http://sourceforge.net/p/gar/code/25630 Author: dmichelsen Date: 2016-03-24 14:34:08 +0000 (Thu, 24 Mar 2016) Log Message: ----------- xrdp/trunk: Initial commit
Added Paths: ----------- csw/mgar/pkg/xrdp/ csw/mgar/pkg/xrdp/Makefile csw/mgar/pkg/xrdp/branches/ csw/mgar/pkg/xrdp/tags/ csw/mgar/pkg/xrdp/trunk/ csw/mgar/pkg/xrdp/trunk/Makefile csw/mgar/pkg/xrdp/trunk/checksums csw/mgar/pkg/xrdp/trunk/files/ csw/mgar/pkg/xrdp/trunk/files/0001-Do-not-use-mkdtemp-only-available-in-Solaris-10u11.patch Added: csw/mgar/pkg/xrdp/Makefile =================================================================== --- csw/mgar/pkg/xrdp/Makefile (rev 0) +++ csw/mgar/pkg/xrdp/Makefile 2016-03-24 14:34:08 UTC (rev 25630) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/xrdp/trunk =================================================================== --- csw/mgar/pkg/xrdp/trunk 2016-03-23 10:20:15 UTC (rev 25629) +++ csw/mgar/pkg/xrdp/trunk 2016-03-24 14:34:08 UTC (rev 25630) Property changes on: csw/mgar/pkg/xrdp/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/xrdp/trunk/Makefile =================================================================== --- csw/mgar/pkg/xrdp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xrdp/trunk/Makefile 2016-03-24 14:34:08 UTC (rev 25630) @@ -0,0 +1,61 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xrdp +VERSION = 0.6.1 +GARTYPE = v2 + +DESCRIPTION = An open source remote desktop protocol(rdp) server + +MASTER_SITES = $(SF_MIRROR) +DISTNAME = $(NAME)-v$(VERSION) +DISTFILES += $(DISTNAME).tar.gz + +# Taken from https://github.com/cherokee/webserver/issues/962 +PATCHFILES += 0001-Do-not-use-mkdtemp-only-available-in-Solaris-10u11.patch + +PACKAGES += CSWxrdp +SPKG_DESC_CSWxrdp = An open source remote desktop protocol(rdp) server +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWxrdp += CSWlibssl1-0-0 +# We need /usr/openwin/sfw/lib for libXfixes.so.1 +# This is in all libraries und binaries +CHECKPKG_OVERRIDES_CSWxrdp += bad-rpath-entry +# We need this for mkdtemp +CHECKPKG_OVERRIDES_CSWxrdp += forbidden-version-interface-dependencies|/opt/csw/lib/xrdp/libcommon.so.0.0.0|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1 + +REINPLACE_USRLOCAL += sesman/startwm.sh +REINPLACE_USRLOCAL += sesman/env.c +REINPLACE_USRLOCAL += instfiles/xrdp.sh + +# We need standard-conforming sigwait with two arguments +# Better check for this in configure +EXTRA_CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS + +# We must not strip down to old libc as we need mkdtemp from SUNW_1.23 +#LINKER_MAP_RELEASE = + +# We need this for sem_detroy, sem_init, sem_post and sem_wait +# Better check for this in configure +EXTRA_LINKER_FLAGS += -lrt + +# For bind +# Better check for this in configure +EXTRA_LINKER_FLAGS += -lsocket -lnsl + +# For libXfixes.so +EXTRA_LIB += /usr/openwin/sfw/lib + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-nopam +CONFIGURE_ARGS += --enable-kerberos +CONFIGURE_ARGS += --enable-pamuserpass +#CONFIGURE_ARGS += --enable-xrdpdebug +#CONFIGURE_ARGS += --enable-freerdp +#CONFIGURE_ARGS += --enable-freerdp1 + +include gar/category.mk + +pre-configure: + cd $(WORKSRC) && $ $(CONFIGURE_ENV) bash ./bootstrap + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/xrdp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/xrdp/trunk/checksums =================================================================== --- csw/mgar/pkg/xrdp/trunk/checksums (rev 0) +++ csw/mgar/pkg/xrdp/trunk/checksums 2016-03-24 14:34:08 UTC (rev 25630) @@ -0,0 +1 @@ +26099c6588943262023607c1b4e774d8 xrdp-v0.6.1.tar.gz Added: csw/mgar/pkg/xrdp/trunk/files/0001-Do-not-use-mkdtemp-only-available-in-Solaris-10u11.patch =================================================================== --- csw/mgar/pkg/xrdp/trunk/files/0001-Do-not-use-mkdtemp-only-available-in-Solaris-10u11.patch (rev 0) +++ csw/mgar/pkg/xrdp/trunk/files/0001-Do-not-use-mkdtemp-only-available-in-Solaris-10u11.patch 2016-03-24 14:34:08 UTC (rev 25630) @@ -0,0 +1,34 @@ +From bc750620f3b9bb567bf08dc9da0eccc9f607f9de Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen <d...@opencsw.org> +Date: Thu, 24 Mar 2016 15:13:37 +0100 +Subject: [PATCH] Do not use mkdtemp only available in Solaris 10u11 + +--- + common/os_calls.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/common/os_calls.c b/common/os_calls.c +index 692dc01..52c7d0d 100644 +--- a/common/os_calls.c ++++ b/common/os_calls.c +@@ -118,7 +118,7 @@ g_mk_temp_dir(const char* app_name) + "/tmp/.xrdp/%s-XXXXXX", app_name); + snprintf(g_temp_base_org, sizeof(g_temp_base_org), + "/tmp/.xrdp/%s-XXXXXX", app_name); +- if (mkdtemp(g_temp_base) == 0) ++ if (!mktemp( g_temp_base ) || mkdir( g_temp_base, 0700 ) ) + { + printf("g_mk_temp_dir: mkdtemp failed [%s]\n", g_temp_base); + return 1; +@@ -138,7 +138,7 @@ g_mk_temp_dir(const char* app_name) + return 1; + } + g_strncpy(g_temp_base, g_temp_base_org, 127); +- if (mkdtemp(g_temp_base) == 0) ++ if (!mktemp( g_temp_base ) || mkdir( g_temp_base, 0700 ) ) + { + printf("g_mk_temp_dir: mkdtemp failed [%s]\n", g_temp_base); + } +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.