mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
vpnc: update to maintained github fork
The SVN-based version has not changed in years. Many distros use this fork as evident here: https://github.com/streambinder/vpnc/issues/14 Compile tested against GnuTLS and OpenSSL on ramips target. Fixes #14119. Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
This commit is contained in:
@@ -1,42 +0,0 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -20,7 +20,7 @@
|
||||
# $Id: Makefile 539 2013-12-04 13:41:04Z Antonio Borneo $
|
||||
|
||||
DESTDIR=
|
||||
-PREFIX=/usr/local
|
||||
+PREFIX=/usr
|
||||
ETCDIR=/etc/vpnc
|
||||
BINDIR=$(PREFIX)/bin
|
||||
SBINDIR=$(PREFIX)/sbin
|
||||
@@ -57,18 +57,15 @@ 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)
|
||||
RELEASE_VERSION := $(shell cat VERSION)
|
||||
|
||||
CC ?= gcc
|
||||
-CFLAGS ?= -O3 -g
|
||||
CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
|
||||
-CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS)
|
||||
+CFLAGS += -O3 -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) $(CRYPTO_CFLAGS)
|
||||
CPPFLAGS += -DVERSION=\"$(VERSION)\"
|
||||
-LDFLAGS ?= -g
|
||||
-LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)
|
||||
+LIBS += -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error $(CRYPTO_LDADD)
|
||||
|
||||
-ifeq ($(shell uname -s), SunOS)
|
||||
+ifeq ($(OS), SunOS)
|
||||
LIBS += -lnsl -lresolv -lsocket
|
||||
endif
|
||||
ifneq (,$(findstring Apple,$(shell $(CC) --version)))
|
||||
@@ -82,7 +79,7 @@ vpnc : $(OBJS) vpnc.o
|
||||
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||
|
||||
vpnc.8 : vpnc.8.template makeman.pl vpnc
|
||||
- ./makeman.pl
|
||||
+ touch vpnc.8
|
||||
|
||||
cisco-decrypt : cisco-decrypt.o decrypt-utils.o
|
||||
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||
@@ -1,42 +0,0 @@
|
||||
--- a/sysdep.h
|
||||
+++ b/sysdep.h
|
||||
@@ -37,12 +37,14 @@ int tun_read(int fd, unsigned char *buf,
|
||||
int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr);
|
||||
|
||||
/***************************************************************************/
|
||||
-#if defined(__linux__) || defined(__GLIBC__)
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
#include <error.h>
|
||||
+#define HAVE_ERROR 1
|
||||
+#endif
|
||||
|
||||
+#if defined(__linux__) || defined(__GLIBC__)
|
||||
#define HAVE_VASPRINTF 1
|
||||
#define HAVE_ASPRINTF 1
|
||||
-#define HAVE_ERROR 1
|
||||
#define HAVE_UNSETENV 1
|
||||
#define HAVE_SETENV 1
|
||||
#endif
|
||||
--- a/sysdep.c
|
||||
+++ b/sysdep.c
|
||||
@@ -59,6 +59,10 @@
|
||||
#if defined(__DragonFly__)
|
||||
#include <net/tun/if_tun.h>
|
||||
#elif defined(__linux__)
|
||||
+# if !defined(__GLIBC__) && !defined(__UCLIBC__)
|
||||
+# define _LINUX_IF_ETHER_H
|
||||
+# include <net/ethernet.h>
|
||||
+# endif
|
||||
#include <linux/if_tun.h>
|
||||
#elif defined(__APPLE__)
|
||||
/* no header for tun */
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
+#include <sys/ttydefaults.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/wait.h>
|
||||
@@ -1,5 +1,5 @@
|
||||
--- a/crypto-openssl.c
|
||||
+++ b/crypto-openssl.c
|
||||
--- a/src/crypto-openssl.c
|
||||
+++ b/src/crypto-openssl.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
Reference in New Issue
Block a user