summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2021-04-12 13:40:52 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2021-04-12 13:40:52 +0200
commite7aa7483d8c32a1dfff4f8c2c9af460a3ac4a642 (patch)
treeba854819cafd282da5725e376fa77ec3a040adc0 /net-misc
parentnet-misc/xrdp: copy old version from main tree (before lastriting) (diff)
downloaddilfridge-e7aa7483d8c32a1dfff4f8c2c9af460a3ac4a642.tar.gz
dilfridge-e7aa7483d8c32a1dfff4f8c2c9af460a3ac4a642.tar.bz2
dilfridge-e7aa7483d8c32a1dfff4f8c2c9af460a3ac4a642.zip
net-misc/xrdp: start bump and cleanup, wip
Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/xrdp/Manifest2
-rw-r--r--net-misc/xrdp/xrdp-0.9.15.ebuild (renamed from net-misc/xrdp/xrdp-0.8.0-r1.ebuild)21
2 files changed, 8 insertions, 15 deletions
diff --git a/net-misc/xrdp/Manifest b/net-misc/xrdp/Manifest
index acd8c0e..1e42419 100644
--- a/net-misc/xrdp/Manifest
+++ b/net-misc/xrdp/Manifest
@@ -1 +1 @@
-DIST xrdp-0.8.0.tar.xz 1671376 SHA256 433535039f8b8766d9c22f62de9599afa94dd553e72d9791cec85a5e2f436a60 SHA512 bb2afefce7f53b6c3bca30cb6913171211df63a700f7d70325c1722348d5d31981e1d417727e48fd14aad500d0454e4126e6e1f81f8c09da4928b02f4acff26b WHIRLPOOL 39c1d4852f6f927fd348d345a8d4f4a79824eca0d5682340908d28f3b6b497ae33bfed944294b061b118e4154ed7c5dce15878302145ffabc2ca6b3a2eb07818
+DIST xrdp-0.9.15.tar.gz 1902890 BLAKE2B 272f4d07470074b282c8b7cbba31cf860e7cbc3163ebb2518c2e740878c598c0091dac430bb9122c2bfba04e1ac1526cce55b2d94db0f61121c713224f223e6c SHA512 5adc9f1ed2046d0c8c96e3ac4701b2e12b303fcb4ba22708e78398d4be32220b91a38d9425ddfebfad76045e14ed2d7886ed2b644971678101349b0ea0c479a6
diff --git a/net-misc/xrdp/xrdp-0.8.0-r1.ebuild b/net-misc/xrdp/xrdp-0.9.15.ebuild
index 0d94dcb..77ca33f 100644
--- a/net-misc/xrdp/xrdp-0.8.0-r1.ebuild
+++ b/net-misc/xrdp/xrdp-0.9.15.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=7
inherit autotools eutils pam systemd
DESCRIPTION="An open source Remote Desktop Protocol server"
HOMEPAGE="http://www.xrdp.org/"
-# mirrored from https://github.com/neutrinolabs/xrdp/releases
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+SRC_URI="https://github.com/neutrinolabs/xrdp/releases/download/v${PV}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -23,10 +22,9 @@ RDEPEND="dev-libs/openssl:0=
fuse? ( sys-fs/fuse:0= )
jpeg? ( virtual/jpeg:0= )
kerberos? ( virtual/krb5:0= )
- pam? ( virtual/pam:0= )
+ pam? ( sys-libs/pam:0= )
pulseaudio? ( media-sound/pulseaudio:0= )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils"
+BDEPEND=${RDEPEND}
RDEPEND="${RDEPEND}
|| (
net-misc/tigervnc:0[server,xorgmodule]
@@ -39,17 +37,12 @@ RDEPEND="${RDEPEND}
# xrdpvr? ( virtual/ffmpeg:0= )
src_prepare() {
- epatch_user
-
- # #540630: crypt() unchecked for NULL return
- epatch "${FILESDIR}"/${P}-crypt-null-return.patch
+ default
# don't let USE=debug adjust CFLAGS
sed -i -e 's:-g -O0::' configure.ac || die
# disallow root login by default
- sed -i -e '/^AllowRootLogin/s/1/0/' sesman/sesman.ini || die
- # Fedora files, not included here
- sed -i -e '/EnvironmentFile=/d' instfiles/*.service || die
+ sed -i -e '/^AllowRootLogin/s/true/false/' sesman/sesman.ini || die
# reorder so that X11rdp comes last again since it's not supported
sed -i -e '/^\[xrdp1\]$/,/^$/{wxrdp.ini.tmp
;d}' xrdp/xrdp.ini || die