summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-11-26 07:33:38 +0000
committerMike Frysinger <vapier@gentoo.org>2011-11-26 07:33:38 +0000
commite78c2d3c6d440008d85fa23ee2403a46a325bb86 (patch)
tree3f0933c363bc28ce7db538f96953086399622371 /net-misc
parentrewrite a bit of code to quote all user/group/shell/home strings (diff)
downloadgentoo-2-e78c2d3c6d440008d85fa23ee2403a46a325bb86.tar.gz
gentoo-2-e78c2d3c6d440008d85fa23ee2403a46a325bb86.tar.bz2
gentoo-2-e78c2d3c6d440008d85fa23ee2403a46a325bb86.zip
Move enew{user,group} to pkg_preinst so `die` works.
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/ChangeLog5
-rw-r--r--net-misc/openssh/openssh-5.9_p1-r3.ebuild6
2 files changed, 8 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index e163dc61a449..c03e4cccae28 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.428 2011/11/03 01:00:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.429 2011/11/26 07:33:38 vapier Exp $
+
+ 26 Nov 2011; Mike Frysinger <vapier@gentoo.org> openssh-5.9_p1-r3.ebuild:
+ Move enew{user,group} to pkg_preinst so `die` works.
03 Nov 2011; Mike Frysinger <vapier@gentoo.org> openssh-5.5_p1-r2.ebuild,
openssh-5.6_p1-r2.ebuild, openssh-5.7_p1-r1.ebuild, openssh-5.8_p1-r1.ebuild,
diff --git a/net-misc/openssh/openssh-5.9_p1-r3.ebuild b/net-misc/openssh/openssh-5.9_p1-r3.ebuild
index a430a662b829..257a08ab1ed8 100644
--- a/net-misc/openssh/openssh-5.9_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-5.9_p1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r3.ebuild,v 1.3 2011/11/03 01:00:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r3.ebuild,v 1.4 2011/11/26 07:33:38 vapier Exp $
EAPI="2"
inherit eutils flag-o-matic multilib autotools pam
@@ -242,10 +242,12 @@ src_test() {
fi
}
-pkg_postinst() {
+pkg_preinst() {
enewgroup sshd 22
enewuser sshd 22 -1 /var/empty sshd
+}
+pkg_postinst() {
elog "Starting with openssh-5.8p1, the server will default to a newer key"
elog "algorithm (ECDSA). You are encouraged to manually update your stored"
elog "keys list as servers update theirs. See ssh-keyscan(1) for more info."