aboutsummaryrefslogtreecommitdiffstats
path: root/main/xrdp
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2015-07-09 23:01:18 +0200
committerCarlo Landmeter <clandmeter@gmail.com>2015-07-09 23:01:25 +0200
commit007a6af5dab8d7a10455ac4ee18e2d6c21d1da82 (patch)
tree2a47e23be853eb9bff708db2211720b0f12325d4 /main/xrdp
parentf19b9d4d399d44a832ddf312c6723b4e9f2f13cd (diff)
downloadaports-007a6af5dab8d7a10455ac4ee18e2d6c21d1da82.tar.bz2
aports-007a6af5dab8d7a10455ac4ee18e2d6c21d1da82.tar.xz
main/xrdp: upgrade to 0.8.0
Diffstat (limited to 'main/xrdp')
-rw-r--r--main/xrdp/APKBUILD41
-rw-r--r--main/xrdp/cb4f2998992d1d39fa4629c2187832249c0a5932.patch28
-rw-r--r--main/xrdp/musl-fixes.patch11
3 files changed, 64 insertions, 16 deletions
diff --git a/main/xrdp/APKBUILD b/main/xrdp/APKBUILD
index bf8c3e6199..15413f71f2 100644
--- a/main/xrdp/APKBUILD
+++ b/main/xrdp/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Alan Lacerda <alacerda@alpinelinux.org>
# Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
pkgname=xrdp
-pkgver=0.6.1
-pkgrel=2
+pkgver=0.8.0
+pkgrel=0
pkgdesc="An open source RDP server"
url="http://sourceforge.net/projects/xrdp/"
arch="all"
@@ -10,13 +10,16 @@ license="GPLv2"
depends=""
depends_dev=""
makedepends="$depends_dev autoconf automake libtool openssl-dev libx11-dev
- libxfixes-dev"
+ libxfixes-dev libxrandr-dev libjpeg-turbo-dev fuse-dev"
install=""
subpackages="$pkgname-doc"
-source="http://ufpr.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-v$pkgver.tar.gz
- xrdp.initd"
+source="$pkgname-$pkgver.tar.gz::https://github.com/neutrinolabs/xrdp/archive/v$pkgver.tar.gz
+ xrdp.initd
+ musl-fixes.patch
+ cb4f2998992d1d39fa4629c2187832249c0a5932.patch"
+
+_builddir="$srcdir/$pkgname-$pkgver"
-_builddir="$srcdir/$pkgname-v$pkgver"
prepare() {
local i
cd "$_builddir"
@@ -29,8 +32,7 @@ prepare() {
build() {
cd "$_builddir"
- ./bootstrap \
- || return 1
+ ./bootstrap || return 1
./configure \
--prefix=/usr \
--disable-static \
@@ -38,9 +40,10 @@ build() {
--localstatedir=/var \
--sbindir=/usr/sbin \
--enable-nopam \
+ --enable-fuse \
+ --enable-jpeg \
|| return 1
- make \
- || return 1
+ make || return 1
}
package() {
@@ -53,9 +56,15 @@ package() {
ln -s $pkgname $pkgdir/etc/init.d/$pkgname-sesman
}
-md5sums="26099c6588943262023607c1b4e774d8 xrdp-v0.6.1.tar.gz
-9a70abdbf18d381a4762b68e5e6194de xrdp.initd"
-sha256sums="6880003b26799e4154a9486f671b6fc1b0487de0da2289573f46c090146e5a3b xrdp-v0.6.1.tar.gz
-052fbd34eb2cfb90b625d07d097b06a3754ad22864fac8489e5a8fd92e55dddf xrdp.initd"
-sha512sums="d2aa5c300ed4c5e84137776f3d5f63736a8d674ef3a96eda271fd6d80ecc394a1148dd9d09b3acf3916c774fd15fe7400271ffb034a45ddae6b34ea30fb2465c xrdp-v0.6.1.tar.gz
-22b44398f4014ee67831051d1a1a859c6f4a601d75a03b33142ce7ea1e3f00082134337efb7da69e964f4a369d2b22114973221be2131f384f9459cc8e82fc13 xrdp.initd"
+md5sums="2b0c3affc65ee77ad251514c62896757 xrdp-0.8.0.tar.gz
+9a70abdbf18d381a4762b68e5e6194de xrdp.initd
+9e98f8a2c17962a014a3b9321714f36d musl-fixes.patch
+ed169e5556a767cba6f49fec7fa909a5 cb4f2998992d1d39fa4629c2187832249c0a5932.patch"
+sha256sums="555f78980a3100d5bc8ea7cc6e3c49dd32dbeae9b686d90dd4e21d2c93a0d422 xrdp-0.8.0.tar.gz
+052fbd34eb2cfb90b625d07d097b06a3754ad22864fac8489e5a8fd92e55dddf xrdp.initd
+40807344e6a783133023ded613e42406052868b73ec0bddeb33c20b7222fe5bc musl-fixes.patch
+706a13667313dae1b6b29bcb64c6251a82afbaf3016e82ac8dab59b1a7cb83c0 cb4f2998992d1d39fa4629c2187832249c0a5932.patch"
+sha512sums="bd4dcbdc9e8d7eff75f5e6e58a1bc2a1edd08748b9e32c3060cce3186dc3c9277c3c5f3962cbab67b5e7f76941a8f16b231a9e4a15f33560f52c6da0caaeb960 xrdp-0.8.0.tar.gz
+22b44398f4014ee67831051d1a1a859c6f4a601d75a03b33142ce7ea1e3f00082134337efb7da69e964f4a369d2b22114973221be2131f384f9459cc8e82fc13 xrdp.initd
+49f55afbbe8b837bfcb4ae47fc23321b3c7f66db1ccd9c3844e26c19e736b47e8471f7d4ab9ae4e5b104b23d46c303d8fc351da664ac74878926471d3105cb11 musl-fixes.patch
+15abebd177aa11b7a3576b5fd0ac67707cf722669b49d038492e345768a1e8881bcf6ff1dbfb62c5f7cd07daf56560d942ad8682305f1d650c400ced334adb7f cb4f2998992d1d39fa4629c2187832249c0a5932.patch"
diff --git a/main/xrdp/cb4f2998992d1d39fa4629c2187832249c0a5932.patch b/main/xrdp/cb4f2998992d1d39fa4629c2187832249c0a5932.patch
new file mode 100644
index 0000000000..ab81be6cfd
--- /dev/null
+++ b/main/xrdp/cb4f2998992d1d39fa4629c2187832249c0a5932.patch
@@ -0,0 +1,28 @@
+From cb4f2998992d1d39fa4629c2187832249c0a5932 Mon Sep 17 00:00:00 2001
+From: Jay Sorg <jay.sorg@gmail.com>
+Date: Sat, 22 Nov 2014 23:17:00 -0800
+Subject: [PATCH] sesman: fix for --enable-nopam
+
+---
+ sesman/verify_user.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/sesman/verify_user.c b/sesman/verify_user.c
+index 49c475c..9dc77ef 100644
+--- a/sesman/verify_user.c
++++ b/sesman/verify_user.c
+@@ -102,6 +102,14 @@ auth_start_session(long in_val, int in_display)
+ }
+
+ /******************************************************************************/
++/* returns error */
++int DEFAULT_CC
++auth_stop_session(long in_val)
++{
++ return 0;
++}
++
++/******************************************************************************/
+ int DEFAULT_CC
+ auth_end(long in_val)
+ {
diff --git a/main/xrdp/musl-fixes.patch b/main/xrdp/musl-fixes.patch
new file mode 100644
index 0000000000..dbdd78234e
--- /dev/null
+++ b/main/xrdp/musl-fixes.patch
@@ -0,0 +1,11 @@
+--- ./sesman/chansrv/chansrv_fuse.h.orig
++++ ./sesman/chansrv/chansrv_fuse.h
+@@ -19,6 +19,8 @@
+ #ifndef _CHANSRV_FUSE_H
+ #define _CHANSRV_FUSE_H
+
++#include <sys/types.h>
++
+ /* a file or dir entry in the xrdp file system */
+ struct xrdp_inode
+ {