diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2015-05-03 06:58:26 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2015-05-03 06:58:26 +0000 |
| commit | ae657fb265e6774ae1ece82e985fb010a87e6c16 (patch) | |
| tree | e182b03a088a89fca7340ea4e323e44fdafa4344 /net-proxy | |
| parent | Add missing built-time dependency on dev-ruby/hoe. (diff) | |
| download | gentoo-2-ae657fb265e6774ae1ece82e985fb010a87e6c16.tar.gz gentoo-2-ae657fb265e6774ae1ece82e985fb010a87e6c16.tar.bz2 gentoo-2-ae657fb265e6774ae1ece82e985fb010a87e6c16.zip | |
Fix bad define for HAVE_SENDBUF_IOCTL (bug #547032).
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/dante/ChangeLog | 6 | ||||
| -rw-r--r-- | net-proxy/dante/dante-1.4.0-r2.ebuild | 7 | ||||
| -rw-r--r-- | net-proxy/dante/dante-1.4.1.ebuild | 7 | ||||
| -rw-r--r-- | net-proxy/dante/files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch | 11 |
4 files changed, 24 insertions, 7 deletions
diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog index b9ec92dacec9..ab4e6f5ceb49 100644 --- a/net-proxy/dante/ChangeLog +++ b/net-proxy/dante/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-proxy/dante # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.84 2015/01/09 23:03:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.85 2015/05/03 06:58:26 jer Exp $ + + 03 May 2015; Jeroen Roovers <jer@gentoo.org> dante-1.4.0-r2.ebuild, + dante-1.4.1.ebuild, +files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch: + Fix bad define for HAVE_SENDBUF_IOCTL (bug #547032). 09 Jan 2015; Robin H. Johnson <robbat2@gentoo.org> metadata.xml: Take maintainership of this again, just like 12 years ago. diff --git a/net-proxy/dante/dante-1.4.0-r2.ebuild b/net-proxy/dante/dante-1.4.0-r2.ebuild index 63e4d36d25fe..3ba704905887 100644 --- a/net-proxy/dante/dante-1.4.0-r2.ebuild +++ b/net-proxy/dante/dante-1.4.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0-r2.ebuild,v 1.2 2014/11/02 09:29:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0-r2.ebuild,v 1.3 2015/05/03 06:58:26 jer Exp $ EAPI="5" @@ -35,7 +35,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.4.0-socksify.patch \ "${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch \ - "${FILESDIR}"/${PN}-1.4.0-cflags.patch + "${FILESDIR}"/${PN}-1.4.0-cflags.patch \ + "${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch sed -i \ -e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \ diff --git a/net-proxy/dante/dante-1.4.1.ebuild b/net-proxy/dante/dante-1.4.1.ebuild index 8974ce46e26f..9a97b1dc8d94 100644 --- a/net-proxy/dante/dante-1.4.1.ebuild +++ b/net-proxy/dante/dante-1.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.1.ebuild,v 1.2 2014/11/02 09:29:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.1.ebuild,v 1.3 2015/05/03 06:58:26 jer Exp $ EAPI="5" @@ -35,7 +35,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.4.0-socksify.patch \ "${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch \ - "${FILESDIR}"/${PN}-1.4.0-cflags.patch + "${FILESDIR}"/${PN}-1.4.0-cflags.patch \ + "${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch sed -i \ -e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \ diff --git a/net-proxy/dante/files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch b/net-proxy/dante/files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch new file mode 100644 index 000000000000..d8e2c220ce92 --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch @@ -0,0 +1,11 @@ +--- a/libscompat.m4 ++++ b/libscompat.m4 +@@ -373,7 +373,7 @@ + + return 0; + }], [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_SENDBUF_IOCTL, TIOCOUTQ, [send buffer data]) ++ AC_DEFINE(HAVE_SENDBUF_IOCTL, 1, [send buffer data]) + AC_DEFINE(SENDBUF_IOCTLVAL, TIOCOUTQ, [send buffer ioctl])], + [AC_MSG_RESULT(no)])], + [dnl assume no when cross-compiling |