diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2007-03-18 18:15:38 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2007-03-18 18:15:38 +0000 |
| commit | f866ed1c7b4ec2dca23650e9cedd5190b1886059 (patch) | |
| tree | 90588c387a34d6185a971760e950afca1bb01267 /net-misc | |
| parent | Fix ebuild to work with strict Java settings. (diff) | |
| download | gentoo-2-f866ed1c7b4ec2dca23650e9cedd5190b1886059.tar.gz gentoo-2-f866ed1c7b4ec2dca23650e9cedd5190b1886059.tar.bz2 gentoo-2-f866ed1c7b4ec2dca23650e9cedd5190b1886059.zip | |
Bug #169665, use slightly modified LPK patch to avoid conflict on configure with SecurID patch.
(Portage version: 2.1.2.2)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/openssh/files/digest-openssh-4.5_p1-r2 | 6 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-4.5_p1-r2.ebuild | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 008d12de7ea3..3d360bd07091 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,11 @@ # 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.234 2007/03/13 02:31:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.235 2007/03/18 18:15:38 robbat2 Exp $ + + 18 Mar 2007; Robin H. Johnson <robbat2@gentoo.org> + openssh-4.5_p1-r2.ebuild: + Bug #169665, use slightly modified LPK patch to avoid conflict on configure + with SecurID patch. *openssh-4.6_p1-r1 (13 Mar 2007) diff --git a/net-misc/openssh/files/digest-openssh-4.5_p1-r2 b/net-misc/openssh/files/digest-openssh-4.5_p1-r2 index 8f9f5ed3912c..a3d678fda3fe 100644 --- a/net-misc/openssh/files/digest-openssh-4.5_p1-r2 +++ b/net-misc/openssh/files/digest-openssh-4.5_p1-r2 @@ -10,6 +10,6 @@ SHA256 098fd91fc62e9685bf05c97c535f35414e742f379b6e21f5fd13353a7549271e openssh- MD5 6468c339886f78e8a149b88f695839dd openssh-4.5p1.tar.gz 965925 RMD160 3f70b6f4228e84c7b9b8b3bee7fd3875f3e3bad3 openssh-4.5p1.tar.gz 965925 SHA256 7046b9d372f9e31ca654a66492310c188470480ddab300eb715dbf5e2177ae55 openssh-4.5p1.tar.gz 965925 -MD5 663ce0f968c4f7eacc5128dc91645245 openssh-lpk-4.5p1-0.3.8.patch 62340 -RMD160 3f0f9b6f600947e073c7a2863fbbfe58c0c87845 openssh-lpk-4.5p1-0.3.8.patch 62340 -SHA256 c96cb24ea0c21cd93f2a28c31c38902bed8ddf0cb7a2879337bb21a5edd7ce35 openssh-lpk-4.5p1-0.3.8.patch 62340 +MD5 76a143d9e6edea5dd0cc5ee65fed7bc7 openssh-lpk-4.5p1-0.3.8-no-configure.patch 58327 +RMD160 464eb3e29f77d2d1e9785ea7cbae5c6d6bb0aff5 openssh-lpk-4.5p1-0.3.8-no-configure.patch 58327 +SHA256 ffbd706fb543709d1be0d37af50de561ed9a4271508f0df3b951d6a1db5eb1eb openssh-lpk-4.5p1-0.3.8-no-configure.patch 58327 diff --git a/net-misc/openssh/openssh-4.5_p1-r2.ebuild b/net-misc/openssh/openssh-4.5_p1-r2.ebuild index b611c9490248..cc5dedda5c1f 100644 --- a/net-misc/openssh/openssh-4.5_p1-r2.ebuild +++ b/net-misc/openssh/openssh-4.5_p1-r2.ebuild @@ -1,6 +1,6 @@ # 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.5_p1-r2.ebuild,v 1.1 2007/03/05 04:54:03 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.5_p1-r2.ebuild,v 1.2 2007/03/18 18:15:38 robbat2 Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -13,14 +13,14 @@ PARCH=${P/_/} X509_PATCH="${PARCH}+x509-5.5.2.diff.gz" SECURID_PATCH="${PARCH/4.5/4.4}+SecurID_v1.3.2.patch" -LDAP_PATCH="${PARCH/-4.5p1/-lpk-4.5p1}-0.3.8.patch" +LDAP_PATCH="${PARCH/-4.5p1/-lpk-4.5p1}-0.3.8-no-configure.patch" HPN_PATCH="${PARCH}-hpn12v15.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} ) - ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} ) + ldap? ( mirror://gentoo/${LDAP_PATCH} http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} ) hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} ) smartcard? ( http://omniti.com/~jesus/projects/${SECURID_PATCH} )" |