Commit 3af580e1 authored by Carlo Landmeter's avatar Carlo Landmeter

main/xrdp: upgrade to 0.9.2

parent b9efacb3
# Contributor: Alan Lacerda <alacerda@alpinelinux.org>
# Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
pkgname=xrdp
pkgver=0.8.0
pkgrel=1
pkgver=0.9.2
pkgrel=0
pkgdesc="An open source RDP server"
url="http://sourceforge.net/projects/xrdp/"
url="http://www.xrdp.org/"
arch="all"
license="GPLv2"
depends=""
depends_dev=""
makedepends="$depends_dev autoconf automake libtool libressl-dev libx11-dev
libxfixes-dev libxrandr-dev libjpeg-turbo-dev fuse-dev linux-headers"
libxfixes-dev libxrandr-dev libjpeg-turbo-dev fuse-dev linux-headers
nasm"
install=""
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/neutrinolabs/xrdp/archive/v$pkgver.tar.gz
source="https://github.com/neutrinolabs/xrdp/releases/download/v$pkgver/xrdp-$pkgver.tar.gz
xrdp.initd
musl-fixes.patch
cb4f2998992d1d39fa4629c2187832249c0a5932.patch"
dynamic-link.patch
libressl-support.patch
"
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
local i
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
builddir="$srcdir/$pkgname-$pkgver"
build() {
cd "$_builddir"
cd "$builddir"
./bootstrap || return 1
./configure \
--prefix=/usr \
......@@ -39,15 +31,15 @@ build() {
--sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/sbin \
--enable-nopam \
--enable-fuse \
--enable-jpeg \
--disable-pam \
--enable-tjpeg \
|| return 1
make || return 1
}
package() {
cd "$_builddir"
cd "$builddir"
make DESTDIR="${pkgdir}" install || return 1
install -m755 -D "$srcdir"/$pkgname.initd \
......@@ -55,15 +47,7 @@ package() {
ln -s $pkgname $pkgdir/etc/init.d/$pkgname-sesman
}
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
sha512sums="49626a75b0cf432436d3ac39a91d10224a264e8603523baf441e1f95f44c7cca02c0824ca48406aacfe1d9b2475abfc5703ce44254c95fd49382a57b62ee636e xrdp-0.9.2.tar.gz
22b44398f4014ee67831051d1a1a859c6f4a601d75a03b33142ce7ea1e3f00082134337efb7da69e964f4a369d2b22114973221be2131f384f9459cc8e82fc13 xrdp.initd
49f55afbbe8b837bfcb4ae47fc23321b3c7f66db1ccd9c3844e26c19e736b47e8471f7d4ab9ae4e5b104b23d46c303d8fc351da664ac74878926471d3105cb11 musl-fixes.patch
15abebd177aa11b7a3576b5fd0ac67707cf722669b49d038492e345768a1e8881bcf6ff1dbfb62c5f7cd07daf56560d942ad8682305f1d650c400ced334adb7f cb4f2998992d1d39fa4629c2187832249c0a5932.patch"
c20de35c4623bcdeae2ba8a740f965b5f320c506ff9a7b9444ec0c8300af518fd3a84b8c28f6e775b7bab73bdac7433be9261d133fc767d953ac54cb2d3b0afd dynamic-link.patch
33447c194d97b3f04e697fcdc3d0d5ca8af13c986132f9c2caa3e1173a01cfdfb9cd3bc8695558aa6b804d0f5806b2580f0a8c84a4b40d44c1d11d02c2dc002d libressl-support.patch"
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/xrdp/Makefile.am b/xrdp/Makefile.am
index a259ef3..0d8e66f 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -23,7 +23,7 @@ endif
if XRDP_RFXCODEC
AM_CPPFLAGS += -DXRDP_RFXCODEC
AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
-XRDP_EXTRA_LIBS += $(top_builddir)/librfxcodec/src/.libs/librfxencode.a
+XRDP_EXTRA_LIBS += $(top_builddir)/librfxcodec/src/librfxencode.la
endif
if XRDP_PIXMAN
@@ -35,7 +35,7 @@ endif
if XRDP_PAINTER
AM_CPPFLAGS += -DXRDP_PAINTER
AM_CPPFLAGS += -I$(top_srcdir)/libpainter/include
-XRDP_EXTRA_LIBS += $(top_builddir)/libpainter/src/.libs/libpainter.a
+XRDP_EXTRA_LIBS += $(top_builddir)/libpainter/src/libpainter.la
endif
sbin_PROGRAMS = \
--- ./common/ssl_calls.c.orig
+++ ./common/ssl_calls.c
@@ -40,7 +40,7 @@
#define SSL_WANT_READ_WRITE_TIMEOUT 100
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
static inline HMAC_CTX *
HMAC_CTX_new(void)
{
--- ./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
{
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment