diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2013-03-12 04:35:43 +0000 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-03-12 04:35:43 +0000 |
commit | cf4424cbcdc700fa473abf495003716dc693237c (patch) | |
tree | 8c287a5c3ef2ca5e8952810cf842620e9d724b01 /net-misc/htun | |
parent | [bump] virtual/perl-Encode-2.490.0 (diff) | |
download | gentoo-2-cf4424cbcdc700fa473abf495003716dc693237c.tar.gz gentoo-2-cf4424cbcdc700fa473abf495003716dc693237c.tar.bz2 gentoo-2-cf4424cbcdc700fa473abf495003716dc693237c.zip |
Version bump, wrt bug #460656. EAPI 5, add ~amd64 keyword, add epatch_user, use readme.gentoo eclass instead of simple message in pkg_postinst, respect CFLAGS, LDFLAGS and compiler. Thanks to Michael Mair-Keimberger and Andrew Savchenko for ebuild improvements
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'net-misc/htun')
-rw-r--r-- | net-misc/htun/ChangeLog | 14 | ||||
-rw-r--r-- | net-misc/htun/files/README.gentoo | 3 | ||||
-rw-r--r-- | net-misc/htun/files/htun-0.9.6-glibc.patch | 14 | ||||
-rw-r--r-- | net-misc/htun/files/htun-0.9.6-makefile.patch | 22 | ||||
-rw-r--r-- | net-misc/htun/htun-0.9.6.ebuild | 39 |
5 files changed, 90 insertions, 2 deletions
diff --git a/net-misc/htun/ChangeLog b/net-misc/htun/ChangeLog index 1dabf3e9ec5e..e21e570104b9 100644 --- a/net-misc/htun/ChangeLog +++ b/net-misc/htun/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-misc/htun -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/htun/ChangeLog,v 1.8 2009/01/14 03:47:53 vapier Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/htun/ChangeLog,v 1.9 2013/03/12 04:35:43 pinkbyte Exp $ + +*htun-0.9.6 (12 Mar 2013) + + 12 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> +htun-0.9.6.ebuild, + +files/htun-0.9.6-glibc.patch, +files/htun-0.9.6-makefile.patch, + +files/README.gentoo: + Version bump, wrt bug #460656. EAPI 5, add ~amd64 keyword, add epatch_user, + use readme.gentoo eclass instead of simple message in pkg_postinst, respect + CFLAGS, LDFLAGS and compiler. Thanks to Michael Mair-Keimberger and Andrew + Savchenko for ebuild improvements 14 Jan 2009; Mike Frysinger <vapier@gentoo.org> +files/htun-0.9.5-glibc.patch, htun-0.9.5.ebuild: diff --git a/net-misc/htun/files/README.gentoo b/net-misc/htun/files/README.gentoo new file mode 100644 index 000000000000..1710c726723a --- /dev/null +++ b/net-misc/htun/files/README.gentoo @@ -0,0 +1,3 @@ +NOTE: HTun requires the Universal TUN/TAP module +available in the Linux kernel. Make sure you have +compiled the tun.o driver as a module! diff --git a/net-misc/htun/files/htun-0.9.6-glibc.patch b/net-misc/htun/files/htun-0.9.6-glibc.patch new file mode 100644 index 000000000000..66f9b5ba00a5 --- /dev/null +++ b/net-misc/htun/files/htun-0.9.6-glibc.patch @@ -0,0 +1,14 @@ +get things building with glibc-2.8 + +http://bugs.gentoo.org/248100 + +--- include/common.h ++++ include/common.h +@@ -23,6 +23,7 @@ + #ifndef __COMMON_H + #define __COMMON_H + ++#include <limits.h> + #include <netinet/in.h> + #include <time.h> + #include "queue.h" diff --git a/net-misc/htun/files/htun-0.9.6-makefile.patch b/net-misc/htun/files/htun-0.9.6-makefile.patch new file mode 100644 index 000000000000..67d3bd039c96 --- /dev/null +++ b/net-misc/htun/files/htun-0.9.6-makefile.patch @@ -0,0 +1,22 @@ +--- src/Makefile 2005-10-27 12:58:53.000000000 +0200 ++++ src/Makefile 2013-03-08 22:20:52.360922189 +0100 +@@ -20,16 +20,14 @@ + + # $Id: htun-0.9.6-makefile.patch,v 1.1 2013/03/12 04:35:43 pinkbyte Exp $ + +- +-CFLAGS = -I../include -I. -O -W -Wall -g -D_REENTRANT #-pg -a +-LDFLAGS = -lfl -lpthread # -flex for linux, solaris ? +-LEX_CFLAGS = -I../include -I. -g -D_REENTRANT #-pg -a ++CFLAGS := $(CFLAGS) -I../include -I. -O -W -Wall -D_REENTRANT ++LDFLAGS := $(LDFLAGS) -lfl -lpthread ++LEX_CFLAGS = -I../include -I. -D_REENTRANT + + # in Linux, LFLAGS is empty. In Solaris, LFLAGS = -lnsl -lsocket + #LFLAGS = -lnsl -lsocket + + VPATH = .:../include +-CC := gcc + LEX = flex + YACC = yacc + INCLUDE := $(wildcard ../include/*.h) diff --git a/net-misc/htun/htun-0.9.6.ebuild b/net-misc/htun/htun-0.9.6.ebuild new file mode 100644 index 000000000000..50ee4bfbbfcb --- /dev/null +++ b/net-misc/htun/htun-0.9.6.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/htun/htun-0.9.6.ebuild,v 1.1 2013/03/12 04:35:43 pinkbyte Exp $ + +EAPI="5" + +inherit eutils readme.gentoo + +DESCRIPTION="Project to tunnel IP traffic over HTTP" +HOMEPAGE="http://linux.softpedia.com/get/System/Networking/HTun-14751.shtml" +SRC_URI="http://www.sourcefiles.org/Networking/Tools/Proxy/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# should not be replaced by virtual/yacc +# at least failed with dev-util/bison +DEPEND="dev-util/yacc" +RDEPEND="" + +src_prepare() { + epatch "${FILESDIR}"/${P}-glibc.patch #248100 + epatch "${FILESDIR}"/${P}-makefile.patch + + epatch_user +} + +src_compile() { + emake -C src CC="$(tc-getCC)" +} + +src_install() { + dosbin src/htund + insinto /etc + doins doc/htund.conf + dodoc doc/* README + readme.gentoo_create_doc +} |