diff options
| author | wbx <wbx@hydrogenium.(none)> | 2009-05-17 14:41:34 +0200 |
|---|---|---|
| committer | wbx <wbx@hydrogenium.(none)> | 2009-05-17 14:41:34 +0200 |
| commit | 219a6dab8995aad9ac4860cc1a84d6f3509a03a4 (patch) | |
| tree | b9c0f3c43aebba2fcfef777592d0add39f2072f4 /package/vpnc/patches | |
Initial import
Diffstat (limited to 'package/vpnc/patches')
| -rw-r--r-- | package/vpnc/patches/patch-Makefile | 51 | ||||
| -rw-r--r-- | package/vpnc/patches/patch-config_c | 12 |
2 files changed, 63 insertions, 0 deletions
diff --git a/package/vpnc/patches/patch-Makefile b/package/vpnc/patches/patch-Makefile new file mode 100644 index 000000000..bb3a255a3 --- /dev/null +++ b/package/vpnc/patches/patch-Makefile @@ -0,0 +1,51 @@ +$Id$ +--- vpnc-0.4.0.orig/Makefile 2007-02-19 21:51:12.000000000 +0100 ++++ vpnc-0.4.0/Makefile 2007-04-21 18:39:46.000000000 +0200 +@@ -35,12 +35,11 @@ VERSION := $(shell sh mk-version) + RELEASE_VERSION := $(shell cat VERSION) + + CC=gcc +-CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g ++CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) + CPPFLAGS = -DVERSION=\"$(VERSION)\" +-LDFLAGS = -g $(shell libgcrypt-config --libs) +-CFLAGS += $(shell libgcrypt-config --cflags) ++LDFLAGS = -g -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error + +-ifeq ($(shell uname -s), SunOS) ++ifeq ($(OS), SunOS) + LDFLAGS += -lnsl -lresolv -lsocket + endif + +@@ -84,21 +83,21 @@ distclean : clean + -rm -f vpnc-debug.c vpnc-debug.h vpnc.ps .depend + + install : all +- install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man8 +- install vpnc-script $(DESTDIR)$(ETCDIR) +- install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf ++ install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR) ++# install vpnc-script $(DESTDIR)$(ETCDIR) ++# install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf + install vpnc vpnc-disconnect $(DESTDIR)$(SBINDIR) +- install pcf2vpnc $(DESTDIR)$(BINDIR) +- install vpnc.8 $(DESTDIR)$(MANDIR)/man8 ++# install pcf2vpnc $(DESTDIR)$(BINDIR) ++# install vpnc.8 $(DESTDIR)$(MANDIR)/man8 + + install-strip : all +- install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man8 +- install vpnc-script $(DESTDIR)$(ETCDIR) +- install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf +- install pcf2vpnc $(DESTDIR)$(BINDIR) ++ install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR) ++# install vpnc-script $(DESTDIR)$(ETCDIR) ++# install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf ++# install pcf2vpnc $(DESTDIR)$(BINDIR) + install -s vpnc $(DESTDIR)$(SBINDIR) + install vpnc-disconnect $(DESTDIR)$(SBINDIR) +- install vpnc.8 $(DESTDIR)$(MANDIR)/man8 ++# install vpnc.8 $(DESTDIR)$(MANDIR)/man8 + + uninstall : + rm -f $(DESTDIR)$(SBINDIR)/vpnc \ diff --git a/package/vpnc/patches/patch-config_c b/package/vpnc/patches/patch-config_c new file mode 100644 index 000000000..ce5cb30e9 --- /dev/null +++ b/package/vpnc/patches/patch-config_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- vpnc-0.4.0.orig/config.c 2007-02-16 18:22:06.000000000 +0100 ++++ vpnc-0.4.0/config.c 2008-10-16 12:55:57.000000000 +0200 +@@ -485,7 +485,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; + } + |