diff options
| author |   Jason A. Donenfeld <zx2c4@gentoo.org> | 2017-03-17 15:37:57 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <zx2c4@gentoo.org> | 2017-03-17 15:38:28 +0100 |
| commit | 9754f457cc6d0aeb90a1535a5228ef909e9584c9 (patch) | |
| tree | ffbd77f41fb100837cc8f992f8dc863cd01c270d /net-vpn/htun/files | |
| parent | app-forensics/openscap: remove old (diff) | |
| download | gentoo-9754f457cc6d0aeb90a1535a5228ef909e9584c9.tar.gz gentoo-9754f457cc6d0aeb90a1535a5228ef909e9584c9.tar.bz2 gentoo-9754f457cc6d0aeb90a1535a5228ef909e9584c9.zip | |
Second half of net-vpn/ move
Diffstat (limited to 'net-vpn/htun/files')
| -rw-r--r-- | net-vpn/htun/files/README.gentoo | 3 | ||||
| -rw-r--r-- | net-vpn/htun/files/htun-0.9.6-glibc.patch | 14 | ||||
| -rw-r--r-- | net-vpn/htun/files/htun-0.9.6-makefile.patch | 34 |
3 files changed, 51 insertions, 0 deletions
diff --git a/net-vpn/htun/files/README.gentoo b/net-vpn/htun/files/README.gentoo new file mode 100644 index 000000000000..1710c726723a --- /dev/null +++ b/net-vpn/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-vpn/htun/files/htun-0.9.6-glibc.patch b/net-vpn/htun/files/htun-0.9.6-glibc.patch new file mode 100644 index 000000000000..3f281c526388 --- /dev/null +++ b/net-vpn/htun/files/htun-0.9.6-glibc.patch @@ -0,0 +1,14 @@ +get things building with glibc-2.8 + +http://bugs.gentoo.org/248100 + +--- a/include/common.h ++++ b/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-vpn/htun/files/htun-0.9.6-makefile.patch b/net-vpn/htun/files/htun-0.9.6-makefile.patch new file mode 100644 index 000000000000..c1f0b76bfa14 --- /dev/null +++ b/net-vpn/htun/files/htun-0.9.6-makefile.patch @@ -0,0 +1,34 @@ +* Fix build system to not hardcode CC +* Fix build system to respect user flags + +--- a/src/Makefile ++++ b/src/Makefile +@@ -20,16 +20,14 @@ + + # $Id: Makefile,v 2.16 2002/08/11 15:57:07 jehsom 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) +@@ -52,7 +50,7 @@ + $(OBJS): $(INCLUDE) + + $(CONFOBS): $(CONFSRC) +- $(CC) $(LEX_CFLAGS) -c $(@:.o=.c) ++ $(CC) $(CFLAGS) $(LEX_CFLAGS) -c $(@:.o=.c) + + lex.yy.c: parse.l + $(LEX) $^ |