Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -0,0 +1,31 @@
|
||||
From 7314d232f8e85879d8f4c311ced44ee5b21fb239 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Wed, 10 Feb 2016 23:26:27 +0100
|
||||
Subject: [PATCH] Makefile: allow to override the PREFIX variable
|
||||
|
||||
Some people may not want to install in /usr/local, so this commit
|
||||
makes it possible to override the PREFIX variable from the make
|
||||
command line.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 69f5aca..f9a6781 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -20,7 +20,7 @@
|
||||
# $Id$
|
||||
|
||||
DESTDIR=
|
||||
-PREFIX=/usr/local
|
||||
+PREFIX?=/usr/local
|
||||
ETCDIR=/etc/vpnc
|
||||
BINDIR=$(PREFIX)/bin
|
||||
SBINDIR=$(PREFIX)/sbin
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
Misc. Makefile cleanup and fix the VERSION definition.
|
||||
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
|
||||
---
|
||||
diff -purN vpnc-0.5.3.orig/Makefile vpnc-0.5.3/Makefile
|
||||
--- vpnc-0.5.3.orig/Makefile 2012-08-06 00:03:22.677914146 +0200
|
||||
+++ vpnc-0.5.3/Makefile 2012-08-06 00:06:58.506744901 +0200
|
||||
@@ -19,21 +19,19 @@
|
||||
#
|
||||
# $Id: Makefile 312 2008-06-15 18:09:42Z Joerg Mayer $
|
||||
|
||||
-DESTDIR=
|
||||
-PREFIX=/usr/local
|
||||
-ETCDIR=/etc/vpnc
|
||||
-BINDIR=$(PREFIX)/bin
|
||||
-SBINDIR=$(PREFIX)/sbin
|
||||
-MANDIR=$(PREFIX)/share/man
|
||||
-DOCDIR=$(PREFIX)/share/doc/vpnc
|
||||
-
|
||||
-SRCS = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c decrypt-utils.c
|
||||
-BINS = vpnc cisco-decrypt
|
||||
-OBJS = $(addsuffix .o,$(basename $(SRCS)))
|
||||
+DESTDIR =
|
||||
+PREFIX ?= /usr/local
|
||||
+ETCDIR = /etc/vpnc
|
||||
+BINDIR = $(PREFIX)/bin
|
||||
+SBINDIR = $(PREFIX)/sbin
|
||||
+MANDIR = $(PREFIX)/share/man
|
||||
+DOCDIR = $(PREFIX)/share/doc/vpnc
|
||||
+
|
||||
+SRCS = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c decrypt-utils.c
|
||||
+BINS = vpnc cisco-decrypt
|
||||
+OBJS = $(addsuffix .o,$(basename $(SRCS)))
|
||||
BINOBJS = $(addsuffix .o,$(BINS))
|
||||
BINSRCS = $(addsuffix .c,$(BINS))
|
||||
-VERSION := $(shell sh mk-version)
|
||||
-RELEASE_VERSION := $(shell cat VERSION)
|
||||
|
||||
# The license of vpnc (Gpl >= 2) is quite likely incompatible with the
|
||||
# openssl license. Openssl is currently used to provide certificate
|
||||
@@ -50,13 +48,13 @@ RELEASE_VERSION := $(shell cat VERSION)
|
||||
#OPENSSL_GPL_VIOLATION = -DOPENSSL_GPL_VIOLATION
|
||||
#OPENSSLLIBS = -lcrypto
|
||||
|
||||
-CC=gcc
|
||||
-CFLAGS ?= -O3 -g
|
||||
-CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
|
||||
-CFLAGS += $(shell libgcrypt-config --cflags)
|
||||
-CPPFLAGS += -DVERSION=\"$(VERSION)\" $(OPENSSL_GPL_VIOLATION)
|
||||
-LDFLAGS ?= -g
|
||||
-LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS)
|
||||
+CC ?= gcc
|
||||
+CFLAGS ?= -O3 -g
|
||||
+CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
|
||||
+CFLAGS += $(shell libgcrypt-config --cflags)
|
||||
+CPPFLAGS += $(OPENSSL_GPL_VIOLATION)
|
||||
+LDFLAGS ?= -g
|
||||
+LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS)
|
||||
|
||||
ifeq ($(shell uname -s), SunOS)
|
||||
LDFLAGS += -lnsl -lresolv -lsocket
|
||||
@@ -84,7 +82,7 @@ cisco-decrypt : cisco-decrypt.o decrypt-
|
||||
$(CC) -o $@ $^ $(LDFLAGS)
|
||||
|
||||
.depend: $(SRCS) $(BINSRCS)
|
||||
- $(CC) -MM $(SRCS) $(BINSRCS) $(CFLAGS) $(CPPFLAGS) > $@
|
||||
+ $(CC) -MM $(SRCS) $(BINSRCS) $(CPPFLAGS) $(CFLAGS) > $@
|
||||
|
||||
vpnc-debug.c vpnc-debug.h : isakmp.h enum2debug.pl
|
||||
LC_ALL=C perl -w ./enum2debug.pl isakmp.h >vpnc-debug.c 2>vpnc-debug.h
|
||||
@@ -0,0 +1,41 @@
|
||||
From 8b035de4867db4fb8da41298224d92bf5b18e86f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Wed, 10 Feb 2016 23:27:30 +0100
|
||||
Subject: [PATCH] Makefile: allow to override the version
|
||||
|
||||
The mk-version script makes the assumption that the build process runs
|
||||
from a SVN checkout or a Git clone of the vpnc source code. However,
|
||||
this is not always the case, for example when you are building from a
|
||||
tarball, but inside a larger project that is versioned with Git.
|
||||
|
||||
This is typically the case when building vpnc under a tool like
|
||||
Buildroot, or potentially other embedded Linux build system: the build
|
||||
system tool itself is versioned in Git, downloads tarballs of software
|
||||
components and builds them.
|
||||
|
||||
In order to support such situations, this commit adjusts the Makefile
|
||||
to allow the VERSION variable to be overriden from the make command
|
||||
line.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index f9a6781..e80ef17 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -57,7 +57,7 @@ OBJS = $(addsuffix .o,$(basename $(SRCS)))
|
||||
CRYPTO_OBJS = $(addsuffix .o,$(basename $(CRYPTO_SRCS)))
|
||||
BINOBJS = $(addsuffix .o,$(BINS))
|
||||
BINSRCS = $(addsuffix .c,$(BINS))
|
||||
-VERSION := $(shell sh mk-version)
|
||||
+VERSION ?= $(shell sh mk-version)
|
||||
RELEASE_VERSION := $(shell cat VERSION)
|
||||
|
||||
CC ?= gcc
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff -urN vpnc-0.5.3-0rig/Makefile vpnc-0.5.3/Makefile
|
||||
--- vpnc-0.5.3-0rig/Makefile 2008-11-19 21:36:12.000000000 +0100
|
||||
+++ vpnc-0.5.3/Makefile 2009-01-15 00:38:36.000000000 +0100
|
||||
@@ -72,7 +72,10 @@
|
||||
$(CC) -o $@ $^ $(LDFLAGS)
|
||||
|
||||
vpnc.8 : vpnc.8.template makeman.pl vpnc
|
||||
- ./makeman.pl
|
||||
+ @echo "Cannot make manual when cross compiling"
|
||||
+ touch $@
|
||||
+
|
||||
+# ./makeman.pl
|
||||
|
||||
vpnc-script : vpnc-script.in
|
||||
sed -e 's,@''PREFIX''@,$(PREFIX),g' $< > $@ && chmod 755 $@
|
||||
@@ -0,0 +1,45 @@
|
||||
From 014a8e04a0fa775b2ade78e5f7655a1453375884 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Wed, 10 Feb 2016 23:31:12 +0100
|
||||
Subject: [PATCH] Makefile: allow passing custom CFLAGS/CPPFLAGS
|
||||
|
||||
vpnc's Makefile specifies some CFLAGS and CPPFLAGS value, but it may
|
||||
be needed to pass additional custom flags on the make command line. To
|
||||
make this possible, we switch from a plain += operator to the
|
||||
"override ... +=" operator.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
|
||||
Makefile | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index e80ef17..7ac225a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -62,9 +62,9 @@ RELEASE_VERSION := $(shell cat VERSION)
|
||||
|
||||
CC ?= gcc
|
||||
CFLAGS ?= -O3 -g
|
||||
-CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
|
||||
-CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS)
|
||||
-CPPFLAGS += -DVERSION=\"$(VERSION)\"
|
||||
+override CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
|
||||
+override CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS)
|
||||
+override CPPFLAGS += -DVERSION=\"$(VERSION)\"
|
||||
LDFLAGS ?= -g
|
||||
LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)
|
||||
|
||||
@@ -73,7 +73,7 @@ LIBS += -lnsl -lresolv -lsocket
|
||||
endif
|
||||
ifneq (,$(findstring Apple,$(shell $(CC) --version)))
|
||||
# enabled in FSF GCC, disabled by default in Apple GCC
|
||||
-CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock
|
||||
+override CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock
|
||||
endif
|
||||
|
||||
all : $(BINS) vpnc.8
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -rdup vpnc-0.5.1.oorig/config.c vpnc-0.5.1/config.c
|
||||
--- vpnc-0.5.1.oorig/config.c 2007-09-10 22:39:48.000000000 +0200
|
||||
+++ vpnc-0.5.1/config.c 2007-09-19 14:19:46.000000000 +0200
|
||||
@@ -538,7 +538,7 @@ static char *get_config_filename(const c
|
||||
{
|
||||
char *realname;
|
||||
|
||||
- asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
|
||||
+ asprintf(&realname, "%s%s%s", strchr(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
|
||||
return realname;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
From 3c16d0b7bf809a56affd6e1a4c0998027968b91a Mon Sep 17 00:00:00 2001
|
||||
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
|
||||
Date: Mon, 8 Feb 2016 23:03:48 +0100
|
||||
Subject: [PATCH] Makefile: provide an option to not build manpages
|
||||
|
||||
The process of generating the vpnc.8 man page consists in running the
|
||||
vpnc tool itself, and parse its --long-help output. While this is
|
||||
perfectly fine when building natively, it fails completely when
|
||||
cross-compiling: the vpnc binary that was built cannot be executed on
|
||||
the build machine.
|
||||
|
||||
In order to support such situations with minimal changes, this patch
|
||||
adjusts the Makefile to make it understand a MANS variable. By
|
||||
default, it's defined to "vpnc.8", which means the manpage continues
|
||||
to be built as usual. However, if it's overriden to be empty, then no
|
||||
manpage is built.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
|
||||
Makefile | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7ac225a..ea2cd41 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -54,6 +54,7 @@ endif
|
||||
SRCS = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c decrypt-utils.c crypto.c $(CRYPTO_SRCS)
|
||||
BINS = vpnc cisco-decrypt test-crypto
|
||||
OBJS = $(addsuffix .o,$(basename $(SRCS)))
|
||||
+MANS ?= vpnc.8
|
||||
CRYPTO_OBJS = $(addsuffix .o,$(basename $(CRYPTO_SRCS)))
|
||||
BINOBJS = $(addsuffix .o,$(BINS))
|
||||
BINSRCS = $(addsuffix .c,$(BINS))
|
||||
@@ -76,7 +77,7 @@ ifneq (,$(findstring Apple,$(shell $(CC) --version)))
|
||||
override CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock
|
||||
endif
|
||||
|
||||
-all : $(BINS) vpnc.8
|
||||
+all : $(BINS) $(MANS)
|
||||
|
||||
vpnc : $(OBJS) vpnc.o
|
||||
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||
@@ -136,7 +137,9 @@ install-common: all
|
||||
install -m600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
|
||||
install -m755 vpnc-disconnect $(DESTDIR)$(SBINDIR)
|
||||
install -m755 pcf2vpnc $(DESTDIR)$(BINDIR)
|
||||
+ifneq ($(MANS),)
|
||||
install -m644 vpnc.8 $(DESTDIR)$(MANDIR)/man8
|
||||
+endif
|
||||
install -m644 pcf2vpnc.1 $(DESTDIR)$(MANDIR)/man1
|
||||
install -m644 cisco-decrypt.1 $(DESTDIR)$(MANDIR)/man1
|
||||
install -m644 COPYING $(DESTDIR)$(DOCDIR)
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 6180ca780e3a792bd632d8899c2b35991822c93d Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Mon, 8 Feb 2016 23:32:57 +0100
|
||||
Subject: [PATCH] Makefile: allow passing a custom path to libgcrypt-config
|
||||
|
||||
The libgcrypt-config program may not be in the PATH, so this patch
|
||||
adjusts the Makefile so that it understands a LIBGCRYPT_CONFIG
|
||||
variable. By default, its value is libgcrypt-config so that the
|
||||
behavior is unchanged.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
|
||||
Makefile | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index ea2cd41..649ddfb 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -61,13 +61,14 @@ BINSRCS = $(addsuffix .c,$(BINS))
|
||||
VERSION ?= $(shell sh mk-version)
|
||||
RELEASE_VERSION := $(shell cat VERSION)
|
||||
|
||||
+LIBGCRYPT_CONFIG ?= libgcrypt-config
|
||||
CC ?= gcc
|
||||
CFLAGS ?= -O3 -g
|
||||
override CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
|
||||
-override CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS)
|
||||
+override CFLAGS += $(shell $(LIBGCRYPT_CONFIG) --cflags) $(CRYPTO_CFLAGS)
|
||||
override CPPFLAGS += -DVERSION=\"$(VERSION)\"
|
||||
LDFLAGS ?= -g
|
||||
-LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)
|
||||
+LIBS += $(shell $(LIBGCRYPT_CONFIG) --libs) $(CRYPTO_LDADD)
|
||||
|
||||
ifeq ($(shell uname -s), SunOS)
|
||||
LIBS += -lnsl -lresolv -lsocket
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 627a45d88acf236cb36326919e4a2fa975c688bd Mon Sep 17 00:00:00 2001
|
||||
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
||||
Date: Mon, 8 Feb 2016 23:05:23 +0100
|
||||
Subject: [PATCH] config.c: Replace deprecated SUSv3 functions with POSIX
|
||||
equivalents
|
||||
|
||||
Replace the deprecated SUSv3 function index() by its POSIX equivalent
|
||||
strchr(). This is necessary to successfully build vpnc with uClibc,
|
||||
when SUSv3 compatibility functions are not compiled in.
|
||||
|
||||
Patch originally from Bernhard Reutner-Fischer
|
||||
<rep.dot.nop@gmail.com>.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
|
||||
config.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/config.c b/config.c
|
||||
index 57778e3..11b363b 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -657,8 +657,7 @@ static const struct config_names_s {
|
||||
static char *get_config_filename(const char *name, int add_dot_conf)
|
||||
{
|
||||
char *realname;
|
||||
-
|
||||
- asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
|
||||
+ asprintf(&realname, "%s%s%s", strchr(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
|
||||
return realname;
|
||||
}
|
||||
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
From 7f41ef32c8c887ee23ca83da4dfd7a4f27e01186 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Wed, 10 Feb 2016 23:09:51 +0100
|
||||
Subject: [PATCH] sysdep.h: don't assume <error.h> is available on all Linux
|
||||
platforms
|
||||
|
||||
The current logic in sysdep.h assumes that whenever you have __linux__
|
||||
or __GLIBC__ defined, then <error.h> functionality is
|
||||
available. However, the <error.h> functionality is a glibc-ism, not
|
||||
available in more standard-conformant C libraries such as the musl C
|
||||
library. With musl, __linux__ is defined (but of course not
|
||||
__GLIBC__). With the current logic, sysdep.h assumes that <error.h> is
|
||||
available, which isn't the case.
|
||||
|
||||
This patch therefore changes the logic to only use <error.h> when
|
||||
__GLIBC__ is defined. It fixes the following build error:
|
||||
|
||||
In file included from tunip.c:87:0:
|
||||
sysdep.h:41:19: fatal error: error.h: No such file or directory
|
||||
#include <error.h>
|
||||
|
||||
Original patch from
|
||||
http://git.alpinelinux.org/cgit/aports/tree/testing/vpnc/working.patch.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
sysdep.h | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sysdep.h b/sysdep.h
|
||||
index 137bf6d..fb65b31 100644
|
||||
--- a/sysdep.h
|
||||
+++ b/sysdep.h
|
||||
@@ -38,11 +38,14 @@ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr);
|
||||
|
||||
/***************************************************************************/
|
||||
#if defined(__linux__) || defined(__GLIBC__)
|
||||
+
|
||||
+#ifdef __GLIBC__
|
||||
#include <error.h>
|
||||
+#define HAVE_ERROR 1
|
||||
+#endif
|
||||
|
||||
#define HAVE_VASPRINTF 1
|
||||
#define HAVE_ASPRINTF 1
|
||||
-#define HAVE_ERROR 1
|
||||
#define HAVE_UNSETENV 1
|
||||
#define HAVE_SETENV 1
|
||||
#endif
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
From 2e2eab070384834036c1458c669070ed17d81dbe Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Wed, 10 Feb 2016 23:15:36 +0100
|
||||
Subject: [PATCH] sysdep.c: don't include <linux/if_tun.h> on Linux
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Including <linux/if_tun.h> in sysdep.c is not necessary since sysdep.h
|
||||
already includes <netinet/if_ether.h>. And this is actually
|
||||
potentially harmful since both files redefine the same 'struct
|
||||
ethhdr', causing the following build failure with the musl C library:
|
||||
|
||||
In file included from sysdep.h:28:0,
|
||||
from sysdep.c:71:
|
||||
.../buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/netinet/if_ether.h:96:8: error: redefinition of ‘struct ethhdr’
|
||||
struct ethhdr {
|
||||
^
|
||||
In file included from .../buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/if_tun.h:20:0,
|
||||
from sysdep.c:62:
|
||||
.../buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/if_ether.h:138:8: note: originally defined here
|
||||
struct ethhdr {
|
||||
^
|
||||
|
||||
Original patch from:
|
||||
http://git.alpinelinux.org/cgit/aports/tree/testing/vpnc/working.patch
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
sysdep.c | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sysdep.c b/sysdep.c
|
||||
index d8f181d..f83543d 100644
|
||||
--- a/sysdep.c
|
||||
+++ b/sysdep.c
|
||||
@@ -58,13 +58,11 @@
|
||||
|
||||
#if defined(__DragonFly__)
|
||||
#include <net/tun/if_tun.h>
|
||||
-#elif defined(__linux__)
|
||||
-#include <linux/if_tun.h>
|
||||
#elif defined(__APPLE__)
|
||||
/* no header for tun */
|
||||
#elif defined(__CYGWIN__)
|
||||
#include "tap-win32.h"
|
||||
-#else
|
||||
+#elif !defined(__linux__)
|
||||
#include <net/if_tun.h>
|
||||
#endif
|
||||
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 17277915af703a4767de791916621d8f59aef516 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Wed, 10 Feb 2016 23:21:26 +0100
|
||||
Subject: [PATCH] config.c: add missing <sys/ttydefaults.h> include
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This include is needed to get the definition of CEOT, otherwise the
|
||||
build fails with:
|
||||
|
||||
config.c: In function ‘vpnc_getline’:
|
||||
config.c:145:25: error: ‘CEOT’ undeclared (first use in this function)
|
||||
if (llen == 0 && c == CEOT)
|
||||
^
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
config.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/config.c b/config.c
|
||||
index 11b363b..f47a534 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/wait.h>
|
||||
+#include <sys/ttydefaults.h>
|
||||
|
||||
#include <gcrypt.h>
|
||||
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
config BR2_PACKAGE_VPNC
|
||||
bool "vpnc"
|
||||
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_USE_WCHAR # gnutls
|
||||
select BR2_PACKAGE_LIBGCRYPT
|
||||
select BR2_PACKAGE_LIBGPG_ERROR
|
||||
select BR2_PACKAGE_GNUTLS
|
||||
help
|
||||
Client for Cisco VPN concentrator
|
||||
3000 Series VPN Concentrator
|
||||
@@ -11,3 +14,7 @@ config BR2_PACKAGE_VPNC
|
||||
Juniper/Netscreen
|
||||
|
||||
http://www.unix-ag.uni-kl.de/~massar/vpnc
|
||||
|
||||
comment "vpnc needs a toolchain w/ wchar"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# locally computed hash
|
||||
sha256 46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884 vpnc-0.5.3.tar.gz
|
||||
sha256 c10a5c2c0813198ca2404dd36db380cdb6395b46338123b341775095cf61521d vpnc-b1243d29e0c00312ead038b04a2cf5e2fa31d740.tar.gz
|
||||
|
||||
@@ -4,24 +4,23 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
VPNC_VERSION = 0.5.3
|
||||
VPNC_SITE = http://www.unix-ag.uni-kl.de/~massar/vpnc
|
||||
VPNC_VERSION = b1243d29e0c00312ead038b04a2cf5e2fa31d740
|
||||
VPNC_SITE = $(call github,ndpgroup,vpnc,$(VPNC_VERSION))
|
||||
VPNC_LICENSE = GPLv2+
|
||||
VPNC_LICENSE_FILES = COPYING
|
||||
|
||||
VPNC_DEPENDENCIES = libgcrypt libgpg-error
|
||||
|
||||
VPNC_LDFLAGS = $(TARGET_LDFLAGS) -lgcrypt -lgpg-error
|
||||
VPNC_CPPFLAGS = -DVERSION=\\\"$(VPNC_VERSION)\\\"
|
||||
VPNC_DEPENDENCIES = libgcrypt libgpg-error gnutls host-pkgconf
|
||||
|
||||
define VPNC_BUILD_CMDS
|
||||
$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
|
||||
CPPFLAGS="$(VPNC_CPPFLAGS)" LDFLAGS="$(VPNC_LDFLAGS)"
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
|
||||
VERSION=$(VPNC_VERSION) MANS=
|
||||
endef
|
||||
|
||||
define VPNC_INSTALL_TARGET_CMDS
|
||||
$(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) \
|
||||
CPPFLAGS="$(VPNC_CPPFLAGS)" LDFLAGS="$(VPNC_LDFLAGS)" \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) \
|
||||
VERSION=$(VPNC_VERSION) MANS= \
|
||||
DESTDIR="$(TARGET_DIR)" PREFIX=/usr
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user