* [gentoo-commits] gentoo-x86 commit in net-misc/xrdp: xrdp-0.8.0.ebuild xrdp-0.6.1.ebuild ChangeLog
@ 2014-10-23 10:23 Michal Gorny (mgorny)
0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2014-10-23 10:23 UTC (permalink / raw
To: gentoo-commits
mgorny 14/10/23 10:23:41
Modified: xrdp-0.8.0.ebuild xrdp-0.6.1.ebuild ChangeLog
Log:
Fix install paths in init.d. Set proper --localstatedir. Both reported by Jan Psota.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.2 net-misc/xrdp/xrdp-0.8.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild?r1=1.1&r2=1.2
Index: xrdp-0.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xrdp-0.8.0.ebuild 23 Oct 2014 08:19:10 -0000 1.1
+++ xrdp-0.8.0.ebuild 23 Oct 2014 10:23:41 -0000 1.2
@@ -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.1 2014/10/23 08:19:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild,v 1.2 2014/10/23 10:23:41 mgorny Exp $
EAPI=5
@@ -59,7 +59,9 @@
&& ewarn "Both kerberos & pam auth enabled, kerberos will take precedence."
local myconf=(
- # configure.ac is completed flawed
+ # warning: configure.ac is completed flawed
+
+ --localstatedir="${EPREFIX}"/var
# -- authentication backends --
# kerberos is inside !SESMAN_NOPAM conditional for no reason
1.2 net-misc/xrdp/xrdp-0.6.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild?r1=1.1&r2=1.2
Index: xrdp-0.6.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xrdp-0.6.1.ebuild 23 Oct 2014 08:19:10 -0000 1.1
+++ xrdp-0.6.1.ebuild 23 Oct 2014 10:23:41 -0000 1.2
@@ -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.1 2014/10/23 08:19:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild,v 1.2 2014/10/23 10:23:41 mgorny Exp $
EAPI=5
@@ -41,7 +41,9 @@
&& ewarn "Both kerberos & pam auth enabled, kerberos will take precedence."
local myconf=(
- # configure.ac is completed flawed
+ # warning: configure.ac is completed flawed
+
+ --localstatedir="${EPREFIX}"/var
# -- authentication backends --
# kerberos is inside !SESMAN_NOPAM conditional for no reason
1.10 net-misc/xrdp/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 23 Oct 2014 08:19:10 -0000 1.9
+++ ChangeLog 23 Oct 2014 10:23:41 -0000 1.10
@@ -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.9 2014/10/23 08:19:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.10 2014/10/23 10:23:41 mgorny Exp $
+
+ 23 Oct 2014; Michał Górny <mgorny@gentoo.org> files/xrdp-initd,
+ xrdp-0.6.1.ebuild, xrdp-0.8.0.ebuild:
+ Fix install paths in init.d. Set proper --localstatedir. Both reported by Jan
+ Psota.
*xrdp-0.8.0 (23 Oct 2014)
*xrdp-0.6.1 (23 Oct 2014)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/xrdp: xrdp-0.8.0.ebuild xrdp-0.6.1.ebuild ChangeLog
@ 2014-10-23 11:12 Michal Gorny (mgorny)
0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2014-10-23 11:12 UTC (permalink / raw
To: gentoo-commits
mgorny 14/10/23 11:12:09
Modified: xrdp-0.8.0.ebuild xrdp-0.6.1.ebuild ChangeLog
Log:
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!)
Revision Changes Path
1.3 net-misc/xrdp/xrdp-0.8.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild?r1=1.2&r2=1.3
Index: xrdp-0.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xrdp-0.8.0.ebuild 23 Oct 2014 10:23:41 -0000 1.2
+++ xrdp-0.8.0.ebuild 23 Oct 2014 11:12:09 -0000 1.3
@@ -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 @@
|| 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
+}
1.3 net-misc/xrdp/xrdp-0.6.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild?r1=1.2&r2=1.3
Index: xrdp-0.6.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xrdp-0.6.1.ebuild 23 Oct 2014 10:23:41 -0000 1.2
+++ xrdp-0.6.1.ebuild 23 Oct 2014 11:12:09 -0000 1.3
@@ -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 @@
|| 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
+}
1.11 net-misc/xrdp/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/xrdp/ChangeLog?r1=1.10&r2=1.11
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 23 Oct 2014 10:23:41 -0000 1.10
+++ ChangeLog 23 Oct 2014 11:12:09 -0000 1.11
@@ -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:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-23 11:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-23 11:12 [gentoo-commits] gentoo-x86 commit in net-misc/xrdp: xrdp-0.8.0.ebuild xrdp-0.6.1.ebuild ChangeLog Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2014-10-23 10:23 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox