diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2016-01-27 17:34:08 +0300 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2016-01-27 17:35:24 +0300 |
| commit | 2c3d46ff0961314c35017d85a64ab9a1cc6f4ad8 (patch) | |
| tree | bbf6d4d5ecf5686ee4dad9eb92a3974331271da0 | |
| parent | mail-filter/rspamd: add jit USE flag (fixes bug 572682) (diff) | |
| download | gentoo-2c3d46ff0961314c35017d85a64ab9a1cc6f4ad8.tar.gz gentoo-2c3d46ff0961314c35017d85a64ab9a1cc6f4ad8.tar.bz2 gentoo-2c3d46ff0961314c35017d85a64ab9a1cc6f4ad8.zip | |
net-misc/vtun: fix building with GCC 5
Bump EAPI to 5, add slot to dev-libs/openssl dependency.
Add missing 'die' on sed call.
Make description shorter to silence QA warning.
Gentoo-Bug: 570462
Package-Manager: portage-2.2.26
| -rw-r--r-- | net-misc/vtun/files/vtun-3.0.3-gcc5.patch | 13 | ||||
| -rw-r--r-- | net-misc/vtun/vtun-3.0.3.ebuild | 14 |
2 files changed, 22 insertions, 5 deletions
diff --git a/net-misc/vtun/files/vtun-3.0.3-gcc5.patch b/net-misc/vtun/files/vtun-3.0.3-gcc5.patch new file mode 100644 index 000000000000..99c6531d7268 --- /dev/null +++ b/net-misc/vtun/files/vtun-3.0.3-gcc5.patch @@ -0,0 +1,13 @@ +Index: vtun-3.0.3/cfg_file.y +=================================================================== +--- vtun-3.0.3.orig/cfg_file.y ++++ vtun-3.0.3/cfg_file.y +@@ -624,7 +624,7 @@ int clear_nat_hack_client(void *d, void + } + + /* Clear the VTUN_NAT_HACK flag which are not relevant to the current operation mode */ +-inline void clear_nat_hack_flags(int svr) ++extern inline void clear_nat_hack_flags(int svr) + { + if (svr) + llist_trav(&host_list,clear_nat_hack_server,NULL); diff --git a/net-misc/vtun/vtun-3.0.3.ebuild b/net-misc/vtun/vtun-3.0.3.ebuild index 67921500af5a..2a5c6490db58 100644 --- a/net-misc/vtun/vtun-3.0.3.ebuild +++ b/net-misc/vtun/vtun-3.0.3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 inherit eutils linux-info -DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression" +DESCRIPTION="Create tunnels over TCP/IP networks with shaping, encryption, and compression" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" HOMEPAGE="http://vtun.sourceforge.net/" @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ppc ~sparc x86" IUSE="lzo socks5 ssl zlib" -RDEPEND="ssl? ( dev-libs/openssl ) +RDEPEND="ssl? ( dev-libs/openssl:0 ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )" @@ -33,8 +33,12 @@ src_prepare() { epatch "${FILESDIR}"/${P}-includes.patch # remove unneeded checking for /etc/vtund.conf epatch "${FILESDIR}"/${PN}-3.0.2-remove-config-presence-check.patch + # GCC 5 compatibility, patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778164 + epatch "${FILESDIR}"/${P}-gcc5.patch # portage takes care about striping binaries itself - sed -i 's:$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund::' Makefile.in + sed -i 's:$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund::' Makefile.in || die + + epatch_user } src_configure() { |