mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/xrdp: rebuild against libressl-2.7

Browse Source
This commit is contained in:
Natanael Copa 2018-04-03 12:29:58 +00:00
parent 176f7e91a5
commit 4189862fa9
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main/xrdp/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Alan Lacerda <alacerda@alpinelinux.org> # Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
pkgname=xrdp pkgname=xrdp
pkgver=0.9.2 pkgver=0.9.2
pkgrel=3 pkgrel=4
pkgdesc="An open source RDP server" pkgdesc="An open source RDP server"
url="http://www.xrdp.org/" url="http://www.xrdp.org/"
arch="all" arch="all"
@ -17,7 +17,6 @@ subpackages="$pkgname-doc $pkgname-dev"
source="https://github.com/neutrinolabs/xrdp/releases/download/v$pkgver/xrdp-$pkgver.tar.gz source="https://github.com/neutrinolabs/xrdp/releases/download/v$pkgver/xrdp-$pkgver.tar.gz
xrdp.initd xrdp.initd
dynamic-link.patch dynamic-link.patch
libressl-support.patch
" "
builddir="$srcdir/$pkgname-$pkgver" builddir="$srcdir/$pkgname-$pkgver"
@ -28,7 +27,7 @@ build() {
_simd_opt="--without-simd" _simd_opt="--without-simd"
fi fi
cd "$builddir" cd "$builddir"
./bootstrap || return 1 ./bootstrap
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--disable-static \ --disable-static \
@ -38,21 +37,19 @@ build() {
--enable-fuse \ --enable-fuse \
--disable-pam \ --disable-pam \
--enable-tjpeg \ --enable-tjpeg \
$_simd_opt \ $_simd_opt
|| return 1 make
make || return 1
} }
package() { package() {
cd "$builddir" cd "$builddir"
make DESTDIR="${pkgdir}" install || return 1 make DESTDIR="${pkgdir}" install
install -m755 -D "$srcdir"/$pkgname.initd \ install -m755 -D "$srcdir"/$pkgname.initd \
"$pkgdir"/etc/init.d/$pkgname || return 1 "$pkgdir"/etc/init.d/$pkgname
ln -s $pkgname $pkgdir/etc/init.d/$pkgname-sesman ln -s $pkgname $pkgdir/etc/init.d/$pkgname-sesman
} }
sha512sums="49626a75b0cf432436d3ac39a91d10224a264e8603523baf441e1f95f44c7cca02c0824ca48406aacfe1d9b2475abfc5703ce44254c95fd49382a57b62ee636e xrdp-0.9.2.tar.gz sha512sums="49626a75b0cf432436d3ac39a91d10224a264e8603523baf441e1f95f44c7cca02c0824ca48406aacfe1d9b2475abfc5703ce44254c95fd49382a57b62ee636e xrdp-0.9.2.tar.gz
22b44398f4014ee67831051d1a1a859c6f4a601d75a03b33142ce7ea1e3f00082134337efb7da69e964f4a369d2b22114973221be2131f384f9459cc8e82fc13 xrdp.initd 22b44398f4014ee67831051d1a1a859c6f4a601d75a03b33142ce7ea1e3f00082134337efb7da69e964f4a369d2b22114973221be2131f384f9459cc8e82fc13 xrdp.initd
c20de35c4623bcdeae2ba8a740f965b5f320c506ff9a7b9444ec0c8300af518fd3a84b8c28f6e775b7bab73bdac7433be9261d133fc767d953ac54cb2d3b0afd dynamic-link.patch c20de35c4623bcdeae2ba8a740f965b5f320c506ff9a7b9444ec0c8300af518fd3a84b8c28f6e775b7bab73bdac7433be9261d133fc767d953ac54cb2d3b0afd dynamic-link.patch"
33447c194d97b3f04e697fcdc3d0d5ca8af13c986132f9c2caa3e1173a01cfdfb9cd3bc8695558aa6b804d0f5806b2580f0a8c84a4b40d44c1d11d02c2dc002d libressl-support.patch"

11
main/xrdp/libressl-support.patch
View File

@ -1,11 +0,0 @@
--- ./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)
{