- update to 0.5.1, from Simon Kuhnle.
- don't hide command lines in build output - honour CC in the environment not just mk.conf
This commit is contained in:
sthen
parent
da31aaac39
commit
6d962390a0
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2008/02/07 12:42:11 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2009/03/30 09:17:45 sthen Exp $
|
||||
|
||||
COMMENT= tunnel IPv4 data through DNS
|
||||
|
||||
DISTNAME= iodine-0.4.1
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
DISTNAME= iodine-0.5.1
|
||||
CATEGORIES= net
|
||||
|
||||
HOMEPAGE= http://code.kryo.se/iodine/
|
||||
@ -18,6 +17,7 @@ MASTER_SITES= ${HOMEPAGE}
|
||||
|
||||
WANTLIB= c z
|
||||
|
||||
MAKE_ENV= CC=${CC}
|
||||
REGRESS_DEPENDS= ::devel/check
|
||||
REGRESS_TARGET= test
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (iodine-0.4.1.tar.gz) = WNgryhGkGgHQ3fp9EF5qSA==
|
||||
RMD160 (iodine-0.4.1.tar.gz) = xT0mmvy7M1Rq4LK2Mz9S2ux//eM=
|
||||
SHA1 (iodine-0.4.1.tar.gz) = odTPO7yY7DAqdU2yoP1HWkjYj1I=
|
||||
SHA256 (iodine-0.4.1.tar.gz) = Zcc4URlaHRRs/pTaGDw/npdtSlI2w5liB41Hlhc3G7Q=
|
||||
SIZE (iodine-0.4.1.tar.gz) = 33551
|
||||
MD5 (iodine-0.5.1.tar.gz) = W7C1bgR+FFOjaV7AuUeLhA==
|
||||
RMD160 (iodine-0.5.1.tar.gz) = BqZjjxOl3g3JIwkdKk/eqTJrIYs=
|
||||
SHA1 (iodine-0.5.1.tar.gz) = OE9dWWqNXoe2sO0CG3iL68qbSiA=
|
||||
SHA256 (iodine-0.5.1.tar.gz) = TZ3OOYstCokT5kzzaCzIG+7yt2itO4AQ0KNpxjoSw+8=
|
||||
SIZE (iodine-0.5.1.tar.gz) = 50636
|
||||
|
||||
@ -1,19 +1,41 @@
|
||||
$OpenBSD: patch-src_Makefile,v 1.1 2008/02/07 12:42:11 sthen Exp $
|
||||
--- src/Makefile.orig Fri Nov 30 22:11:30 2007
|
||||
+++ src/Makefile Thu Feb 7 11:48:20 2008
|
||||
$OpenBSD: patch-src_Makefile,v 1.2 2009/03/30 09:17:45 sthen Exp $
|
||||
--- src/Makefile.orig Sat Mar 21 13:07:49 2009
|
||||
+++ src/Makefile Mon Mar 30 10:09:57 2009
|
||||
@@ -1,4 +1,4 @@
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
COMMONOBJS = tun.o dns.o read.o encoding.o login.o base32.o base64.o md5.o common.o
|
||||
CLIENTOBJS = iodine.o
|
||||
CLIENT = ../bin/iodine
|
||||
@@ -9,7 +9,8 @@ OS = `uname | tr "a-z" "A-Z"`
|
||||
ARCH = `uname -m`
|
||||
@@ -10,7 +10,8 @@ ARCH = `uname -m`
|
||||
|
||||
LDFLAGS = -lz
|
||||
-CFLAGS = -c -g -Wall -D$(OS) -pedantic
|
||||
LIBPATH = -L.
|
||||
LDFLAGS = -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
|
||||
-CFLAGS = -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
|
||||
+CFLAGS ?= -g
|
||||
+CFLAGS += -c -Wall -D$(OS) -pedantic
|
||||
+CFLAGS += -c -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
|
||||
|
||||
all: stateos $(CLIENT) $(SERVER) $(TESTSUITE)
|
||||
all: stateos $(CLIENT) $(SERVER)
|
||||
|
||||
@@ -18,18 +19,15 @@ stateos:
|
||||
@echo OS is $(OS), arch is $(ARCH)
|
||||
|
||||
$(CLIENT): $(COMMONOBJS) $(CLIENTOBJS)
|
||||
- @echo LD $@
|
||||
@mkdir -p ../bin
|
||||
- @$(CC) $(COMMONOBJS) $(CLIENTOBJS) -o $(CLIENT) $(LDFLAGS)
|
||||
+ $(CC) $(COMMONOBJS) $(CLIENTOBJS) -o $(CLIENT) $(LDFLAGS)
|
||||
|
||||
$(SERVER): $(COMMONOBJS) $(SERVEROBJS)
|
||||
- @echo LD $@
|
||||
@mkdir -p ../bin
|
||||
- @$(CC) $(COMMONOBJS) $(SERVEROBJS) -o $(SERVER) $(LDFLAGS)
|
||||
+ $(CC) $(COMMONOBJS) $(SERVEROBJS) -o $(SERVER) $(LDFLAGS)
|
||||
|
||||
.c.o:
|
||||
- @echo CC $<
|
||||
- @$(CC) $(CFLAGS) $< -o $@
|
||||
+ $(CC) $(CFLAGS) $< -o $@
|
||||
|
||||
clean:
|
||||
@echo "Cleaning src/"
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-src_iodine_c,v 1.1.1.1 2008/02/06 21:42:28 bernd Exp $
|
||||
$OpenBSD: patch-src_iodine_c,v 1.2 2009/03/30 09:17:45 sthen Exp $
|
||||
|
||||
Drop privileges and chroot by default.
|
||||
|
||||
--- src/iodine.c.orig Fri Nov 30 23:11:30 2007
|
||||
+++ src/iodine.c Fri Feb 1 20:54:41 2008
|
||||
@@ -621,9 +621,9 @@ main(int argc, char **argv)
|
||||
int dns_fd;
|
||||
--- src/iodine.c.orig Sat Mar 21 14:07:49 2009
|
||||
+++ src/iodine.c Mon Mar 30 10:25:08 2009
|
||||
@@ -1009,9 +1009,9 @@ main(int argc, char **argv)
|
||||
int autodetect_frag_size;
|
||||
|
||||
memset(password, 0, 33);
|
||||
- username = NULL;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-src_iodined_c,v 1.1.1.1 2008/02/06 21:42:28 bernd Exp $
|
||||
$OpenBSD: patch-src_iodined_c,v 1.2 2009/03/30 09:17:45 sthen Exp $
|
||||
|
||||
Drop privileges and chroot by default.
|
||||
|
||||
--- src/iodined.c.orig Fri Nov 30 23:11:30 2007
|
||||
+++ src/iodined.c Fri Feb 1 20:54:41 2008
|
||||
@@ -447,8 +447,8 @@ main(int argc, char **argv)
|
||||
int port;
|
||||
int mtu;
|
||||
--- src/iodined.c.orig Sat Mar 21 14:07:49 2009
|
||||
+++ src/iodined.c Mon Mar 30 10:25:08 2009
|
||||
@@ -961,8 +961,8 @@ main(int argc, char **argv)
|
||||
int skipipconfig;
|
||||
char *netsize;
|
||||
|
||||
- username = NULL;
|
||||
- newroot = NULL;
|
||||
@ -14,4 +14,4 @@ Drop privileges and chroot by default.
|
||||
+ newroot = "/var/empty";
|
||||
device = NULL;
|
||||
foreground = 0;
|
||||
mtu = 1024;
|
||||
bind_enable = 0;
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2008/02/07 12:42:11 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2009/03/30 09:17:45 sthen Exp $
|
||||
@newgroup _iodine:598
|
||||
@newuser _iodine:598:598:daemon:Iodine User:/nonexistent:/sbin/nologin
|
||||
sbin/iodine
|
||||
sbin/iodined
|
||||
man/man8/
|
||||
@man man/man8/iodine.8
|
||||
@bin sbin/iodine
|
||||
@bin sbin/iodined
|
||||
|
||||
Loading…
Reference in New Issue
Block a user