diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-10-23 11:12:09 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-10-23 11:12:09 +0000 |
| commit | cccae2282d94790a0faaa57fdf2588bc5aac8e5f (patch) | |
| tree | 1068e2412d36419b5ca81e0e2dfc9df8512e070e /net-misc | |
| parent | version bump & fix build without postscript (diff) | |
| download | gentoo-2-cccae2282d94790a0faaa57fdf2588bc5aac8e5f.tar.gz gentoo-2-cccae2282d94790a0faaa57fdf2588bc5aac8e5f.tar.bz2 gentoo-2-cccae2282d94790a0faaa57fdf2588bc5aac8e5f.zip | |
Warn about use of bundled rsakeys.ini, in case someone installed xrdp manually or using a bad ebuild before.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/xrdp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/xrdp/xrdp-0.6.1.ebuild | 14 | ||||
| -rw-r--r-- | net-misc/xrdp/xrdp-0.8.0.ebuild | 14 |
3 files changed, 32 insertions, 3 deletions
diff --git a/net-misc/xrdp/ChangeLog b/net-misc/xrdp/ChangeLog index 23d6ebfeb915..39e4731f0664 100644 --- a/net-misc/xrdp/ChangeLog +++ b/net-misc/xrdp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/xrdp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.10 2014/10/23 10:23:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.11 2014/10/23 11:12:09 mgorny Exp $ + + 23 Oct 2014; Michał Górny <mgorny@gentoo.org> xrdp-0.6.1.ebuild, + xrdp-0.8.0.ebuild: + Warn about use of bundled rsakeys.ini, in case someone installed xrdp manually + or using a bad ebuild before. 23 Oct 2014; Michał Górny <mgorny@gentoo.org> files/xrdp-initd, xrdp-0.6.1.ebuild, xrdp-0.8.0.ebuild: diff --git a/net-misc/xrdp/xrdp-0.6.1.ebuild b/net-misc/xrdp/xrdp-0.6.1.ebuild index 18a93877efe7..df0c5af06397 100644 --- a/net-misc/xrdp/xrdp-0.6.1.ebuild +++ b/net-misc/xrdp/xrdp-0.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild,v 1.2 2014/10/23 10:23:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild,v 1.3 2014/10/23 11:12:09 mgorny Exp $ EAPI=5 @@ -91,3 +91,15 @@ pkg_preinst() { || 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" + fi +} diff --git a/net-misc/xrdp/xrdp-0.8.0.ebuild b/net-misc/xrdp/xrdp-0.8.0.ebuild index b2ca2c54f007..52ff4dc86752 100644 --- a/net-misc/xrdp/xrdp-0.8.0.ebuild +++ b/net-misc/xrdp/xrdp-0.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild,v 1.2 2014/10/23 10:23:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild,v 1.3 2014/10/23 11:12:09 mgorny Exp $ EAPI=5 @@ -124,3 +124,15 @@ pkg_preinst() { || 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" + fi +} |