diff options
| author |   Daniel Ahlberg <aliz@gentoo.org> | 2004-02-25 10:24:45 +0000 |
|---|---|---|
| committer | Daniel Ahlberg <aliz@gentoo.org> | 2004-02-25 10:24:45 +0000 |
| commit | b03885b0ee5a906525efbdc3a1e3bb7c5aa15486 (patch) | |
| tree | eb074727af17ebc0cdabd7b2436dc7d400da20f6 /net-misc/openssh | |
| parent | initial commit; bug #41713 (Manifest recommit) (diff) | |
| download | gentoo-2-b03885b0ee5a906525efbdc3a1e3bb7c5aa15486.tar.gz gentoo-2-b03885b0ee5a906525efbdc3a1e3bb7c5aa15486.tar.bz2 gentoo-2-b03885b0ee5a906525efbdc3a1e3bb7c5aa15486.zip | |
Backport skey configure.ac patch.
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-3.7.1_p2-skey.patch | 11 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-3.7.1_p2-r2.ebuild | 4 |
3 files changed, 17 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 7246a74384d6..ceddf7012953 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openssh # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.66 2004/02/25 00:06:42 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.67 2004/02/25 10:24:45 aliz Exp $ + + 25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> openssh-3.7.1_p2-r2.ebuild: + Backport skey configure.ac patch. 24 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> openssh-3.7.1_p2-r2.ebuild: Unmask for x86 and amd64. diff --git a/net-misc/openssh/files/openssh-3.7.1_p2-skey.patch b/net-misc/openssh/files/openssh-3.7.1_p2-skey.patch new file mode 100644 index 000000000000..c396f5294ab4 --- /dev/null +++ b/net-misc/openssh/files/openssh-3.7.1_p2-skey.patch @@ -0,0 +1,11 @@ +--- configure.ac 2004-02-25 10:21:51.980605062 +0000 ++++ configure.ac 2004-02-25 10:22:23.742782648 +0000 +@@ -662,7 +662,7 @@ + [ + #include <stdio.h> + #include <skey.h> +-int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); } ++int main() { char *ff = "true"; ff=""; exit(0); } + ], + [AC_MSG_RESULT(yes)], + [ diff --git a/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild b/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild index 44809755e1f7..b846792cedd3 100644 --- a/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild +++ b/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild,v 1.8 2004/02/25 00:06:43 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild,v 1.9 2004/02/25 10:24:45 aliz Exp $ inherit eutils flag-o-matic ccc gnuconfig @@ -53,7 +53,7 @@ src_unpack() { use skey && { # prevent the conftest from violating the sandbox - sed -i 's#skey_keyinfo("")#"true"#g' configure + epatch ${FILESDIR}/${P}-skey.patch # updates to skey implementation. epatch ${FILESDIR}/${PN}-skeychallenge-args.diff |