diff options
author | 2023-10-05 11:40:58 +0200 | |
---|---|---|
committer | 2023-10-05 11:41:46 +0200 | |
commit | 36b2852ec377cc5d7ada7b9436bb2e719bfe949c (patch) | |
tree | 069e5d4c1ae3e40db72c5a485f251fe8c6eece39 | |
parent | sys-devel/gcc: unkeyword 13.2.1_p20230826-r1 (diff) | |
download | dilfridge-36b2852ec377cc5d7ada7b9436bb2e719bfe949c.tar.gz dilfridge-36b2852ec377cc5d7ada7b9436bb2e719bfe949c.tar.bz2 dilfridge-36b2852ec377cc5d7ada7b9436bb2e719bfe949c.zip |
net-misc/xrdp: update
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rw-r--r-- | net-misc/xrdp/Manifest | 3 | ||||
-rw-r--r-- | net-misc/xrdp/files/xrdp-0.9.23.1-flags.patch (renamed from net-misc/xrdp/files/xrdp-0.9.15-flags.patch) | 10 | ||||
-rw-r--r-- | net-misc/xrdp/xrdp-0.9.16.ebuild | 147 | ||||
-rw-r--r-- | net-misc/xrdp/xrdp-0.9.23.1.ebuild (renamed from net-misc/xrdp/xrdp-0.9.15.ebuild) | 6 |
4 files changed, 9 insertions, 157 deletions
diff --git a/net-misc/xrdp/Manifest b/net-misc/xrdp/Manifest index 47133f2..2e473cc 100644 --- a/net-misc/xrdp/Manifest +++ b/net-misc/xrdp/Manifest @@ -1,2 +1 @@ -DIST xrdp-0.9.15.tar.gz 1902890 BLAKE2B 272f4d07470074b282c8b7cbba31cf860e7cbc3163ebb2518c2e740878c598c0091dac430bb9122c2bfba04e1ac1526cce55b2d94db0f61121c713224f223e6c SHA512 5adc9f1ed2046d0c8c96e3ac4701b2e12b303fcb4ba22708e78398d4be32220b91a38d9425ddfebfad76045e14ed2d7886ed2b644971678101349b0ea0c479a6 -DIST xrdp-0.9.16.tar.gz 1959512 BLAKE2B 4e146fc3b4b8f6c8c78678193883c6ceef8e4d4c4d410a17aace0f9acbc3fe7a1ca6cc3041788d88197e98f95ccb7f8f69b5e94d4a80d30c6d505e3434e718b3 SHA512 8088b0ffc23510591e30f345d4bcd0132e4dbaf162468b7fc99c6c0d642a55cecbaf429eec555d351cba0978c2021e0e1ec7faef109971848692cbd5dde49a0f +DIST xrdp-0.9.23.1.tar.gz 2063776 BLAKE2B 035cba5a1e17187f822882688051222fc56e8144f580b88a356d95d8fc0285239ed204c8256d6ec0041021d79004f358013b766f2372d0a0c9aaea6aaac59bc4 SHA512 92b732b85afe49c49c103c37404c66aa24fddf1583a91ec4a691044a8f02ec1abd7c834a6e0f06469e3a3bfe9fae69d90759a7ea6904ccf468271309b1fe5577 diff --git a/net-misc/xrdp/files/xrdp-0.9.15-flags.patch b/net-misc/xrdp/files/xrdp-0.9.23.1-flags.patch index 49dfd62..629560e 100644 --- a/net-misc/xrdp/files/xrdp-0.9.15-flags.patch +++ b/net-misc/xrdp/files/xrdp-0.9.23.1-flags.patch @@ -1,14 +1,14 @@ -diff -ruN xrdp-0.9.15.orig/configure.ac xrdp-0.9.15/configure.ac ---- xrdp-0.9.15.orig/configure.ac 2020-12-28 15:03:43.000000000 +0100 -+++ xrdp-0.9.15/configure.ac 2021-04-13 00:00:48.367314011 +0200 -@@ -156,13 +156,6 @@ +diff -ruN xrdp-0.9.23.1.orig/configure.ac xrdp-0.9.23.1/configure.ac +--- xrdp-0.9.23.1.orig/configure.ac 2023-09-27 19:59:31.000000000 +0200 ++++ xrdp-0.9.23.1/configure.ac 2023-10-05 11:38:12.625508282 +0200 +@@ -182,13 +182,6 @@ AX_CFLAGS_WARN_ALL AX_APPEND_COMPILE_FLAGS([-Wwrite-strings]) -AM_COND_IF([LINUX], - [AX_APPEND_COMPILE_FLAGS([-Werror])]) # bsd has warnings that have not been fixed yet - --AM_COND_IF([XRDP_DEBUG], +-AM_COND_IF([DEVEL_DEBUG], - [AX_APPEND_COMPILE_FLAGS([-g -O0])], - [AX_APPEND_COMPILE_FLAGS([-O2])]) - diff --git a/net-misc/xrdp/xrdp-0.9.16.ebuild b/net-misc/xrdp/xrdp-0.9.16.ebuild deleted file mode 100644 index 8f825e3..0000000 --- a/net-misc/xrdp/xrdp-0.9.16.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools eutils pam systemd - -DESCRIPTION="An open source Remote Desktop Protocol server" -HOMEPAGE="http://www.xrdp.org/" -SRC_URI="https://github.com/neutrinolabs/xrdp/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="aac debug fuse ipv6 kerberos jpeg lame opus pam pixman pulseaudio" - -RDEPEND="dev-libs/openssl:0= - x11-libs/libX11:0= - x11-libs/libXfixes:0= - x11-libs/libXrandr:0= - aac? ( media-libs/fdk-aac:0= ) - fuse? ( sys-fs/fuse:0= ) - jpeg? ( virtual/jpeg:0= ) - kerberos? ( virtual/krb5:0= ) - lame? ( media-sound/lame:0= ) - opus? ( media-libs/libopusenc:0= ) - pam? ( sys-libs/pam:0= ) - pixman? ( x11-libs/pixman:0= ) - pulseaudio? ( media-sound/pulseaudio:0= ) -" -BDEPEND="${RDEPEND} - virtual/pkgconfig -" -PDEPEND=" - || ( - net-misc/tigervnc[server,xorgmodule] - net-misc/xorgxrdp - ) -" - -# does not work with gentoo version of freerdp -# neutrinordp? ( net-misc/freerdp:0= ) -# does not work -# xrdpvr? ( media-video/ffmpeg:0= ) - -PATCHES=( - "${FILESDIR}/${PN}-0.9.15-flags.patch" -) - -src_prepare() { - default - - # disallow root login by default - sed -i -e '/^AllowRootLogin/s/true/false/' sesman/sesman.ini || die - - eautoreconf -} - -src_configure() { - use kerberos && use pam \ - && ewarn "Both kerberos & pam auth enabled, kerberos will take precedence." - - local myconf=( - --localstatedir="${EPREFIX}"/var - - # -- authentication backends -- - # kerberos is inside !SESMAN_NOPAM conditional for no reason - # (is this still correct?) - $(use pam || use kerberos || echo --enable-nopam) - $(usex kerberos --enable-kerberos '') - - # pam_userpass is not in Gentoo at the moment - --disable-pamuserpass - - # -- jpeg support -- - $(usex jpeg --enable-jpeg '') - # the package supports explicit linking against libjpeg-turbo - # (no need for -ljpeg compat) - $(use jpeg && has_version 'media-libs/libjpeg-turbo:0' && echo --enable-tjpeg) - - # -- sound support -- - $(usex pulseaudio '--enable-simplesound --enable-loadpulsemodules' '') - - # -- others -- - $(usex debug --enable-xrdpdebug '') - $(usex fuse --enable-fuse '') - # $(usex neutrinordp --enable-neutrinordp '') - # $(usex xrdpvr --enable-xrdpvr '') - - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(usex ipv6 --enable-ipv6 '') - $(usex aac --enable-fdkaac '') - $(usex opus --enable-opus '') - $(usex lame --enable-mp3lame '') - $(usex pixman --enable-pixman '') - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - # use our pam.d file since upstream's incompatible with Gentoo - use pam && newpamd "${FILESDIR}"/xrdp-sesman.pamd xrdp-sesman - # and our startwm.sh - exeinto /etc/xrdp - doexe "${FILESDIR}"/startwm.sh - - # own /etc/xrdp/rsakeys.ini - : > rsakeys.ini - insinto /etc/xrdp - doins rsakeys.ini - - newinitd "${FILESDIR}/${PN}-initd" ${PN} -} - -pkg_preinst() { - # either copy existing keys over to avoid CONFIG_PROTECT whining - # or generate new keys (but don't include them in binpkg!) - if [[ -f "${EROOT}"/etc/xrdp/rsakeys.ini ]]; then - cp {"${EROOT}","${ED}"}/etc/xrdp/rsakeys.ini || die - else - einfo "Running xrdp-keygen to generate new rsakeys.ini ..." - LD_LIBRARY_PATH="${ED}"/usr/lib64/xrdp "${ED}"/usr/bin/xrdp-keygen xrdp "${ED}"/etc/xrdp/rsakeys.ini \ - || die "xrdp-keygen failed to generate RSA keys" - fi -} - -pkg_postinst() { - # check for use of bundled rsakeys.ini (installed by default upstream) - if [[ $(cksum "${EROOT}"/etc/xrdp/rsakeys.ini) == '2935297193 1019 '* ]] - then - ewarn "You seem to be using upstream bundled rsakeys.ini. This means that" - ewarn "your communications are encrypted using a well-known key. Please" - ewarn "consider regenerating rsakeys.ini using the following command:" - ewarn - ewarn " ${EROOT}/usr/bin/xrdp-keygen xrdp ${EROOT}/etc/xrdp/rsakeys.ini" - ewarn - fi - - elog "Various session types require different backend implementations:" - elog "- sesman-Xvnc requires net-misc/tigervnc[server,xorgmodule]" - elog "- sesman-Xorgrdp requires net-misc/xorgxrdp" -} diff --git a/net-misc/xrdp/xrdp-0.9.15.ebuild b/net-misc/xrdp/xrdp-0.9.23.1.ebuild index 0963dca..1e503da 100644 --- a/net-misc/xrdp/xrdp-0.9.15.ebuild +++ b/net-misc/xrdp/xrdp-0.9.23.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools eutils pam systemd +inherit autotools pam systemd DESCRIPTION="An open source Remote Desktop Protocol server" HOMEPAGE="http://www.xrdp.org/" @@ -44,7 +44,7 @@ PDEPEND=" # xrdpvr? ( media-video/ffmpeg:0= ) PATCHES=( - "${FILESDIR}/${P}-flags.patch" + "${FILESDIR}/${PN}-0.9.23.1-flags.patch" ) src_prepare() { |