Update vpnc to 0.4.0, thanks to Swen Kuhnlein

[openwrt/svn-archive/archive.git] / net / vpnc / patches / 01-cross.patch

diff --git a/net/vpnc/patches/01-cross.patch b/net/vpnc/patches/01-cross.patch
index ff96a836525e7c31d662206901e53acf42ac4417..0ee9a4e5f1416769e6f290aa6ca40ded7ebf1e12 100644 (file)
--- a/net/vpnc/patches/01-cross.patch
+++ b/net/vpnc/patches/01-cross.patch
@@ -1,44 +1,28 @@
-diff -Nur vpnc-0.3.3/Makefile vpnc-0.3.3.patched/Makefile
---- vpnc-0.3.3/Makefile        2005-05-01 22:30:35.000000000 +0200
-+++ vpnc-0.3.3.patched/Makefile        2005-12-23 23:43:55.222055250 +0100
-@@ -17,31 +17,32 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+diff -Nur vpnc-0.4.0/Makefile vpnc-0.4.0.patched/Makefile
+--- vpnc-0.4.0/Makefile        2007-02-19 21:51:12.000000000 +0100
++++ vpnc-0.4.0.patched/Makefile        2007-02-25 10:40:25.000000000 +0100
+@@ -20,7 +20,7 @@
+ # $Id: Makefile 148 2007-02-19 20:51:14Z Maurice Massar $
  
  DESTDIR=
 -PREFIX=/usr/local
 +PREFIX=/usr
  ETCDIR=/etc/vpnc
+ BINDIR=$(PREFIX)/bin
  SBINDIR=$(PREFIX)/sbin
- MANDIR=$(PREFIX)/share/man
+@@ -35,12 +35,11 @@
+ RELEASE_VERSION := $(shell cat VERSION)
  
  CC=gcc
--CFLAGS=-W -Wall -O -g '-DVERSION="$(shell cat VERSION)"' $(shell libgcrypt-config --cflags)
--LDFLAGS=-g $(shell libgcrypt-config --libs)
-+CFLAGS=-W -Wall -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) '-DVERSION="$(shell cat VERSION)"'
-+LDFLAGS=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error
+-CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g
++CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) '-DVERSION="$(shell cat VERSION)"'
+ CPPFLAGS = -DVERSION=\"$(VERSION)\"
+-LDFLAGS = -g $(shell libgcrypt-config --libs)
+-CFLAGS +=  $(shell libgcrypt-config --cflags)
++LDFLAGS = -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error
  
--ifeq ($(shell uname -s), Linux)
-+OS=$(shell uname -s)
-+ifeq ($(OS), Linux)
- SYSDEP=sysdep-linux.o
- endif
--ifeq ($(shell uname -s), FreeBSD)
-+ifeq ($(OS), FreeBSD)
- CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN
- SYSDEP=sysdep-bsd.o
- endif
--ifeq ($(shell uname -s), NetBSD)
-+ifeq ($(OS), NetBSD)
- CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN
- SYSDEP=sysdep-bsd.o
- endif
--ifeq ($(shell uname -s), OpenBSD)
-+ifeq ($(OS), OpenBSD)
- CFLAGS += -DSOCKADDR_IN_SIN_LEN -DHAVE_SA_LEN -DNEED_IPLEN_FIX -DNEW_TUN
- SYSDEP=sysdep-bsd.o
- endif
 -ifeq ($(shell uname -s), SunOS)
 +ifeq ($(OS), SunOS)
- CFLAGS += -DNEED_IPLEN_FIX
  LDFLAGS += -lnsl -lresolv -lsocket
- SYSDEP=sysdep-svr4.o
+ endif
+