* [Buildroot] svn commit: trunk/buildroot/package/vpnc
@ 2009-01-14 23:50 ulf at uclibc.org
2009-01-15 8:53 ` Peter Korsgaard
0 siblings, 1 reply; 10+ messages in thread
From: ulf at uclibc.org @ 2009-01-14 23:50 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-14 23:50:44 +0000 (Wed, 14 Jan 2009)
New Revision: 24848
Log:
Bump vpnc version and remove build of man pages, which breaks when cross compiling
Added:
trunk/buildroot/package/vpnc/vpnc-0.5.3-nomanual.patch
trunk/buildroot/package/vpnc/vpnc-0.5.3-susv3-legacy.patch
Modified:
trunk/buildroot/package/vpnc/vpnc.mk
Changeset:
Added: trunk/buildroot/package/vpnc/vpnc-0.5.3-nomanual.patch
===================================================================
--- trunk/buildroot/package/vpnc/vpnc-0.5.3-nomanual.patch (rev 0)
+++ trunk/buildroot/package/vpnc/vpnc-0.5.3-nomanual.patch 2009-01-14 23:50:44 UTC (rev 24848)
@@ -0,0 +1,15 @@
+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 $@
Added: trunk/buildroot/package/vpnc/vpnc-0.5.3-susv3-legacy.patch
===================================================================
--- trunk/buildroot/package/vpnc/vpnc-0.5.3-susv3-legacy.patch (rev 0)
+++ trunk/buildroot/package/vpnc/vpnc-0.5.3-susv3-legacy.patch 2009-01-14 23:50:44 UTC (rev 24848)
@@ -0,0 +1,12 @@
+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;
+ }
+
Modified: trunk/buildroot/package/vpnc/vpnc.mk
===================================================================
--- trunk/buildroot/package/vpnc/vpnc.mk 2009-01-14 23:49:24 UTC (rev 24847)
+++ trunk/buildroot/package/vpnc/vpnc.mk 2009-01-14 23:50:44 UTC (rev 24848)
@@ -4,7 +4,7 @@
#
#############################################################
-VPNC_VERSION=0.5.1
+VPNC_VERSION=0.5.3
VPNC_SOURCE=vpnc-$(VPNC_VERSION).tar.gz
VPNC_SITE=http://www.unix-ag.uni-kl.de/~massar/vpnc
VPNC_DIR=$(BUILD_DIR)/vpnc-$(VPNC_VERSION)
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/vpnc
@ 2008-08-04 19:08 jacmet at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: jacmet at uclibc.org @ 2008-08-04 19:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-04 12:08:12 -0700 (Mon, 04 Aug 2008)
New Revision: 23034
Log:
vpnc: select libgcrypt / libgpg_error
Modified:
trunk/buildroot/package/vpnc/Config.in
Changeset:
Modified: trunk/buildroot/package/vpnc/Config.in
===================================================================
--- trunk/buildroot/package/vpnc/Config.in 2008-08-04 19:08:09 UTC (rev 23033)
+++ trunk/buildroot/package/vpnc/Config.in 2008-08-04 19:08:12 UTC (rev 23034)
@@ -1,7 +1,7 @@
config BR2_PACKAGE_VPNC
bool "vpnc"
- depends on BR2_PACKAGE_LIBGCRYPT
- depends on BR2_PACKAGE_LIBGPG_ERROR
+ select BR2_PACKAGE_LIBGCRYPT
+ select BR2_PACKAGE_LIBGPG_ERROR
help
Client for Cisco VPN concentrator
3000 Series VPN Concentrator
@@ -10,6 +10,3 @@
Juniper/Netscreen
http://www.unix-ag.uni-kl.de/~massar/vpnc
-
-comment "vpnc - disabled (requires libgcrypt and libgpg_error)"
- depends on !BR2_PACKAGE_LIBGCRYPT || !BR2_PACKAGE_LIBGPG_ERROR
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/vpnc
@ 2007-11-29 13:00 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-11-29 13:00 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-29 05:00:53 -0800 (Thu, 29 Nov 2007)
New Revision: 20580
Log:
Make vpnc depend on packets, instead of selecting them
Modified:
trunk/buildroot/package/vpnc/Config.in
Changeset:
Modified: trunk/buildroot/package/vpnc/Config.in
===================================================================
--- trunk/buildroot/package/vpnc/Config.in 2007-11-29 09:43:36 UTC (rev 20579)
+++ trunk/buildroot/package/vpnc/Config.in 2007-11-29 13:00:53 UTC (rev 20580)
@@ -1,7 +1,7 @@
config BR2_PACKAGE_VPNC
bool "vpnc"
- select BR2_PACKAGE_LIBGCRYPT
- select BR2_PACKAGE_LIBGPG_ERROR
+ depends BR2_PACKAGE_LIBGCRYPT
+ depends BR2_PACKAGE_LIBGPG_ERROR
default n
help
Client for Cisco VPN concentrator
@@ -12,3 +12,5 @@
http://www.unix-ag.uni-kl.de/~massar/vpnc
+comment "vpnc - disabled (requires libgcrypt and libgpg_error)"
+ depends !BR2_PACKAGE_LIBGCRYPT || !BR2_PACKAGE_LIBGPG_ERROR
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/vpnc
@ 2007-09-20 17:08 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-09-20 17:08 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-20 10:08:46 -0700 (Thu, 20 Sep 2007)
New Revision: 19917
Log:
Use correct patch name
Modified:
trunk/buildroot/package/vpnc/vpnc.mk
Changeset:
Modified: trunk/buildroot/package/vpnc/vpnc.mk
===================================================================
--- trunk/buildroot/package/vpnc/vpnc.mk 2007-09-20 16:58:35 UTC (rev 19916)
+++ trunk/buildroot/package/vpnc/vpnc.mk 2007-09-20 17:08:46 UTC (rev 19917)
@@ -19,7 +19,7 @@
$(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE)
$(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc \*$(VPNC_VERSION).patch
+ toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc vpnc-$(VPNC_VERSION)\*.patch
touch $@
$(VPNC_BINARY): $(VPNC_DIR)/.unpacked
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/vpnc
@ 2007-09-19 12:28 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-09-19 12:28 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-19 05:28:48 -0700 (Wed, 19 Sep 2007)
New Revision: 19890
Log:
- bump version.
Someone will have to fix the install thing (involves a file with .pl where my sh says 'line 18: use: command not found', which is a good thing).
Modified:
trunk/buildroot/package/vpnc/vpnc.mk
Changeset:
Modified: trunk/buildroot/package/vpnc/vpnc.mk
===================================================================
--- trunk/buildroot/package/vpnc/vpnc.mk 2007-09-19 12:24:07 UTC (rev 19889)
+++ trunk/buildroot/package/vpnc/vpnc.mk 2007-09-19 12:28:48 UTC (rev 19890)
@@ -4,7 +4,7 @@
#
#############################################################
-VPNC_VERSION=0.4.0
+VPNC_VERSION=0.5.1
VPNC_SOURCE=vpnc-$(VPNC_VERSION).tar.gz
VPNC_SITE=http://www.unix-ag.uni-kl.de/~massar/vpnc
VPNC_DIR=$(BUILD_DIR)/vpnc-$(VPNC_VERSION)
@@ -19,12 +19,14 @@
$(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE)
$(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc \*.patch
+ toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc \*$(VPNC_VERSION).patch
touch $@
$(VPNC_BINARY): $(VPNC_DIR)/.unpacked
rm -f $@
$(MAKE) $(TARGET_CONFIGURE_OPTS) INCLUDE=$(STAGING_DIR)/usr/include \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS+=-lgcrypt LDFLAGS+=-lgpg-error \
CC="$(TARGET_CC)" -C $(VPNC_DIR)
$(VPNC_TARGET_BINARY): $(VPNC_BINARY)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/vpnc
@ 2007-09-19 12:24 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-09-19 12:24 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-19 05:24:07 -0700 (Wed, 19 Sep 2007)
New Revision: 19889
Log:
- do away with SUSv3 legacy functions
Added:
trunk/buildroot/package/vpnc/vpnc-0.5.1-susv3-legacy.patch
Changeset:
Added: trunk/buildroot/package/vpnc/vpnc-0.5.1-susv3-legacy.patch
===================================================================
--- trunk/buildroot/package/vpnc/vpnc-0.5.1-susv3-legacy.patch (rev 0)
+++ trunk/buildroot/package/vpnc/vpnc-0.5.1-susv3-legacy.patch 2007-09-19 12:24:07 UTC (rev 19889)
@@ -0,0 +1,12 @@
+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;
+ }
+
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/vpnc
@ 2007-09-19 10:31 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-09-19 10:31 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-19 03:31:14 -0700 (Wed, 19 Sep 2007)
New Revision: 19887
Log:
- put back accidentally removed patch that is not needed for 0.5.1 anymore
Added:
trunk/buildroot/package/vpnc/vpnc-0.4.0.patch
Changeset:
Added: trunk/buildroot/package/vpnc/vpnc-0.4.0.patch
===================================================================
--- trunk/buildroot/package/vpnc/vpnc-0.4.0.patch (rev 0)
+++ trunk/buildroot/package/vpnc/vpnc-0.4.0.patch 2007-09-19 10:31:14 UTC (rev 19887)
@@ -0,0 +1,12 @@
+diff -urN vpnc-0.4.0-0rig/Makefile vpnc-0.4.0/Makefile
+--- vpnc-0.4.0-0rig/Makefile 2007-02-19 21:51:12.000000000 +0100
++++ vpnc-0.4.0/Makefile 2007-07-17 19:59:53.000000000 +0200
+@@ -35,7 +35,7 @@
+ 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$(INCLUDE)
+ CPPFLAGS = -DVERSION=\"$(VERSION)\"
+ LDFLAGS = -g $(shell libgcrypt-config --libs)
+ CFLAGS += $(shell libgcrypt-config --cflags)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/vpnc
@ 2007-09-19 10:30 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-09-19 10:30 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-19 03:30:02 -0700 (Wed, 19 Sep 2007)
New Revision: 19886
Log:
- add missing dependency on libgcrypt
Ulf, this should be updated to 0.5.1
Removed:
trunk/buildroot/package/vpnc/vpnc-0.4.0.patch
Modified:
trunk/buildroot/package/vpnc/vpnc.mk
Changeset:
Deleted: trunk/buildroot/package/vpnc/vpnc-0.4.0.patch
===================================================================
--- trunk/buildroot/package/vpnc/vpnc-0.4.0.patch 2007-09-19 10:26:39 UTC (rev 19885)
+++ trunk/buildroot/package/vpnc/vpnc-0.4.0.patch 2007-09-19 10:30:02 UTC (rev 19886)
@@ -1,12 +0,0 @@
-diff -urN vpnc-0.4.0-0rig/Makefile vpnc-0.4.0/Makefile
---- vpnc-0.4.0-0rig/Makefile 2007-02-19 21:51:12.000000000 +0100
-+++ vpnc-0.4.0/Makefile 2007-07-17 19:59:53.000000000 +0200
-@@ -35,7 +35,7 @@
- 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$(INCLUDE)
- CPPFLAGS = -DVERSION=\"$(VERSION)\"
- LDFLAGS = -g $(shell libgcrypt-config --libs)
- CFLAGS += $(shell libgcrypt-config --cflags)
Modified: trunk/buildroot/package/vpnc/vpnc.mk
===================================================================
--- trunk/buildroot/package/vpnc/vpnc.mk 2007-09-19 10:26:39 UTC (rev 19885)
+++ trunk/buildroot/package/vpnc/vpnc.mk 2007-09-19 10:30:02 UTC (rev 19886)
@@ -20,15 +20,12 @@
$(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE)
$(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc \*.patch
- touch $(VPNC_DIR)/.unpacked
+ touch $@
-$(VPNC_DIR)/.configured: $(VPNC_DIR)/.unpacked
- touch $(VPNC_DIR)/.configured
-
-$(VPNC_BINARY): $(VPNC_DIR)/.configured
+$(VPNC_BINARY): $(VPNC_DIR)/.unpacked
rm -f $@
$(MAKE) $(TARGET_CONFIGURE_OPTS) INCLUDE=$(STAGING_DIR)/usr/include \
- CC=$(TARGET_CC) -C $(VPNC_DIR)
+ CC="$(TARGET_CC)" -C $(VPNC_DIR)
$(VPNC_TARGET_BINARY): $(VPNC_BINARY)
$(MAKE) $(TARGET_CONFIGURE_OPTS) \
@@ -39,18 +36,16 @@
MANDIR=/usr/share/man \
VERSION=$(VPNC_VERSION) \
INCLUDE=$(STAGING_DIR)/usr/include \
- LDFLAGS="-g -lgcrypt -lgpg-error" \
+ LDFLAGS="-lgcrypt -lgpg-error" \
-C $(VPNC_DIR) install
$(STRIP) $(STRIP_STRIP_UNNEEDED) $(VPNC_TARGET_BINARY)
-vpnc: uclibc $(VPNC_TARGET_BINARY)
+vpnc: uclibc libgcrypt $(VPNC_TARGET_BINARY)
vpnc-source: $(DL_DIR)/$(VPNC_SOURCE)
vpnc-clean:
- @if [ -d $(VPNC_DIR)/Makefile ]; then \
- $(MAKE) -C $(VPNC_DIR) clean; \
- fi
+ -$(MAKE) -C $(VPNC_DIR) clean
rm -f $(STAGING_DIR)/usr/bin/vpnc
vpnc-dirclean:
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/vpnc
@ 2007-07-17 19:16 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-07-17 19:16 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-17 12:16:32 -0700 (Tue, 17 Jul 2007)
New Revision: 19143
Log:
vpnc needs an include dir
Added:
trunk/buildroot/package/vpnc/vpnc-0.4.0.patch
Changeset:
Added: trunk/buildroot/package/vpnc/vpnc-0.4.0.patch
===================================================================
--- trunk/buildroot/package/vpnc/vpnc-0.4.0.patch (rev 0)
+++ trunk/buildroot/package/vpnc/vpnc-0.4.0.patch 2007-07-17 19:16:32 UTC (rev 19143)
@@ -0,0 +1,12 @@
+diff -urN vpnc-0.4.0-0rig/Makefile vpnc-0.4.0/Makefile
+--- vpnc-0.4.0-0rig/Makefile 2007-02-19 21:51:12.000000000 +0100
++++ vpnc-0.4.0/Makefile 2007-07-17 19:59:53.000000000 +0200
+@@ -35,7 +35,7 @@
+ 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$(INCLUDE)
+ CPPFLAGS = -DVERSION=\"$(VERSION)\"
+ LDFLAGS = -g $(shell libgcrypt-config --libs)
+ CFLAGS += $(shell libgcrypt-config --cflags)
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2009-01-15 8:53 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-14 23:50 [Buildroot] svn commit: trunk/buildroot/package/vpnc ulf at uclibc.org
2009-01-15 8:53 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2008-08-04 19:08 jacmet at uclibc.org
2007-11-29 13:00 ulf at uclibc.org
2007-09-20 17:08 ulf at uclibc.org
2007-09-19 12:28 aldot at uclibc.org
2007-09-19 12:24 aldot at uclibc.org
2007-09-19 10:31 aldot at uclibc.org
2007-09-19 10:30 aldot at uclibc.org
2007-07-17 19:16 ulf at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox