diff options
| author | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-29 12:40:16 +0000 |
|---|---|---|
| committer | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-29 12:40:16 +0000 |
| commit | 213e41cc1fd62ade656030e5af5b554a04149b8c (patch) | |
| tree | 4099fdc897773dddb6f27afcda1f532a7f155360 /openwrt/package/openswan/patches/pluto-includes.patch | |
| parent | 895299e89d2d8244212d60940574b790c1dddd28 (diff) | |
update openswan to 2.40
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2003 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/openswan/patches/pluto-includes.patch')
| -rw-r--r-- | openwrt/package/openswan/patches/pluto-includes.patch | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/openwrt/package/openswan/patches/pluto-includes.patch b/openwrt/package/openswan/patches/pluto-includes.patch index d189c1f4a8..8cd1398d4a 100644 --- a/openwrt/package/openswan/patches/pluto-includes.patch +++ b/openwrt/package/openswan/patches/pluto-includes.patch @@ -1,25 +1,12 @@ -diff -urN openswan-2.3.1dr6.old/programs/pluto/Makefile openswan-2.3.1dr6/programs/pluto/Makefile ---- openswan-2.3.1dr6.old/programs/pluto/Makefile 2005-03-27 22:21:41.000000000 +0200 -+++ openswan-2.3.1dr6/programs/pluto/Makefile 2005-04-05 02:58:42.000000000 +0200 -@@ -66,7 +66,7 @@ - - # where to find klips headers and Openswan headers - # and 2.6 kernel's <rtnetlink.h> and <xfrm.h> --HDRDIRS = -I${OPENSWANSRCDIR}/programs/pluto/linux26 -I${OPENSWANSRCDIR}/include -I$(KLIPSINC) -+HDRDIRS = -I${OPENSWANSRCDIR}/programs/pluto/linux26 -I${OPENSWANSRCDIR}/include -I$(KLIPSINC) $(EXTRA_INCLUDE) - - # On non-LINUX systems, these one of these may be needed (see endian.h) - # BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN -diff -urN openswan-2.3.1dr6.old/programs/pluto/Makefile openswan-2.3.1dr6.dev/programs/pluto/Makefile ---- openswan-2.3.1dr6.old/programs/pluto/Makefile 2005-04-05 03:00:36.000000000 +0200 -+++ openswan-2.3.1dr6.dev/programs/pluto/Makefile 2005-04-05 03:06:18.000000000 +0200 -@@ -255,7 +255,7 @@ - LIBSPLUTO+=$(IPSECPOLICY_LIBS) $(X509_LIBS) $(SMARTCARD_LIBS) +diff -Nur openswan-2.4.0.orig/programs/pluto/Makefile openswan-2.4.0/programs/pluto/Makefile +--- openswan-2.4.0.orig/programs/pluto/Makefile 2005-08-12 03:12:38.000000000 +0200 ++++ openswan-2.4.0/programs/pluto/Makefile 2005-09-29 13:41:14.016377750 +0200 +@@ -271,7 +271,7 @@ LIBSPLUTO+=$(HAVE_THREADS_LIBS) ${XAUTHPAM_LIBS} LIBSPLUTO+=${CURL_LIBS} + LIBSPLUTO+=${EXTRA_CRYPTO_LIBS} -LIBSPLUTO+= -lgmp -lresolv # -lefence -+LIBSPLUTO+= $(EXTRA_LIBS) -lgmp -lresolv # -lefence ++LIBSPLUTO+=$(EXTRA_LIBS) -lgmp -lresolv # -lefence ifneq ($(LD_LIBRARY_PATH),) LDFLAGS=-L$(LD_LIBRARY_PATH) -Binary files openswan-2.3.1dr6.old/programs/pluto/.Makefile.swp and openswan-2.3.1dr6.dev/programs/pluto/.Makefile.swp differ |