diff options
Diffstat (limited to 'package/vpnc/patches')
| -rw-r--r-- | package/vpnc/patches/patch-Makefile | 65 | ||||
| -rw-r--r-- | package/vpnc/patches/patch-config_c | 7 |
2 files changed, 21 insertions, 51 deletions
diff --git a/package/vpnc/patches/patch-Makefile b/package/vpnc/patches/patch-Makefile index bb3a255a3..563b653c2 100644 --- a/package/vpnc/patches/patch-Makefile +++ b/package/vpnc/patches/patch-Makefile @@ -1,51 +1,22 @@ -$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 +--- vpnc-0.5.3.orig/Makefile 2008-11-19 21:36:12.000000000 +0100 ++++ vpnc-0.5.3/Makefile 2010-02-06 04:36:54.194334252 +0100 +@@ -66,7 +66,7 @@ ifneq (,$(findstring Apple,$(shell $(CC) + CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock 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 +-all : $(BINS) vpnc.8 vpnc-script ++all : $(BINS) vpnc-script - 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 + vpnc : $(OBJS) vpnc.o + $(CC) -o $@ $^ $(LDFLAGS) +@@ -122,10 +122,6 @@ install-common: all + install -m600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf + install -m755 vpnc-disconnect $(DESTDIR)$(SBINDIR) + install -m755 pcf2vpnc $(DESTDIR)$(BINDIR) +- install -m644 vpnc.8 $(DESTDIR)$(MANDIR)/man8 +- install -m644 pcf2vpnc.1 $(DESTDIR)$(MANDIR)/man1 +- install -m644 cisco-decrypt.1 $(DESTDIR)$(MANDIR)/man1 +- install -m644 COPYING $(DESTDIR)$(DOCDIR) - uninstall : - rm -f $(DESTDIR)$(SBINDIR)/vpnc \ + install : install-common + install -m755 vpnc $(DESTDIR)$(SBINDIR) diff --git a/package/vpnc/patches/patch-config_c b/package/vpnc/patches/patch-config_c index ce5cb30e9..9dfbdee43 100644 --- a/package/vpnc/patches/patch-config_c +++ b/package/vpnc/patches/patch-config_c @@ -1,7 +1,6 @@ -$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 +--- vpnc-0.5.3.orig/config.c 2008-11-19 21:36:12.000000000 +0100 ++++ vpnc-0.5.3/config.c 2010-02-06 04:35:05.394334473 +0100 +@@ -456,7 +456,7 @@ static char *get_config_filename(const c { char *realname; |