diff options
| author |   Richard Yao <ryao@gentoo.org> | 2012-05-29 08:34:46 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2012-05-29 08:34:46 +0000 |
| commit | c00291ce38b73cae81a92f7dd7e5da90eb720e7b (patch) | |
| tree | 37d7769808f2dbb71b91372af34cdb0b407d9c96 /net-misc/openssh | |
| parent | Version bump. #417699. Drop old versions. (diff) | |
| download | historical-c00291ce38b73cae81a92f7dd7e5da90eb720e7b.tar.gz historical-c00291ce38b73cae81a92f7dd7e5da90eb720e7b.tar.bz2 historical-c00291ce38b73cae81a92f7dd7e5da90eb720e7b.zip | |
Fix build failure on Gentoo FreeBSD 9, written by naota, reviewed by xarthisius, approved by Chainsaw, bug #391011
Package-Manager: portage-2.1.10.49/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-6.0_p1-fix-freebsd-compilation.patch | 15 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-6.0_p1.ebuild | 3 |
3 files changed, 23 insertions, 2 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 3e166ea4ce24..3a857bbc6b0a 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.446 2012/05/23 19:32:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.447 2012/05/29 08:34:46 ryao Exp $ + + 29 May 2012; Richard Yao <ryao@gentoo.org> + +files/openssh-6.0_p1-fix-freebsd-compilation.patch, openssh-6.0_p1.ebuild: + Fix build failure on Gentoo FreeBSD 9, written by naota, reviewed by + xarthisius, approved by Chainsaw, bug #391011 23 May 2012; Mike Frysinger <vapier@gentoo.org> openssh-5.5_p1-r2.ebuild, openssh-5.6_p1-r2.ebuild, openssh-5.7_p1-r1.ebuild, openssh-5.8_p1-r1.ebuild, diff --git a/net-misc/openssh/files/openssh-6.0_p1-fix-freebsd-compilation.patch b/net-misc/openssh/files/openssh-6.0_p1-fix-freebsd-compilation.patch new file mode 100644 index 000000000000..3b34cd2e35a9 --- /dev/null +++ b/net-misc/openssh/files/openssh-6.0_p1-fix-freebsd-compilation.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index 2b60300..21b6112 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -725,6 +725,10 @@ mips-sony-bsd|mips-sony-newsos4) + AC_CHECK_HEADER([net/if_tap.h], , + AC_DEFINE([SSH_TUN_NO_L2], [1], [No layer 2 tunnel support])) + AC_DEFINE([BROKEN_GLOB], [1], [FreeBSD glob does not do what we need]) ++ AC_DEFINE([DISABLE_UTMP], [1], ++ [Define if you don't want to use utmp]) ++ AC_DEFINE([DISABLE_WTMP], [1], ++ [Define if you don't want to use wtmp]) + ;; + *-*-bsdi*) + AC_DEFINE([SETEUID_BREAKS_SETUID]) diff --git a/net-misc/openssh/openssh-6.0_p1.ebuild b/net-misc/openssh/openssh-6.0_p1.ebuild index 1a0479c5c61a..14218c219730 100644 --- a/net-misc/openssh/openssh-6.0_p1.ebuild +++ b/net-misc/openssh/openssh-6.0_p1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.0_p1.ebuild,v 1.5 2012/05/23 19:32:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.0_p1.ebuild,v 1.6 2012/05/29 08:34:46 ryao Exp $ EAPI="2" inherit eutils user flag-o-matic multilib autotools pam systemd @@ -100,6 +100,7 @@ src_prepare() { use ldap && ewarn "Sorry, X509 and LDAP conflict internally, disabling LDAP" fi epatch "${FILESDIR}"/${PN}-6.0_p1-test.patch #391011 + epatch "${FILESDIR}"/${PN}-6.0_p1-fix-freebsd-compilation.patch #391011 epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex if [[ -n ${HPN_PATCH} ]] && use hpn; then epatch "${WORKDIR}"/${HPN_PATCH%.*} |