upgraded iodine to 0.6.0-rc1 which fixes lots of errors (cf. CHANGELOG)

This commit is contained in:
Georg Schwarz 2010-03-06 20:06:28 +00:00 committed by Thomas Klausner
parent a8b8b244d4
commit b8de19e468
3 changed files with 18 additions and 25 deletions

View file

@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.4 2009/04/18 12:08:31 gschwarz Exp $
# $NetBSD: Makefile,v 1.5 2010/03/06 20:06:28 gschwarz Exp $
DISTNAME= iodine-0.5.1
PKGNAME= iodine-0.6.0
DISTNAME= iodine-0.6.0-rc1
CATEGORIES= net
MASTER_SITES= http://code.kryo.se/iodine/

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.3 2009/04/18 12:08:31 gschwarz Exp $
$NetBSD: distinfo,v 1.4 2010/03/06 20:06:28 gschwarz Exp $
SHA1 (iodine-0.5.1.tar.gz) = 384f5d596a8d5e87b6b0ed021b788bebca9b4a20
RMD160 (iodine-0.5.1.tar.gz) = 06a6638f13a5de0dc923091d2a4fdea9326b218b
Size (iodine-0.5.1.tar.gz) = 50636 bytes
SHA1 (patch-aa) = ff109101b5a72aa826e6fa77e386ba18d7f0bf34
SHA1 (iodine-0.6.0-rc1.tar.gz) = 4fa9a248b8a84df8a727a5d749e669e58136edca
RMD160 (iodine-0.6.0-rc1.tar.gz) = 6974beac28e07b0c280d7095f15d13699e9cad65
Size (iodine-0.6.0-rc1.tar.gz) = 89827 bytes
SHA1 (patch-aa) = f0b3ed0284f3e5d6d5e713b075277a1ea72365b6

View file

@ -1,21 +1,13 @@
$NetBSD: patch-aa,v 1.1 2009/04/18 12:08:31 gschwarz Exp $
$NetBSD: patch-aa,v 1.2 2010/03/06 20:06:28 gschwarz Exp $
--- src/Makefile.orig 2009-04-18 13:50:38.000000000 +0200
+++ src/Makefile 2009-04-18 13:52:59.000000000 +0200
@@ -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,8 +9,8 @@
ARCH = `uname -m`
--- src/Makefile.orig 2010-03-06 20:47:50.000000000 +0100
+++ src/Makefile 2010-03-06 20:54:32.000000000 +0100
@@ -28,7 +28,7 @@
LIBPATH = -L.
-LDFLAGS = -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
-CFLAGS = -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
+LDFLAGS += -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
+CFLAGS += -c -D$(OS) `sh osflags $(TARGETOS) cflags` $(CPPFLAGS)
all: stateos $(CLIENT) $(SERVER)
.c.o:
@echo CC $<
- @$(CC) $(CFLAGS) $< -o $@
+ @$(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@
base64u.o client.o iodined.o: base64u.h
base64u.c: base64.c