Grab fix from upstream for ChallengeResponseAuthentication (to fix USE=pam defaults...

Package-Manager: portage-2.1.2.2

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 8a74e16d09d2f47ffa8fe40bd4606218d3bf232d..008d12de7ea33a8cbe65846fe6d0192f9ba90baa 100644 (file)
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.233 2007/03/11 19:23:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.234 2007/03/13 02:31:11 vapier Exp $
+
+*openssh-4.6_p1-r1 (13 Mar 2007)
+
+  13 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-4.6_p1-ChallengeResponseAuthentication.patch,
+  +openssh-4.6_p1-r1.ebuild:
+  Grab fix from upstream for ChallengeResponseAuthentication (to fix USE=pam
+  defaults) #170670 and add new hpn support.
 
 *openssh-4.6_p1 (11 Mar 2007)
 

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 498c319c344e6e74f411885ff0e15920616b2f9a..4729d7ffcadb1e7a3366ab64de76677b3f3e31c6 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -137,6 +137,10 @@ AUX openssh-4.4p1-selinux-ac.diff 525 RMD160 3cd79bd33f6b54afc943c641f83120f78c7
 MD5 acfb71370d090c620e71fcf7e4ede1c4 files/openssh-4.4p1-selinux-ac.diff 525
 RMD160 3cd79bd33f6b54afc943c641f83120f78c703f65 files/openssh-4.4p1-selinux-ac.diff 525
 SHA256 fc7d2f252fc19864c1b5b5cb6b506018580495605e36dad7e370fbc16b3f276e files/openssh-4.4p1-selinux-ac.diff 525
+AUX openssh-4.6_p1-ChallengeResponseAuthentication.patch 1681 RMD160 f38aecbbb7bf992dd70fc0283555954d9e2998a6 SHA1 d1e4b9b7321cd8584669faed305501457b0346b4 SHA256 4b84df57b5cf6c7fd78f7a44f343ce8ec7b0a2feaeeb90293f07832b2ba5ba68
+MD5 c10ecb0c4fd19f757dc56086d5bfdb9d files/openssh-4.6_p1-ChallengeResponseAuthentication.patch 1681
+RMD160 f38aecbbb7bf992dd70fc0283555954d9e2998a6 files/openssh-4.6_p1-ChallengeResponseAuthentication.patch 1681
+SHA256 4b84df57b5cf6c7fd78f7a44f343ce8ec7b0a2feaeeb90293f07832b2ba5ba68 files/openssh-4.6_p1-ChallengeResponseAuthentication.patch 1681
 AUX openssh-4.6_p1-include-string-header.patch 283 RMD160 6ca0ed9b00370904be03d1ab5b61a5893ca56768 SHA1 0f2cbdd460488741d8cf71db04f38df48215b335 SHA256 75c3850ece441da13f15c14a4836ff57bf67381590d5403be38c5b2aa097c57e
 MD5 31f7b865121071c12310d3e398e82bf8 files/openssh-4.6_p1-include-string-header.patch 283
 RMD160 6ca0ed9b00370904be03d1ab5b61a5893ca56768 files/openssh-4.6_p1-include-string-header.patch 283
@@ -189,6 +193,7 @@ DIST openssh-4.5p1-hpn12v14.diff.gz 15791 RMD160 1f937174d5418d578da5d9dfab16b5c
 DIST openssh-4.5p1-hpn12v15.diff.gz 15834 RMD160 c98135bfd8b8387b281d63f9d9b00afc60d51ca1 SHA1 6a88bc9db5ad856620e53bccf6f1df88dab94278 SHA256 098fd91fc62e9685bf05c97c535f35414e742f379b6e21f5fd13353a7549271e
 DIST openssh-4.5p1.tar.gz 965925 RMD160 3f70b6f4228e84c7b9b8b3bee7fd3875f3e3bad3 SHA1 2eefcbbeb9e4fa16fa4500dec107d1a09d3d02d7 SHA256 7046b9d372f9e31ca654a66492310c188470480ddab300eb715dbf5e2177ae55
 DIST openssh-4.6p1+x509-5.5.2.diff.gz 141892 RMD160 3aacab881f28b7e8087481a6fcf661f67502319b SHA1 5210b31d70b61278007b5a12543e9834fe90ac71 SHA256 b365d2819ba1f81411382106629b8fe74ae5aa4a1081aa8e3c44858c115c822e
+DIST openssh-4.6p1-hpn12v16.diff.gz 15944 RMD160 421e2c189c2e9b378f6ee3944183355f9f18d5e8 SHA1 a10ed53ad92e2e3106da7050c3b0076a2cd1c0ca SHA256 f304e3b04e2772c27c09e9aa5a3fd02747187a8775de39879c3d871fad1e156f
 DIST openssh-4.6p1.tar.gz 967395 RMD160 2959ac56c9175275bf82847ec64b2b169aedcb82 SHA1 b2aefeb1861b4688b1777436035239ec32a47da8 SHA256 7bbe277faa80c8d8d9cb96111db65fc0007d451784cc459207cd46b746a6f23a
 DIST openssh-lpk-3.9p1-0.3.6.patch 60920 RMD160 0fdde5cf35e1fe59a428d330509f6964ff3402ed SHA1 cd0e8f4a9826e2883f5fc4cce41a761750657414 SHA256 f4732659ec8e222a8d80741a8e7975ffde089ab985fcad3c986d087732de7c33
 DIST openssh-lpk-4.0p1-0.3.6.patch 60557 RMD160 da57dcc8078c127abea0dc4017399cd5c3f8eee2 SHA1 f0fa0cfa6505b12da250a25115839210138defbc SHA256 61b244eb4c15db9c1a9b575be23afcbe6a30a248a2abbda0de18f0791842dbad
@@ -232,14 +237,14 @@ EBUILD openssh-4.5_p1.ebuild 5350 RMD160 6d40a35a0bee3b9f2c1463862577add3fec7901
 MD5 5765ff0b2c4d25a3d86a87605017d155 openssh-4.5_p1.ebuild 5350
 RMD160 6d40a35a0bee3b9f2c1463862577add3fec79015 openssh-4.5_p1.ebuild 5350
 SHA256 74de4db846c5251d5ff87853aac67bce589d62e49fb1ea4c082bd9c40c3ec4cf openssh-4.5_p1.ebuild 5350
-EBUILD openssh-4.6_p1.ebuild 5329 RMD160 949e19c94400b05cfc2d555e4d72279ebd30a8f1 SHA1 244912485620e91a7c12dad15cb49cf39be341f2 SHA256 1ee721bc0bdd91cf4498de8f593ea47cb05778da7ac331f5e724b4bffa5b8d77
-MD5 790f7a0bf2097953248ce83731d4b39f openssh-4.6_p1.ebuild 5329
-RMD160 949e19c94400b05cfc2d555e4d72279ebd30a8f1 openssh-4.6_p1.ebuild 5329
-SHA256 1ee721bc0bdd91cf4498de8f593ea47cb05778da7ac331f5e724b4bffa5b8d77 openssh-4.6_p1.ebuild 5329
-MISC ChangeLog 36966 RMD160 6d06f45a2afded1dd3f460b84483c916a9484852 SHA1 7d5d5eee2a867c90b0db0235d2fba6ac0d2b7c00 SHA256 51385809120cb1b61c1f891332ca9208171132fe0adbb08bf07268a41e4d37d4
-MD5 f3ee3548ecec02d67ea2aab20624d0ec ChangeLog 36966
-RMD160 6d06f45a2afded1dd3f460b84483c916a9484852 ChangeLog 36966
-SHA256 51385809120cb1b61c1f891332ca9208171132fe0adbb08bf07268a41e4d37d4 ChangeLog 36966
+EBUILD openssh-4.6_p1-r1.ebuild 5401 RMD160 534003b16a63b34b45404422e5c6601f64b2083a SHA1 e71fdf31871f92441ca3fa40ce6341fb07dcbfae SHA256 e9d60580607ae6d865b4d5c0def203d5b78ce163f9a6b5c56049cc3b8ce66a45
+MD5 ce33ec70cc51cbab8e2c36b66f047449 openssh-4.6_p1-r1.ebuild 5401
+RMD160 534003b16a63b34b45404422e5c6601f64b2083a openssh-4.6_p1-r1.ebuild 5401
+SHA256 e9d60580607ae6d865b4d5c0def203d5b78ce163f9a6b5c56049cc3b8ce66a45 openssh-4.6_p1-r1.ebuild 5401
+MISC ChangeLog 37265 RMD160 ba1043dfa227af17c0e2c83ff38f71396df439b1 SHA1 6e596ddad3c765d442aefbdea65023d2ace43571 SHA256 0c3be4d2f1519acde424410f3644bcbd73baa1f89a78600a18363df9a12458e1
+MD5 aaaa53d6c10b0c3dcbb1d411a43ae447 ChangeLog 37265
+RMD160 ba1043dfa227af17c0e2c83ff38f71396df439b1 ChangeLog 37265
+SHA256 0c3be4d2f1519acde424410f3644bcbd73baa1f89a78600a18363df9a12458e1 ChangeLog 37265
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -271,13 +276,13 @@ SHA256 86a17c74dd503363c30085c75f7cc17bda20da889e93d61d59446589992cc08b files/di
 MD5 d103be4401a9c908f16efd211878c1c0 files/digest-openssh-4.5_p1-r2 1331
 RMD160 b4ec4a9c82f27a05165ef9557e25d6cd156de1cf files/digest-openssh-4.5_p1-r2 1331
 SHA256 467a56eb0bb8cb4bc586ddfbc5991687624238723fe6198c2341340016910f77 files/digest-openssh-4.5_p1-r2 1331
-MD5 028552b80ff1297d99f185559938328d files/digest-openssh-4.6_p1 518
-RMD160 c4547b53bb2c361f3c4b65e3cacbce55a64ee6f1 files/digest-openssh-4.6_p1 518
-SHA256 25ba3ac9d41810adc59829a3c7d9be9d73a3cd365a6e6ef54202358068560147 files/digest-openssh-4.6_p1 518
+MD5 262614ee697fea204407027184ed83fc files/digest-openssh-4.6_p1-r1 786
+RMD160 4dca2db674acc3f2ee39d304e1a5add2004fe871 files/digest-openssh-4.6_p1-r1 786
+SHA256 155a2bda9084c47e1e7df6b2ed84cd947b7f6511c6c6a09a1a4620eb7d587e9a files/digest-openssh-4.6_p1-r1 786
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9P348bi6rjpTunYRAi3wAKDR1CXCa3+vvllmusq7hasnxrVv9QCdFjJV
-BmmSI2g63hg4tn+YyxE4tQQ=
-=dlvc
+iD8DBQFF9gz58bi6rjpTunYRArqLAJwOx783P7fTyCh3U4Lnb3z/cC7b7gCglGTL
+tjOfl8V6FTX8OBrr2nTMUHA=
+=Gw22
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/files/digest-openssh-4.6_p1-r1 b/net-misc/openssh/files/digest-openssh-4.6_p1-r1
new file mode 100644 (file)
index 0000000..4b34072
--- /dev/null
+++ b/net-misc/openssh/files/digest-openssh-4.6_p1-r1
@@ -0,0 +1,9 @@
+MD5 dd32128b216cc097b3018f255620394b openssh-4.6p1+x509-5.5.2.diff.gz 141892
+RMD160 3aacab881f28b7e8087481a6fcf661f67502319b openssh-4.6p1+x509-5.5.2.diff.gz 141892
+SHA256 b365d2819ba1f81411382106629b8fe74ae5aa4a1081aa8e3c44858c115c822e openssh-4.6p1+x509-5.5.2.diff.gz 141892
+MD5 0bc643a4e1588f7abdcdbb31304bac56 openssh-4.6p1-hpn12v16.diff.gz 15944
+RMD160 421e2c189c2e9b378f6ee3944183355f9f18d5e8 openssh-4.6p1-hpn12v16.diff.gz 15944
+SHA256 f304e3b04e2772c27c09e9aa5a3fd02747187a8775de39879c3d871fad1e156f openssh-4.6p1-hpn12v16.diff.gz 15944
+MD5 6a7fa99f44d9e1b5b04d15256e1405bb openssh-4.6p1.tar.gz 967395
+RMD160 2959ac56c9175275bf82847ec64b2b169aedcb82 openssh-4.6p1.tar.gz 967395
+SHA256 7bbe277faa80c8d8d9cb96111db65fc0007d451784cc459207cd46b746a6f23a openssh-4.6p1.tar.gz 967395

diff --git a/net-misc/openssh/files/openssh-4.6_p1-ChallengeResponseAuthentication.patch b/net-misc/openssh/files/openssh-4.6_p1-ChallengeResponseAuthentication.patch
new file mode 100644 (file)
index 0000000..7cfd7a6
--- /dev/null
+++ b/net-misc/openssh/files/openssh-4.6_p1-ChallengeResponseAuthentication.patch
@@ -0,0 +1,44 @@
+Fix from upstream to fix logging in with USE=pam via passwords by default.
+
+http://bugs.gentoo.org/170670
+
+ChangeLog:
+Move C/R -> kbdint special case to after the defaults have been
+loaded, which makes ChallengeResponse default to yes again.  This
+was broken by the Match changes and not fixed properly subsequently.
+Found by okan at demirmen.com, ok djm@ "please do it" deraadt@
+
+===================================================================
+RCS file: /usr/OpenBSD/cvs/src/usr.bin/ssh/servconf.c,v
+retrieving revision 1.170
+retrieving revision 1.171
+diff -u -r1.170 -r1.171
+--- src/usr.bin/ssh/servconf.c 2007/03/01 10:28:02     1.170
++++ src/usr.bin/ssh/servconf.c 2007/03/09 05:20:06     1.171
+@@ -1344,8 +1344,4 @@
+       if (bad_options > 0)
+               fatal("%s: terminating, %d bad configuration options",
+                   filename, bad_options);
+-
+-      /* challenge-response is implemented via keyboard interactive */
+-      if (options->challenge_response_authentication == 1)
+-              options->kbd_interactive_authentication = 1;
+ }
+===================================================================
+RCS file: /usr/OpenBSD/cvs/src/usr.bin/ssh/sshd.c,v
+retrieving revision 1.349
+retrieving revision 1.350
+diff -u -r1.349 -r1.350
+--- src/usr.bin/ssh/sshd.c     2007/02/21 11:00:05     1.349
++++ src/usr.bin/ssh/sshd.c     2007/03/09 05:20:06     1.350
+@@ -1359,6 +1359,10 @@
+       /* Fill in default values for those options not explicitly set. */
+       fill_default_server_options(&options);
+ 
++      /* challenge-response is implemented via keyboard interactive */
++      if (options.challenge_response_authentication)
++              options.kbd_interactive_authentication = 1;
++
+       /* set default channel AF */
+       channel_set_af(options.address_family);
+ 

