summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-24 19:11:25 +0000
committerMike Frysinger <vapier@gentoo.org>2009-02-24 19:11:25 +0000
commit0ce36e178d00a129da3a7ee57300ce1697069b6a (patch)
tree81000ac211e41abdbb6b2e3d26495d57c080f74e /net-misc
parentEAPI=2; fix building with newer glibc (patch submitted by Michał Górny via ... (diff)
downloadhistorical-0ce36e178d00a129da3a7ee57300ce1697069b6a.tar.gz
historical-0ce36e178d00a129da3a7ee57300ce1697069b6a.tar.bz2
historical-0ce36e178d00a129da3a7ee57300ce1697069b6a.zip
Fix X509 patching #260163 by Daniel J.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/ChangeLog5
-rw-r--r--net-misc/openssh/Manifest10
-rw-r--r--net-misc/openssh/openssh-5.2_p1.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 524d5fa91615..89f147823968 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.337 2009/02/24 17:03:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.338 2009/02/24 19:11:25 vapier Exp $
+
+ 24 Feb 2009; Mike Frysinger <vapier@gentoo.org> openssh-5.2_p1.ebuild:
+ Fix X509 patching #260163 by Daniel J.
*openssh-5.2_p1 (24 Feb 2009)
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index dbdf3c74cf3c..16fd53dc2dd8 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -53,13 +53,13 @@ EBUILD openssh-5.0_p1-r1.ebuild 5184 RMD160 2eb4fa43b1c54fc2145cd0440e15bd26d6a4
EBUILD openssh-5.0_p1-r2.ebuild 5232 RMD160 3b0247e5b71cb12720f8746dfa9f7d50c0f55f06 SHA1 eafb35830abcc0458c73ba7a73530e21a0c64290 SHA256 fa8f82eafb1d7d9d4b876855735b1e4d042d961c44cbcab1586e52ffdda9f59d
EBUILD openssh-5.1_p1-r2.ebuild 5465 RMD160 64e7b382e6a1c664b4e6ad6d93199dc8ed1985e6 SHA1 e42626794f7af0f265073d1b89a96852b5af8cbb SHA256 0cddb635f824087f3c6d39738a990b6cccc263d8ce33983f5f01b937250bbdcf
EBUILD openssh-5.1_p1-r3.ebuild 5735 RMD160 4ce7ec18877d6bec6f5370a00ef82790ad87dbd9 SHA1 63e87f68db66e7b5dc39f08317d05284faeb9219 SHA256 acec83baf78e4ac4cb2fa3c2a5064ae00164581b0d8c1aba43e7dc5cec0cddde
-EBUILD openssh-5.2_p1.ebuild 6159 RMD160 418c31e356c3ef77d5c63f5475c6f51d00a901a2 SHA1 1b94ee507549a3c99d7546f714df8c5a7c155f18 SHA256 cb2ea69521b5ecffe708e008a034e313bb951f40d767c5ffd0211b62d424a36a
-MISC ChangeLog 52740 RMD160 5ccdb0ee7defd4e9363bd3592bc84c7f2eab9938 SHA1 464a914dce432a4bdc296df3965558b5c8ec34e5 SHA256 3c1a895ea280d4296906b27178495378d45321d83216312c6ba214976d924487
+EBUILD openssh-5.2_p1.ebuild 6112 RMD160 aa588faec4ccd35a9165251e1497cac23aff36b2 SHA1 55babe54b6fe049e951264b8bcb8e2a7a385604a SHA256 00000886ebe898d0dcdb6c1958e33b5a19a1e6669665876873482f5d6be1027e
+MISC ChangeLog 52855 RMD160 c6ff7637996e33a85f7b3dddde6f691efe257696 SHA1 577e33e0602db05cc3de28392d527e3d78a09170 SHA256 54c02eac251c00456f2528dfbd77608b2c7f39af61b7135d4ad79df4778e837b
MISC metadata.xml 1694 RMD160 1cf9a91557876877658f9aaab4d4b4b4ebbcc3fe SHA1 402aab3f56cd775a5443f467a73b637d03919f5c SHA256 9c65ad59ae9fb4d7f1fdbcb04d0535984dd107484eedb2e90d4331a21de680c2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.10 (GNU/Linux)
-iEYEARECAAYFAkmkKIQACgkQn/5bYzqsSmF5jACfU2BO8uitWsnVhZ5vCggLqmO+
-DPoAoL3EvwAYrgDe25eZC5JpIGVpXEuo
-=R2WY
+iEYEARECAAYFAkmkRmMACgkQn/5bYzqsSmFXTwCfWKip9yz1jnjPf3JDgj4Atc7M
+nGwAoKNSzSIpBbdxlAi5fl3ewc5t7Ilr
+=UPX4
-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-5.2_p1.ebuild b/net-misc/openssh/openssh-5.2_p1.ebuild
index 33b7cb733573..0bb831aaa2f2 100644
--- a/net-misc/openssh/openssh-5.2_p1.ebuild
+++ b/net-misc/openssh/openssh-5.2_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1.ebuild,v 1.1 2009/02/24 17:03:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1.ebuild,v 1.2 2009/02/24 19:11:25 vapier Exp $
inherit eutils flag-o-matic multilib autotools pam
@@ -84,7 +84,7 @@ src_unpack() {
EPATCH_OPTS="-p1" epatch "${WORKDIR}"/*pkcs11*/{1,2,4}*
use X509 && EPATCH_OPTS="-R" epatch "${WORKDIR}"/*pkcs11*/1000_all_log.patch
fi
- use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-5.1_p1-x509-hpn-glue.patch
+ use X509 && epatch "${DISTDIR}"/${X509_PATCH}
use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
if ! use X509 ; then
if [[ -n ${LDAP_PATCH} ]] && use ldap ; then