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
commit228ad6d51432852e3962d980370995c44287e29e (patch)
tree4227f9b9821339d6d53260ff4cbae61424639759 /net-misc
parentrewrite a bit of code to quote all user/group/shell/home strings (diff)
downloadhistorical-228ad6d51432852e3962d980370995c44287e29e.tar.gz
historical-228ad6d51432852e3962d980370995c44287e29e.tar.bz2
historical-228ad6d51432852e3962d980370995c44287e29e.zip
Move enew{user,group} to pkg_preinst so `die` works.
Package-Manager: portage-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/Manifest10
-rw-r--r--net-misc/openssh/openssh-5.9_p1-r3.ebuild6
3 files changed, 13 insertions, 8 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/Manifest b/net-misc/openssh/Manifest
index 0fa60d5fee5b..f4e3103d6854 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -50,13 +50,13 @@ EBUILD openssh-5.7_p1-r1.ebuild 8216 RMD160 6c2f5ee20c52126855130ac6f0f45e229cd4
EBUILD openssh-5.8_p1-r1.ebuild 8431 RMD160 b4ab448d64511e1e0d5ca166b12ec0bfec343195 SHA1 8d40aed07dd7de318975940cb5f9fb820fb42ad8 SHA256 e83ca76abe80a5b2e15ec923e8eec2282f5a46327302251cec15a3223bc6322b
EBUILD openssh-5.8_p2-r1.ebuild 8464 RMD160 2d5aec103a6683b2ae7d45016ece52fb582a0cda SHA1 232cc8de1521d2a9be8dc03530952cf8bad8bf90 SHA256 2f9b20192aeb1169ad48ffcf1a084064bbe6c978a0e7faf3abfb6fd5705d9a6c
EBUILD openssh-5.8_p2.ebuild 8461 RMD160 bd31e8938815ddfba3d5844ba4c674f81b101fee SHA1 cae34fbf036adb349ef2e555677845d45f24398c SHA256 70ea3b105f069033d0872aa3c3d9252afdb11b79a61dbf5ca4d02c79488a0d5e
-EBUILD openssh-5.9_p1-r3.ebuild 8787 RMD160 317a10a844d2415ee03ae3bbc4545c8272f1ae39 SHA1 98443ab559560d0b8ad7137ff862a2ff8c27acf2 SHA256 f4c58636b41b0a90218d09f22e614040b819214942a8b435b555ba19cb963b3a
-MISC ChangeLog 68050 RMD160 9b11ede6768c6095a399218f213735eb9a4ec73e SHA1 f82b48f46f26eb8f7f068b6fdba17ceafb923aa8 SHA256 d1bf5b6ad46183b7756d1bb4be1f0d5f3c18db91420ad1d1f7dd7b19414ffffa
+EBUILD openssh-5.9_p1-r3.ebuild 8805 RMD160 c962e60bf28684182c81a9ad70b02914fae84b3e SHA1 b39f7b2207e4afbc5a44fb293bb0bc5d88761811 SHA256 6b6431bda2957754a63b0b8925356e73bb6f691fedee8eb2adf65787d8cd08d2
+MISC ChangeLog 68182 RMD160 0ebb70128e13bbe154fd8d7d952b908ebe5f1268 SHA1 766a4e5a1f10c0955aa45039eb241961df80c1cd SHA256 0fe60a7a2aaba263e02aa958082d6f3b7e78f1131fd5a159680f90678e74b0b4
MISC metadata.xml 1599 RMD160 31fdd1531a4111aa437882680029451b29ddf4aa SHA1 af53a6887ebf563150184ab40b4cc018ab4e4d3f SHA256 fddc51b98b6831f5bc0f1f5fdeb78c064f9c40fc5c9a9f31ec816890e6aade86
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk6x56kACgkQaC/OocHi7JZ+pgD9FLqoljv94poJdjMo2dmmB3qY
-CpgQGpI1FIXc3qQgPI8A/i9l/sPDIqDnMETerXZvYxSyWTZoGeQ6M5Ozb1+HtP/0
-=i6SI
+iF4EAREIAAYFAk7QlmoACgkQaC/OocHi7JZA8gD8DfdSy/3Uo0xY9QpOACcWyNp4
+zxfwbkY8K2HLBf65dbsA/0e6hekVYKUMW+BJxpRRRq662X8C52FDJD4EsH6dLvkp
+=BJBR
-----END PGP SIGNATURE-----
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."