diff --git a/net-misc/openssh/openssh-4.6_p1-r1.ebuild b/net-misc/openssh/openssh-4.6_p1-r1.ebuild
new file mode 100644 (file)
index 0000000..226108e
--- /dev/null
+++ b/net-misc/openssh/openssh-4.6_p1-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.6_p1-r1.ebuild,v 1.1 2007/03/13 02:31:11 vapier Exp $
+
+inherit eutils flag-o-matic ccc multilib autotools pam
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_/}
+
+X509_PATCH="${PARCH}+x509-5.5.2.diff.gz"
+SECURID_PATCH="" #${PARCH/4.6/4.5}+SecurID_v1.3.2.patch"
+LDAP_PATCH="" #${PARCH/-4.5p1/-lpk-4.5p1}-0.3.8.patch"
+HPN_PATCH="${PARCH}-hpn12v16.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+       X509? ( http://roumenpetrov.info/openssh/x509-5.5.2/${X509_PATCH} )
+       hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )"
+#      smartcard? ( http://omniti.com/~jesus/projects/${SECURID_PATCH} )
+#      ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} )
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="static pam tcpd kerberos skey selinux chroot X509 ldap smartcard hpn libedit X"
+
+RDEPEND="pam? ( virtual/pam )
+       kerberos? ( virtual/krb5 )
+       selinux? ( >=sys-libs/libselinux-1.28 )
+       skey? ( >=app-admin/skey-1.1.5-r1 )
+       ldap? ( net-nds/openldap )
+       libedit? ( dev-libs/libedit )
+       >=dev-libs/openssl-0.9.6d
+       >=sys-libs/zlib-1.2.3
+       smartcard? ( dev-libs/opensc )
+       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+       X? ( x11-apps/xauth )
+       userland_GNU? ( sys-apps/shadow )"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       virtual/os-headers
+       sys-devel/autoconf"
+PROVIDE="virtual/ssh"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_setup() {
+       # this sucks, but i'd rather have people unable to `emerge -u openssh`
+       # than not be able to log in to their server any more
+       maybe_fail() { [[ -z ${!2} ]] && use ${1} && echo ${1} ; }
+       local fail="
+               $(maybe_fail X509 X509_PATCH)
+               $(maybe_fail smartcard SECURID_PATCH)
+               $(maybe_fail ldap LDAP_PATCH)
+       "
+       fail=$(echo ${fail})
+       if [[ -n ${fail} ]] ; then
+               eerror "Sorry, but this version does not yet support features"
+               eerror "that you requested:      ${fail}"
+               eerror "Please mask ${PF} for now and check back later:"
+               eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+               die "booooo"
+       fi
+}
+
+src_unpack() {
+       unpack ${PARCH}.tar.gz
+       cd "${S}"
+
+       sed -i \
+               -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
+               pathnames.h || die
+
+       epatch "${FILESDIR}"/${P}-include-string-header.patch
+       epatch "${FILESDIR}"/${P}-ChallengeResponseAuthentication.patch #170670
+       use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-4.4_p1-x509-hpn-glue.patch
+       use chroot && epatch "${FILESDIR}"/openssh-4.3_p1-chroot.patch
+       use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
+       if ! use X509 ; then
+               if [[ -n ${SECURID_PATCH} ]] && use smartcard ; then
+                       epatch "${DISTDIR}"/${SECURID_PATCH} \
+                               "${FILESDIR}"/${PN}-4.3_p2-securid-updates.patch \
+                               "${FILESDIR}"/${PN}-4.3_p2-securid-hpn-glue.patch
+                       use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
+               fi
+               if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+                       epatch "${DISTDIR}"/${LDAP_PATCH} "${FILESDIR}"/${PN}-4.4_p1-ldap-hpn-glue.patch
+               fi
+       elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then
+               ewarn "Sorry, X509 and smartcard/ldap don't get along, disabling smartcard/ldap"
+       fi
+       [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
+
+       sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
+
+       eautoreconf
+}
+
+src_compile() {
+       addwrite /dev/ptmx
+       addpredict /etc/skey/skeykeys #skey configure code triggers this
+
+       local myconf=""
+       if use static ; then
+               append-ldflags -static
+               use pam && ewarn "Disabling pam support becuse of static flag"
+               myconf="${myconf} --without-pam"
+       else
+               myconf="${myconf} $(use_with pam)"
+       fi
+
+       econf \
+               --with-ldflags="${LDFLAGS}" \
+               --disable-strip \
+               --sysconfdir=/etc/ssh \
+               --libexecdir=/usr/$(get_libdir)/misc \
+               --datadir=/usr/share/openssh \
+               --disable-suid-ssh \
+               --with-privsep-path=/var/empty \
+               --with-privsep-user=sshd \
+               --with-md5-passwords \
+               $(use_with ldap) \
+               $(use_with libedit) \
+               $(use_with kerberos kerberos5 /usr) \
+               $(use_with tcpd tcp-wrappers) \
+               $(use_with selinux) \
+               $(use_with skey) \
+               $(use_with smartcard opensc) \
+               ${myconf} \
+               || die "bad configure"
+       emake || die "compile problem"
+}
+
+src_install() {
+       emake install-nokeys DESTDIR="${D}" || die
+       fperms 600 /etc/ssh/sshd_config
+       dobin contrib/ssh-copy-id
+       newinitd "${FILESDIR}"/sshd.rc6 sshd
+       newconfd "${FILESDIR}"/sshd.confd sshd
+       keepdir /var/empty
+
+       newpamd "${FILESDIR}"/sshd.pam_include sshd
+       dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config
+       use pam \
+               && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \
+               && dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config
+
+       doman contrib/ssh-copy-id.1
+       dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
+       diropts -m 0600
+       dodir /etc/skel/.ssh
+}
+
+pkg_postinst() {
+       enewgroup sshd 22
+       enewuser sshd 22 -1 /var/empty sshd
+
+       ewarn "Remember to merge your config files in /etc/ssh/ and then"
+       ewarn "restart sshd: '/etc/init.d/sshd restart'."
+       if use pam ; then
+               echo
+               ewarn "Please be aware users need a valid shell in /etc/passwd"
+               ewarn "in order to be allowed to login."
+       fi
+}