diff options
author | Daniel Ahlberg <aliz@gentoo.org> | 2004-01-03 15:21:16 +0000 |
---|---|---|
committer | Daniel Ahlberg <aliz@gentoo.org> | 2004-01-03 15:21:16 +0000 |
commit | 54f02343e527e24cc71d504b85efe3fbd3ce23da (patch) | |
tree | b7b3e3054f822a99ac2e0dc7b2073ab19877cbfd /net-misc/openssh | |
parent | Adding amd64 keyword to make repoman happy (diff) | |
download | gentoo-2-54f02343e527e24cc71d504b85efe3fbd3ce23da.tar.gz gentoo-2-54f02343e527e24cc71d504b85efe3fbd3ce23da.tar.bz2 gentoo-2-54f02343e527e24cc71d504b85efe3fbd3ce23da.zip |
Hopefully fixing #35369.
Diffstat (limited to 'net-misc/openssh')
-rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
-rw-r--r-- | net-misc/openssh/Manifest | 10 | ||||
-rw-r--r-- | net-misc/openssh/openssh-3.7.1_p2-r1.ebuild | 17 |
3 files changed, 15 insertions, 18 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 99e730d9fab7..bc9b6c159197 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,8 +1,12 @@ # ChangeLog for net-misc/openssh # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.57 2003/11/17 23:55:26 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.58 2004/01/03 15:21:07 aliz Exp $ + 03 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> openssh-3.7.1_p2-r1.ebuild: + Change adding sshd user and group to user enewuser and enewgroup. Should + fix #35369. + *openssh-3.7.1_p2-r1 (05 Nov 2003) 17 Nov 2003; Joshua Kinard <kumba@gentoo.org> openssh-3.7.1_p2-r1.ebuild: diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index e10e60aaebaa..6c33e91573f5 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,3 +1,8 @@ +MD5 0bdab2263983cea3dfaa7872d917be1f openssh-3.5_p1-r1.ebuild 3562 +MD5 fbff77168df0943b895dae0d0a786d38 openssh-3.7.1_p2-r1.ebuild 4003 +MD5 092b770f6fb3c69d8acf92b42ca717df openssh-3.6.1_p2.ebuild 3586 +MD5 6ebb11d4c8f6e0302489de1c691d3179 ChangeLog 9398 +MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329 MD5 2cb187d8f60994c5e1b5fef2bcb6e85d files/openssh-3.5_p1-gentoo-sshd-gcc3.patch 315 MD5 49cc9062ff27ad7d4e8f94b136ed76a2 files/openssh-3.7.1_p1-selinux.diff 3394 MD5 31789e51878741d2af4b1312db79fa2f files/digest-openssh-3.6.1_p2 67 @@ -6,8 +11,3 @@ MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294 MD5 17b2fa077852f2c2990ec97c51bf198b files/sshd.rc6 1233 MD5 8f421fd8d19a104dc78150e4b1904a46 files/digest-openssh-3.5_p1-r1 65 MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r1 142 -MD5 0bdab2263983cea3dfaa7872d917be1f openssh-3.5_p1-r1.ebuild 3562 -MD5 9196b0c8d88035ad6daf2ad67a063561 openssh-3.7.1_p2-r1.ebuild 4193 -MD5 092b770f6fb3c69d8acf92b42ca717df openssh-3.6.1_p2.ebuild 3586 -MD5 3fcff23f245453da38f81a35e1f201a9 ChangeLog 9233 -MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329 diff --git a/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild b/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild index 8da41c073dc2..f5e72ee9a6d2 100644 --- a/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild +++ b/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild,v 1.5 2003/12/17 04:32:52 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r1.ebuild,v 1.6 2004/01/03 15:21:07 aliz Exp $ inherit eutils flag-o-matic ccc gnuconfig [ `use kerberos` ] && append-flags -I/usr/include/gssapi @@ -110,20 +110,13 @@ src_install() { keepdir /var/empty } -pkg_preinst() { - userdel sshd 2> /dev/null - if ! groupmod sshd; then - groupadd -g 90 sshd 2> /dev/null || \ - die "Failed to create sshd group" - fi - useradd -u 22 -g sshd -s /dev/null -d /var/empty -c "sshd" sshd || \ - die "Failed to create sshd user" -} - pkg_postinst() { # empty dir for the new priv separation auth chroot.. install -d -m0755 -o root -g root ${ROOT}/var/empty + enewgroup sshd 22 + enewuser sshd 22 /dev/null /var/empty sshd + ewarn "Remember to merge your config files in /etc/ssh/ and then" ewarn "restart sshd: '/etc/init.d/sshd restart'." ewarn |