diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-02-10 02:44:53 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-02-10 02:44:53 +0000 |
| commit | 903cd79faa5d78c18ad6096a0dfa15c334f985f9 (patch) | |
| tree | 87f0d0b957ab837404a244ff2723f0e92a1ec9d2 /net-misc/openssh | |
| parent | Also add AES-CTR fix to 5.8_p1 presently under stabilization. alpha/hppa/ppc6... (diff) | |
| download | gentoo-2-903cd79faa5d78c18ad6096a0dfa15c334f985f9.tar.gz gentoo-2-903cd79faa5d78c18ad6096a0dfa15c334f985f9.tar.bz2 gentoo-2-903cd79faa5d78c18ad6096a0dfa15c334f985f9.zip | |
Drop openssl build patch since it doesn't seem to be needed anymore, and apply simple build fix for selinux from upstream #354247 by MarisN.
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-5.8_p1-selinux.patch | 18 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-5.8_p1-r1.ebuild | 4 |
3 files changed, 26 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index b2d0da300386..46580494b5a2 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.408 2011/02/10 02:32:42 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.409 2011/02/10 02:44:53 vapier Exp $ + + 10 Feb 2011; Mike Frysinger <vapier@gentoo.org> openssh-5.8_p1-r1.ebuild, + +files/openssh-5.8_p1-selinux.patch: + Drop openssl build patch since it doesn't seem to be needed anymore, and + apply simple build fix for selinux from upstream #354247 by MarisN. 10 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> openssh-5.8_p1.ebuild: Also add AES-CTR fix to 5.8_p1 presently under stabilization. diff --git a/net-misc/openssh/files/openssh-5.8_p1-selinux.patch b/net-misc/openssh/files/openssh-5.8_p1-selinux.patch new file mode 100644 index 000000000000..7be2879f9a65 --- /dev/null +++ b/net-misc/openssh/files/openssh-5.8_p1-selinux.patch @@ -0,0 +1,18 @@ +http://bugs.gentoo.org/354247 + +[openbsd-compat/port-linux.c] Bug #1851: fix syntax error in + selinux code. Patch from Leonardo Chiquitto. + +/* $Id: openssh-5.8_p1-selinux.patch,v 1.1 2011/02/10 02:44:53 vapier Exp $ */ + +--- a/openbsd-compat/port-linux.c ++++ b/openbsd-compat/port-linux.c +@@ -213,7 +213,7 @@ + + if (!ssh_selinux_enabled()) + return; +- if (path == NULL) ++ if (path == NULL) { + setfscreatecon(NULL); + return; + } diff --git a/net-misc/openssh/openssh-5.8_p1-r1.ebuild b/net-misc/openssh/openssh-5.8_p1-r1.ebuild index 785b87fb0449..4fad901aeba4 100644 --- a/net-misc/openssh/openssh-5.8_p1-r1.ebuild +++ b/net-misc/openssh/openssh-5.8_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p1-r1.ebuild,v 1.1 2011/02/10 02:30:27 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p1-r1.ebuild,v 1.2 2011/02/10 02:44:53 vapier Exp $ EAPI="2" inherit eutils flag-o-matic multilib autotools pam @@ -89,7 +89,7 @@ src_prepare() { else use ldap && ewarn "Sorry, X509 and LDAP conflict internally, disabling LDAP" fi - epatch "${FILESDIR}"/${PN}-5.4_p1-openssl.patch + epatch "${FILESDIR}"/${PN}-5.8_p1-selinux.patch #354247 epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex if [[ -n ${HPN_PATCH} ]] && use hpn; then epatch "${WORKDIR}"/${HPN_PATCH%.*} |