diff options
Diffstat (limited to 'net-misc/openssh/files')
| -rw-r--r-- | net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 | 3 | ||||
| -rw-r--r-- | net-misc/openssh/files/digest-openssh-3.9_p1-r3 | 2 | ||||
| -rw-r--r-- | net-misc/openssh/files/digest-openssh-4.0_p1-r2 | 2 | ||||
| -rw-r--r-- | net-misc/openssh/files/digest-openssh-4.1_p1-r1 | 3 | ||||
| -rw-r--r-- | net-misc/openssh/files/digest-openssh-4.2_p1 | 6 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-3.9_p1-chroot.patch | 10 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-3.9_p1-largekey.patch.bz2 | bin | 1262 -> 1352 bytes | |||
| -rw-r--r-- | net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 | bin | 5775 -> 6225 bytes | |||
| -rw-r--r-- | net-misc/openssh/files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 | bin | 5770 -> 5774 bytes | |||
| -rw-r--r-- | net-misc/openssh/files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 | bin | 5718 -> 5673 bytes | |||
| -rw-r--r-- | net-misc/openssh/files/sshd.pam | 15 | ||||
| -rw-r--r-- | net-misc/openssh/files/sshd.rc6 | 66 |
12 files changed, 44 insertions, 63 deletions
diff --git a/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 b/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 index e799b8d05c6a..a63345a1d3fc 100644 --- a/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 +++ b/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 @@ -1,3 +1,2 @@ MD5 1dbfd40ae683f822ae917eebf171ca42 openssh-3.8.1p1.tar.gz 817932 -MD5 48db8e4857a32aa93506be8abd84b6b4 openssh-lpk-3.8.1p1-0.3.4.patch 44245 -MD5 c1cad487473e826dd8de554ac9856bc6 openssh-3.8.1p1+x509-5.1.diff.gz 161552 +MD5 52e42ecdf2b0498220661d4bf1cfaeae openssh-3.8.1p1+x509h.diff.gz 143652 diff --git a/net-misc/openssh/files/digest-openssh-3.9_p1-r3 b/net-misc/openssh/files/digest-openssh-3.9_p1-r3 index 173e61a1a751..32d24bfd09a8 100644 --- a/net-misc/openssh/files/digest-openssh-3.9_p1-r3 +++ b/net-misc/openssh/files/digest-openssh-3.9_p1-r3 @@ -1,4 +1,4 @@ MD5 8e1774d0b52aff08f817f3987442a16e openssh-3.9p1.tar.gz 854027 MD5 e6b4c237887d76819e4c626016077907 openssh-lpk-3.9p1-0.3.6.patch 60920 -MD5 d556d5694c21d18fe3707afb08f2087a openssh-3.9p1+x509-5.2.diff.gz 121839 +MD5 eedb263c96a1d7bf208eb2ba70c2e238 openssh-3.9p1+x509h.diff.gz 98011 MD5 b91d73e58e2b72aecb3025ee550411fb openssh-3.9p1-hpn11.diff 13237 diff --git a/net-misc/openssh/files/digest-openssh-4.0_p1-r2 b/net-misc/openssh/files/digest-openssh-4.0_p1-r2 index 9a0a943ce94a..790840e807eb 100644 --- a/net-misc/openssh/files/digest-openssh-4.0_p1-r2 +++ b/net-misc/openssh/files/digest-openssh-4.0_p1-r2 @@ -1,5 +1,5 @@ MD5 7b36f28fc16e1b7f4ba3c1dca191ac92 openssh-4.0p1.tar.gz 889880 MD5 28ffb4f9c62e73f2e0f436f88ee1d718 openssh-lpk-4.0p1-0.3.6.patch 60557 -MD5 36b87d7b49ca92d066363d38d1251859 openssh-4.0p1+x509-5.2.diff.gz 123547 +MD5 a47391f0b77ad10264950c56363d4317 openssh-4.0p1+x509-5.1.diff.gz 117420 MD5 997c4f320c171d7dce1e00fba481ccf2 openssh-4.0p1-hpn11.diff 14225 MD5 79f5648305c8b8a1bc1414e8f6c6134c openssh-4.0p1+SecurID_v1.3.1.patch 610662 diff --git a/net-misc/openssh/files/digest-openssh-4.1_p1-r1 b/net-misc/openssh/files/digest-openssh-4.1_p1-r1 index 3f1a1e7b9ba3..7b2085b1ddb0 100644 --- a/net-misc/openssh/files/digest-openssh-4.1_p1-r1 +++ b/net-misc/openssh/files/digest-openssh-4.1_p1-r1 @@ -1,5 +1,4 @@ MD5 959c663e709c981f07a3315bfd64f3d0 openssh-4.1p1.tar.gz 894234 MD5 b779906d657d63794144cabe2bf978b8 openssh-lpk-4.1p1-0.3.6.patch 60312 -MD5 ebc18c981d3a1d6b3772b14316f6d5ad openssh-4.1p1+x509-5.2.diff.gz 123415 +MD5 8d4ef926ec329c8ae551fd0133ba91e6 openssh-4.1p1+x509-5.1.diff.gz 117293 MD5 7a9abefaf7078da86ac2e70bf154127f openssh-4.1p1-hpn11.diff 14223 -MD5 7c5798757b7efc79a897f92de5f80539 openssh-4.1p1+SecurID_v1.3.1.patch 612445 diff --git a/net-misc/openssh/files/digest-openssh-4.2_p1 b/net-misc/openssh/files/digest-openssh-4.2_p1 index df3ae09caa4b..9681b0530497 100644 --- a/net-misc/openssh/files/digest-openssh-4.2_p1 +++ b/net-misc/openssh/files/digest-openssh-4.2_p1 @@ -1,5 +1,5 @@ -MD5 6c89525f43b93fb2671af345dd85783b openssh-4.2p1+SecurID_v1.3.2.patch 616248 -MD5 cda9a91dc66ff20be49ba379be9089fd openssh-4.2p1+x509-5.2.diff.gz 123592 -MD5 4b8f0befa09f234d6e7f1a5849b86197 openssh-4.2p1-hpn11.diff 14765 MD5 df899194a340c933944b193477c628fa openssh-4.2p1.tar.gz 914165 MD5 b779906d657d63794144cabe2bf978b8 openssh-lpk-4.1p1-0.3.6.patch 60312 +MD5 cda9a91dc66ff20be49ba379be9089fd openssh-4.2p1+x509-5.2.diff.gz 123592 +MD5 7a9abefaf7078da86ac2e70bf154127f openssh-4.1p1-hpn11.diff 14223 +MD5 7c5798757b7efc79a897f92de5f80539 openssh-4.1p1+SecurID_v1.3.1.patch 612445 diff --git a/net-misc/openssh/files/openssh-3.9_p1-chroot.patch b/net-misc/openssh/files/openssh-3.9_p1-chroot.patch index ecb418c35f3c..13625995a88e 100644 --- a/net-misc/openssh/files/openssh-3.9_p1-chroot.patch +++ b/net-misc/openssh/files/openssh-3.9_p1-chroot.patch @@ -45,9 +45,9 @@ diff -uNr openssh-3.7.1p2/session.c openssh-3.7.1p2-chroot/session.c if (getuid() == 0 || geteuid() == 0) #endif /* HAVE_CYGWIN */ @@ -1268,6 +1276,27 @@ - do_pam_setcred(0); + exit(1); } - # endif /* USE_PAM */ + endgrent(); + +#ifdef CHROOT + user_dir = xstrdup(pw->pw_dir); @@ -69,6 +69,6 @@ diff -uNr openssh-3.7.1p2/session.c openssh-3.7.1p2-chroot/session.c +#endif /* CHROOT */ + + - # if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) - irix_setusercontext(pw); - # endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */ + # ifdef USE_PAM + /* + * PAM credentials may take the form of supplementary groups. diff --git a/net-misc/openssh/files/openssh-3.9_p1-largekey.patch.bz2 b/net-misc/openssh/files/openssh-3.9_p1-largekey.patch.bz2 Binary files differindex cd3006158bfd..ae244ef30de6 100644 --- a/net-misc/openssh/files/openssh-3.9_p1-largekey.patch.bz2 +++ b/net-misc/openssh/files/openssh-3.9_p1-largekey.patch.bz2 diff --git a/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 b/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 Binary files differindex 6a11945ce66b..6cc73c31bda5 100644 --- a/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 +++ b/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 diff --git a/net-misc/openssh/files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 b/net-misc/openssh/files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 Binary files differindex 074e6081d375..821bc1d6f58f 100644 --- a/net-misc/openssh/files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 +++ b/net-misc/openssh/files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 diff --git a/net-misc/openssh/files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 b/net-misc/openssh/files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 Binary files differindex df906e077d9d..bd24d0b19c5b 100644 --- a/net-misc/openssh/files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 +++ b/net-misc/openssh/files/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 diff --git a/net-misc/openssh/files/sshd.pam b/net-misc/openssh/files/sshd.pam index 511494025162..d66bca1be1d8 100644 --- a/net-misc/openssh/files/sshd.pam +++ b/net-misc/openssh/files/sshd.pam @@ -1,9 +1,8 @@ -#%PAM-1.0 - -auth required pam_stack.so service=system-auth -auth required pam_shells.so +auth required pam_pwdb.so nullok auth required pam_nologin.so -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth - +auth required pam_env.so +account required pam_pwdb.so +password required pam_pwdb.so +session required pam_pwdb.so +session required pam_limits.so +session required pam_chroot.so diff --git a/net-misc/openssh/files/sshd.rc6 b/net-misc/openssh/files/sshd.rc6 index 01083d1d0fc6..5442b08e9f5f 100644 --- a/net-misc/openssh/files/sshd.rc6 +++ b/net-misc/openssh/files/sshd.rc6 @@ -1,54 +1,38 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.16 2005/08/21 19:09:30 vapier Exp $ - -depend() { - use logger dns - need net -} checkconfig() { - if [ ! -d /var/empty ] ; then - mkdir -p /var/empty || return 1 - fi - - if [ ! -e /etc/ssh/sshd_config ] ; then - eerror "You need an /etc/ssh/sshd_config file to run sshd" - eerror "There is a sample file in /usr/share/doc/openssh" - return 1 - fi - - gen_keys || return 1 - - /usr/sbin/sshd -t || return 1 + if [ ! -e /etc/ssh/sshd_config ] ; then + eerror "You need an /etc/ssh/sshd_config file to run sshd" + eerror "There is a sample file in /usr/share/docs/openssh" + return 1 + fi } gen_keys() { - if [ ! -e /etc/ssh/ssh_host_key ] ; then - einfo "Generating Hostkey..." - /usr/bin/ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N '' || return 1 - fi - if [ ! -e /etc/ssh/ssh_host_dsa_key ] ; then - einfo "Generating DSA-Hostkey..." - /usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' || return 1 - fi - if [ ! -e /etc/ssh/ssh_host_rsa_key ] ; then - einfo "Generating RSA-Hostkey..." - /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' || return 1 - fi - return 0 + if [ ! -e /etc/ssh/ssh_host_key ] ; then + einfo "Generating Hostkey..." + /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' + fi + if [ ! -e /etc/ssh/ssh_host_dsa_key ] ; then + einfo "Generating DSA-Hostkey..." + /usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' + fi + if [ ! -e /etc/ssh/ssh_host_rsa_key ] ; then + einfo "Generating RSA-Hostkey..." + /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' + fi } start() { - checkconfig || return 1 - ebegin "Starting sshd" - /usr/sbin/sshd - eend $? + checkconfig || return 1 + gen_keys + ebegin "Starting sshd" + start-stop-daemon --start --quiet --exec /usr/sbin/sshd + eend $? } stop() { - ebegin "Stopping sshd" - start-stop-daemon --stop --quiet --pidfile /var/run/sshd.pid - eend $? + ebegin "Stopping sshd" + start-stop-daemon --stop --quiet --pidfile /var/run/sshd.pid + eend $? } |