From 803443279d52b11bb74fc7a6727cb7a6d44a4c9c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 5 Sep 2005 20:16:00 +0000 Subject: [PATCH] Re-enable smartcard support. Package-Manager: portage-2.0.51.22-r2 --- net-misc/openssh/ChangeLog | 5 ++++- net-misc/openssh/Manifest | 12 ++++++------ net-misc/openssh/files/digest-openssh-4.1_p1-r1 | 1 + net-misc/openssh/openssh-4.1_p1-r1.ebuild | 8 ++++---- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 47695eabb08c..90625e511ef3 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.126 2005/08/20 03:46:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.127 2005/09/05 20:16:00 vapier Exp $ + + 05 Sep 2005; Mike Frysinger openssh-4.1_p1-r1.ebuild: + Re-enable smartcard support. 20 Aug 2005; Mike Frysinger files/sshd.rc6: Before starting sshd, sanity check the config file #101893 by Eric Brown. diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index b5ce589dfb54..24774f3dac7c 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -4,15 +4,15 @@ Hash: SHA1 MD5 ff0dccf17d2b2b58a8a52554860be9a6 metadata.xml 1430 MD5 e138bf4c91e1cf9befc9023f5222e52d openssh-3.9_p1-r3.ebuild 4911 MD5 76220c10eb51cb6d50806c7304225881 openssh-3.9_p1-r2.ebuild 4937 -MD5 6865138cc702e011744d1612a95f2338 openssh-4.1_p1-r1.ebuild 5163 +MD5 919265693ab835f2c7b99a21e44cd4cd openssh-4.1_p1-r1.ebuild 5160 MD5 9f6835990c96f3a4890368bc10a9a9b9 openssh-3.8.1_p1-r1.ebuild 4482 MD5 caa2375c925e19a6b12d03c050d23659 openssh-4.0_p1-r2.ebuild 5200 -MD5 626dab51b9feddfbee515973d45fda99 ChangeLog 21432 +MD5 f4fba83d863250c575fc101387045286 ChangeLog 21540 MD5 0d2120ac28128f68efe07d1da49a39cd files/digest-openssh-3.9_p1-r3 277 MD5 2b66f75047edfac5d5e6cdbffa35383e files/sshd.pam_include 205 MD5 a26faff36f0ec463cb4ef7366bfdc1e1 files/openssh-3.8_p1-resolv_functions.patch.bz2 315 MD5 857f14fd111169d8838d07fb46769938 files/openssh-3.8_p1-kerberos.patch.bz2 465 -MD5 e655dc94e12d1f00104bc8254ac00361 files/digest-openssh-4.1_p1-r1 281 +MD5 9643b30009e2c13fa1f4e51b149d732b files/digest-openssh-4.1_p1-r1 360 MD5 7205b89215b9dc72e3958c662065b529 files/openssh-3.9_p1-largekey.patch.bz2 1262 MD5 7937a17eb31fc6139ef42fa04521de27 files/openssh-3.9_p1-configure-openct.patch 995 MD5 87593c73e26e1a3825fcb51f2270b694 files/openssh-3.9_p1-chroot.patch 3027 @@ -45,7 +45,7 @@ MD5 f5e33d1831f95c821a08893bcf3e3f5f files/openssh-4.0_p1-sftplogging-1.2-gentoo -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDHKZVgIKl8Uu19MoRAkX8AJ9hUvwkHAxZsk874w3DFGJyeFlg9ACfSLh9 -AXZPBRObENFp+s58rlvMwcE= -=wZYg +iD8DBQFDHKe9gIKl8Uu19MoRAo/UAJ9X4KeYZPuY1BHK2T6TKnRkv9YKZgCeK0yk +d4dCLcykY3kDqPyw5pT2MPA= +=4zjX -----END PGP SIGNATURE----- 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 7b2085b1ddb0..96e19e2352bd 100644 --- a/net-misc/openssh/files/digest-openssh-4.1_p1-r1 +++ b/net-misc/openssh/files/digest-openssh-4.1_p1-r1 @@ -2,3 +2,4 @@ MD5 959c663e709c981f07a3315bfd64f3d0 openssh-4.1p1.tar.gz 894234 MD5 b779906d657d63794144cabe2bf978b8 openssh-lpk-4.1p1-0.3.6.patch 60312 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/openssh-4.1_p1-r1.ebuild b/net-misc/openssh/openssh-4.1_p1-r1.ebuild index e40524f076b0..f3bf5b1b1a67 100644 --- a/net-misc/openssh/openssh-4.1_p1-r1.ebuild +++ b/net-misc/openssh/openssh-4.1_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.4 2005/08/24 00:07:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.5 2005/09/05 20:16:00 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -11,7 +11,7 @@ PARCH=${P/_/} SFTPLOG_PATCH_VER="1.2" X509_PATCH="${PARCH}+x509-5.1.diff.gz" SELINUX_PATCH="openssh-3.9_p1-selinux.diff" -SECURID_PATCH="" #${PARCH}+SecurID_v1.3.1.patch +SECURID_PATCH="${PARCH}+SecurID_v1.3.1.patch" LDAP_PATCH="${PARCH/-/-lpk-}-0.3.6.patch" HPN_PATCH="${PARCH}-hpn11.diff" @@ -20,8 +20,8 @@ HOMEPAGE="http://www.openssh.com/" SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz ldap? ( http://www.opendarwin.org/en/projects/openssh-lpk/files/${LDAP_PATCH} ) X509? ( http://roumenpetrov.info/openssh/x509-5.1/${X509_PATCH} ) - hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )" -# smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} ) + hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} ) + smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )" LICENSE="as-is" SLOT="0" -- 2.26.2