* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2006-11-29 20:51 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-11-29 20:51 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-29 12:51:47 -0800 (Wed, 29 Nov 2006)
New Revision: 16728
Log:
- use the correct installation path.
Modified:
trunk/buildroot/package/openswan/openswan.mk
Changeset:
Modified: trunk/buildroot/package/openswan/openswan.mk
===================================================================
--- trunk/buildroot/package/openswan/openswan.mk 2006-11-29 20:26:05 UTC (rev 16727)
+++ trunk/buildroot/package/openswan/openswan.mk 2006-11-29 20:51:47 UTC (rev 16728)
@@ -11,8 +11,8 @@
OPENSWAN_SITE:=http://www.openswan.org/download/
OPENSWAN_DIR:=$(BUILD_DIR)/openswan-$(OPENSWAN_VERSION)
OPENSWAN_CAT:=$(ZCAT)
-OPENSWAN_BINARY:=openswan
-OPENSWAN_TARGET_BINARY:=usr/sbin/openswan
+OPENSWAN_BINARY:=programs/pluto/pluto
+OPENSWAN_TARGET_BINARY:=usr/sbin/ipsec
$(DL_DIR)/$(OPENSWAN_SOURCE):
$(WGET) -P $(DL_DIR) $(OPENSWAN_SITE)/$(OPENSWAN_SOURCE)
@@ -28,16 +28,16 @@
touch $(OPENSWAN_DIR)/.configured
$(OPENSWAN_DIR)/$(OPENSWAN_BINARY): $(OPENSWAN_DIR)/.configured
- echo $(LINUX_KERNEL)
+ @echo $(LINUX_KERNEL)
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(OPENSWAN_DIR) \
- KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) \
+ KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) INC_USRLOCAL=/usr \
CC=$(TARGET_CC) USERCOMPILE="-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH=$(TARGET_DIR)/usr/lib programs
$(TARGET_DIR)/$(OPENSWAN_TARGET_BINARY): $(OPENSWAN_DIR)/$(OPENSWAN_BINARY)
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(OPENSWAN_DIR) \
- KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) \
+ KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) INC_USRLOCAL=/usr \
CC=$(TARGET_CC) USERCOMPILE="-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH=$(TARGET_DIR)/usr/lib install
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2009-02-24 8:56 jacmet at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: jacmet at uclibc.org @ 2009-02-24 8:56 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-24 08:56:14 +0000 (Tue, 24 Feb 2009)
New Revision: 25435
Log:
openswan: mark as BROKEN as it doesn't build with current kernel headers
It WILL get removed after 2009.05 unless someone steps up to fix it.
Modified:
trunk/buildroot/package/openswan/Config.in
Changeset:
Modified: trunk/buildroot/package/openswan/Config.in
===================================================================
--- trunk/buildroot/package/openswan/Config.in 2009-02-24 07:20:53 UTC (rev 25434)
+++ trunk/buildroot/package/openswan/Config.in 2009-02-24 08:56:14 UTC (rev 25435)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_OPENSWAN
bool "openswan"
+ depends on BROKEN # doesn't compile with current kernel headers
select BR2_PACKAGE_LIBGMP
select BR2_PACKAGE_MICROPERL
help
^ permalink raw reply [flat|nested] 17+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2009-01-16 13:21 jacmet at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: jacmet at uclibc.org @ 2009-01-16 13:21 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-16 13:21:33 +0000 (Fri, 16 Jan 2009)
New Revision: 24876
Log:
openswan: tarball moved to old/ subdir
Modified:
trunk/buildroot/package/openswan/openswan.mk
Changeset:
Modified: trunk/buildroot/package/openswan/openswan.mk
===================================================================
--- trunk/buildroot/package/openswan/openswan.mk 2009-01-16 12:34:44 UTC (rev 24875)
+++ trunk/buildroot/package/openswan/openswan.mk 2009-01-16 13:21:33 UTC (rev 24876)
@@ -8,7 +8,7 @@
#############################################################
OPENSWAN_VERSION:=2.4.9
OPENSWAN_SOURCE:=openswan-$(OPENSWAN_VERSION).tar.gz
-OPENSWAN_SITE:=http://www.openswan.org/download/
+OPENSWAN_SITE:=http://www.openswan.org/download/old/
OPENSWAN_DIR:=$(BUILD_DIR)/openswan-$(OPENSWAN_VERSION)
OPENSWAN_CAT:=$(ZCAT)
OPENSWAN_BINARY:=programs/pluto/pluto
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2008-12-17 10:32 jacmet at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: jacmet at uclibc.org @ 2008-12-17 10:32 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-17 02:32:06 -0800 (Wed, 17 Dec 2008)
New Revision: 24438
Log:
openswan: revert $(strip ...) change (r24307) on patches
Thanks to Markus for noticing.
Modified:
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
Changeset:
/svn/hooks/commit-email.pl: `/usr/bin/svnlook diff /svn -r 24438' failed with this output:
Modified: trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
===================================================================
--- trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch 2008-12-17 09:28:33 UTC (rev 24437)
+++ trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch 2008-12-17 10:32:06 UTC (rev 24438)
@@ -9774,7 +9774,7 @@
+asm-obj-$(CONFIG_MWINCHIP3D) += match686.o
+
+obj-y += $(asm-obj-y)
-+ifneq ($(asm-obj-y),)
++ifneq ($(strip $(asm-obj-y)),)
+ EXTRA_CFLAGS += -DASMV
+endif
+
@@ -13864,12 +13864,12 @@
+++ linux/net/ipsec/alg/Makefile Mon Feb 9 13:51:03 2004
@@ -0,0 +1,112 @@
+# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp
-+ifeq ($(KLIPSMODULE),)
++ifeq ($(strip $(KLIPSMODULE)),)
+FREESWANSRCDIR=.
+else
+FREESWANSRCDIR=../../../..
+endif
-+ifeq ($(KLIPS_TOP),)
++ifeq ($(strip $(KLIPS_TOP)),)
+KLIPS_TOP=../../..
+override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include
+endif
Modified: trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
===================================================================
--- trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch 2008-12-17 09:28:33 UTC (rev 24437)
+++ trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch 2008-12-17 10:32:06 UTC (rev 24438)
@@ -9774,7 +9774,7 @@
+asm-obj-$(CONFIG_MWINCHIP3D) += match686.o
+
+obj-y += $(asm-obj-y)
-+ifneq ($(asm-obj-y),)
++ifneq ($(strip $(asm-obj-y)),)
+ EXTRA_CFLAGS += -DASMV
+endif
+
@@ -13864,12 +13864,12 @@
+++ linux/net/ipsec/alg/Makefile Mon Feb 9 13:51:03 2004
@@ -0,0 +1,112 @@
+# Makefile,v 1.1.2.1 2003/11/21 18:12:23 jjo Exp
-+ifeq ($(KLIPSMODULE),)
++ifeq ($(strip $(KLIPSMODULE)),)
+FREESWANSRCDIR=.
+else
+FREESWANSRCDIR=../../../..
+endif
-+ifeq ($(KLIPS_TOP),)
++ifeq ($(strip $(KLIPS_TOP)),)
+KLIPS_TOP=../../..
+override EXTRA_CFLAGS += -I$(KLIPS_TOP)/include
+endif
Modified: trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
===================================================================
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2007-09-19 9:20 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-09-19 9:20 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-19 02:20:04 -0700 (Wed, 19 Sep 2007)
New Revision: 19883
Log:
- add missing include
Modified:
trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
Changeset:
Modified: trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
===================================================================
--- trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch 2007-09-19 09:08:10 UTC (rev 19882)
+++ trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch 2007-09-19 09:20:04 UTC (rev 19883)
@@ -4408,7 +4408,7 @@
+
+#ifdef __KERNEL__
+#include "ipsec_kversion.h"
-+
++#include <linux/ip.h> /* struct iphdr */
+/* Set number of ipsecX virtual devices here. */
+/* This must be < exp(field width of IPSEC_DEV_FORMAT) */
+/* It must also be reasonable so as not to overload the memory and CPU */
@@ -4554,16 +4554,16 @@
+#ifdef CONFIG_KLIPS_DEBUG
+extern void ipsec_print_ip(struct iphdr *ip);
+
-+ #define KLIPS_PRINT(flag, format, args...) \
++# define KLIPS_PRINT(flag, format, args...) \
+ ((flag) ? printk(KERN_INFO format , ## args) : 0)
-+ #define KLIPS_PRINTMORE(flag, format, args...) \
++# define KLIPS_PRINTMORE(flag, format, args...) \
+ ((flag) ? printk(format , ## args) : 0)
-+ #define KLIPS_IP_PRINT(flag, ip) \
++# define KLIPS_IP_PRINT(flag, ip) \
+ ((flag) ? ipsec_print_ip(ip) : 0)
+#else /* CONFIG_KLIPS_DEBUG */
-+ #define KLIPS_PRINT(flag, format, args...) do ; while(0)
-+ #define KLIPS_PRINTMORE(flag, format, args...) do ; while(0)
-+ #define KLIPS_IP_PRINT(flag, ip) do ; while(0)
++# define KLIPS_PRINT(flag, format, args...) do ; while(0)
++# define KLIPS_PRINTMORE(flag, format, args...) do ; while(0)
++# define KLIPS_IP_PRINT(flag, ip) do ; while(0)
+#endif /* CONFIG_KLIPS_DEBUG */
+
+
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2007-09-19 8:50 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-09-19 8:50 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-19 01:50:54 -0700 (Wed, 19 Sep 2007)
New Revision: 19881
Log:
- fix args for UDP_INC_STATS_BH
Modified:
trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-natt.patch
Changeset:
Modified: trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-natt.patch
===================================================================
--- trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-natt.patch 2007-09-19 08:23:09 UTC (rev 19880)
+++ trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-natt.patch 2007-09-19 08:50:54 UTC (rev 19881)
@@ -109,9 +109,9 @@
- return -ret;
+ if(xfrm4_rcv_encap_func != NULL) {
+ ret = (*xfrm4_rcv_encap_func)(skb, up->encap_type);
-+ UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
++ UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS, up->pcflag);
+ } else {
-+ UDP_INC_STATS_BH(UDP_MIB_INERRORS);
++ UDP_INC_STATS_BH(UDP_MIB_INERRORS, up->pcflag);
+ ret = 1;
+ }
+ return ret;
^ permalink raw reply [flat|nested] 17+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2007-09-18 13:02 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-09-18 13:02 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-18 06:02:25 -0700 (Tue, 18 Sep 2007)
New Revision: 19876
Log:
- bump version to 2.4.9
Added:
trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-natt.patch
trunk/buildroot/package/openswan/openswan-2.4.9-001-oswlog.patch
trunk/buildroot/package/openswan/openswan-2.4.9-002-oswlog.patch
trunk/buildroot/package/openswan/openswan-2.4.9-003-spi.patch
trunk/buildroot/package/openswan/openswan-2.4.9-004-alloc.patch
trunk/buildroot/package/openswan/openswan-2.4.9-005-pluto.patch
trunk/buildroot/package/openswan/openswan-2.4.9-006-linux-include.patch
trunk/buildroot/package/openswan/openswan-2.4.9-010-susv3-legacy.patch
Removed:
trunk/buildroot/package/openswan/openswan-2.4.7-001-oswlog.patch
trunk/buildroot/package/openswan/openswan-2.4.7-002-oswlog.patch
trunk/buildroot/package/openswan/openswan-2.4.7-003-spi.patch
trunk/buildroot/package/openswan/openswan-2.4.7-004-alloc.patch
trunk/buildroot/package/openswan/openswan-2.4.7-005-pluto.patch
trunk/buildroot/package/openswan/openswan-2.4.7-006-linux-include.patch
trunk/buildroot/package/openswan/openswan-2.4.7-010-susv3-legacy.patch
Modified:
trunk/buildroot/package/openswan/openswan.mk
Changeset:
Sorry, the patch is too large to include (60181 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=19876
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2007-07-23 9:45 ulf at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: ulf at uclibc.org @ 2007-07-23 9:45 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-23 02:45:23 -0700 (Mon, 23 Jul 2007)
New Revision: 19211
Log:
Update openswan package with bugfixes
Added:
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-natt.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-nfmark-rename.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-zzz-crypto_alg_available.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-zzz-void-sock_unregister.patch
Changeset:
Sorry, the patch is too large to include (59595 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=19211
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2007-06-21 22:14 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-06-21 22:14 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-21 15:14:55 -0700 (Thu, 21 Jun 2007)
New Revision: 18890
Log:
- need to rename these hunks to come after the base patches
Added:
trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-zzz00-fixup.patch
Removed:
trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-fixup.patch
Changeset:
Deleted: trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-fixup.patch
===================================================================
--- trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-fixup.patch 2007-06-21 22:10:12 UTC (rev 18889)
+++ trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-fixup.patch 2007-06-21 22:14:55 UTC (rev 18890)
@@ -1,156 +0,0 @@
-diff -rduNp linux-2.6.21.5.openswan28/net/ipsec/ipsec_alg_cryptoapi.c linux-2.6.21.5/net/ipsec/ipsec_alg_cryptoapi.c
---- linux-2.6.21.5.openswan28/net/ipsec/ipsec_alg_cryptoapi.c 2007-06-21 10:44:07.000000000 +0200
-+++ linux-2.6.21.5/net/ipsec/ipsec_alg_cryptoapi.c 2007-06-21 23:34:05.000000000 +0200
-@@ -197,7 +197,7 @@ static struct ipsec_alg_capi_cipher alg_
- */
- int setup_cipher(const char *ciphername)
- {
-- return crypto_alg_available(ciphername, 0);
-+ return crypto_has_alg(ciphername, 0, CRYPTO_ALG_ASYNC);
- }
-
- /*
-@@ -272,7 +272,7 @@ static __u8 *
- _capi_new_key (struct ipsec_alg_enc *alg, const __u8 *key, size_t keylen)
- {
- struct ipsec_alg_capi_cipher *cptr;
-- struct crypto_tfm *tfm=NULL;
-+ struct crypto_cipher *tfm=NULL;
-
- cptr = alg->ixt_common.ixt_data;
- if (!cptr) {
-@@ -289,7 +289,7 @@ _capi_new_key (struct ipsec_alg_enc *alg
- /*
- * alloc tfm
- */
-- tfm = crypto_alloc_tfm(cptr->ciphername, CRYPTO_TFM_MODE_CBC);
-+ tfm = crypto_alloc_cipher(cptr->ciphername, 0, CRYPTO_ALG_ASYNC);
- if (!tfm) {
- printk(KERN_ERR "_capi_new_key(): "
- "NULL tfm for \"%s\" cryptoapi (\"%s\") algo\n"
-@@ -300,7 +300,7 @@ _capi_new_key (struct ipsec_alg_enc *alg
- printk(KERN_ERR "_capi_new_key(): "
- "failed new_key() for \"%s\" cryptoapi algo (keylen=%d)\n"
- , alg->ixt_common.ixt_name, keylen);
-- crypto_free_tfm(tfm);
-+ crypto_free_cipher(tfm);
- tfm=NULL;
- }
- err:
-@@ -317,23 +317,26 @@ err:
- static int
- _capi_cbc_encrypt(struct ipsec_alg_enc *alg, __u8 * key_e, __u8 * in, int ilen, const __u8 * iv, int encrypt) {
- int error =0;
-- struct crypto_tfm *tfm=(struct crypto_tfm *)key_e;
-+ struct crypto_blkcipher *tfm=(struct crypto_blkcipher *)key_e;
-+ struct blkcipher_desc desc;
- struct scatterlist sg = {
- .page = virt_to_page(in),
- .offset = (unsigned long)(in) % PAGE_SIZE,
- .length=ilen,
- };
-+ desc.tfm = tfm;
-+ desc.flags = 0;
- if (debug_crypto > 1)
- printk(KERN_DEBUG "klips_debug:_capi_cbc_encrypt:"
- "key_e=%p "
- "in=%p out=%p ilen=%d iv=%p encrypt=%d\n"
- , key_e
- , in, in, ilen, iv, encrypt);
-- crypto_cipher_set_iv(tfm, iv, crypto_tfm_alg_ivsize(tfm));
-+ crypto_blkcipher_set_iv(tfm, iv, crypto_blkcipher_ivsize(tfm));
- if (encrypt)
-- error = crypto_cipher_encrypt (tfm, &sg, &sg, ilen);
-+ error = crypto_blkcipher_encrypt (&desc, &sg, &sg, ilen);
- else
-- error = crypto_cipher_decrypt (tfm, &sg, &sg, ilen);
-+ error = crypto_blkcipher_decrypt (&desc, &sg, &sg, ilen);
- if (debug_crypto > 1)
- printk(KERN_DEBUG "klips_debug:_capi_cbc_encrypt:"
- "error=%d\n"
-@@ -370,8 +373,9 @@ setup_cipher_list (struct ipsec_alg_capi
- * use a local ci to avoid touching cptr->ci,
- * if register ipsec_alg success then bind cipher
- */
-- if(cptr->alg.ixt_common.ixt_support.ias_name == NULL) {
-- cptr->alg.ixt_common.ixt_support.ias_name = cptr->ciphername;
-+ if (cptr->alg.ixt_common.ixt_support.ias_name == NULL) {
-+printk(KERN_DEBUG "klips_debug: ias_name was nil\n");
-+// cptr->alg.ixt_common.ixt_support.ias_name = cptr->ciphername;
- }
-
- if( setup_cipher(cptr->ciphername) ) {
-diff -rduNp linux-2.6.21.5.openswan28/net/ipsec/sysctl_net_ipsec.c linux-2.6.21.5/net/ipsec/sysctl_net_ipsec.c
---- linux-2.6.21.5.openswan28/net/ipsec/sysctl_net_ipsec.c 2007-06-21 10:44:07.000000000 +0200
-+++ linux-2.6.21.5/net/ipsec/sysctl_net_ipsec.c 2007-06-21 22:33:51.000000000 +0200
-@@ -74,45 +74,45 @@ enum {
- static ctl_table ipsec_table[] = {
- #ifdef CONFIG_KLIPS_DEBUG
- { NET_IPSEC_DEBUG_AH, "debug_ah", &debug_ah,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_DEBUG_ESP, "debug_esp", &debug_esp,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_DEBUG_TUNNEL, "debug_tunnel", &debug_tunnel,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_DEBUG_EROUTE, "debug_eroute", &debug_eroute,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_DEBUG_SPI, "debug_spi", &debug_spi,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_DEBUG_RADIJ, "debug_radij", &debug_radij,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_DEBUG_NETLINK, "debug_netlink", &debug_netlink,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_DEBUG_XFORM, "debug_xform", &debug_xform,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_DEBUG_RCV, "debug_rcv", &debug_rcv,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_DEBUG_PFKEY, "debug_pfkey", &debug_pfkey,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_DEBUG_VERBOSE, "debug_verbose",&sysctl_ipsec_debug_verbose,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- #ifdef CONFIG_KLIPS_IPCOMP
- { NET_IPSEC_DEBUG_IPCOMP, "debug_ipcomp", &sysctl_ipsec_debug_ipcomp,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- #endif /* CONFIG_KLIPS_IPCOMP */
-
- #ifdef CONFIG_KLIPS_REGRESS
- { NET_IPSEC_REGRESS_PFKEY_LOSSAGE, "pfkey_lossage",
- &sysctl_ipsec_regress_pfkey_lossage,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- #endif /* CONFIG_KLIPS_REGRESS */
-
- #endif /* CONFIG_KLIPS_DEBUG */
- { NET_IPSEC_ICMP, "icmp", &sysctl_ipsec_icmp,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_INBOUND_POLICY_CHECK, "inbound_policy_check", &sysctl_ipsec_inbound_policy_check,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- { NET_IPSEC_TOS, "tos", &sysctl_ipsec_tos,
-- sizeof(int), 0644, NULL, &proc_dointvec},
-+ sizeof(int), 0644, &proc_dointvec},
- {0}
- };
-
-@@ -130,7 +130,7 @@ static struct ctl_table_header *ipsec_ta
-
- int ipsec_sysctl_register(void)
- {
-- ipsec_table_header = register_sysctl_table(ipsec_root_table, 0);
-+ ipsec_table_header = register_sysctl_table(ipsec_root_table);
- if (!ipsec_table_header) {
- return -ENOMEM;
- }
Copied: trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-zzz00-fixup.patch (from rev 18889, trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-fixup.patch)
===================================================================
--- trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-zzz00-fixup.patch (rev 0)
+++ trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-zzz00-fixup.patch 2007-06-21 22:14:55 UTC (rev 18890)
@@ -0,0 +1,156 @@
+diff -rduNp linux-2.6.21.5.openswan28/net/ipsec/ipsec_alg_cryptoapi.c linux-2.6.21.5/net/ipsec/ipsec_alg_cryptoapi.c
+--- linux-2.6.21.5.openswan28/net/ipsec/ipsec_alg_cryptoapi.c 2007-06-21 10:44:07.000000000 +0200
++++ linux-2.6.21.5/net/ipsec/ipsec_alg_cryptoapi.c 2007-06-21 23:34:05.000000000 +0200
+@@ -197,7 +197,7 @@ static struct ipsec_alg_capi_cipher alg_
+ */
+ int setup_cipher(const char *ciphername)
+ {
+- return crypto_alg_available(ciphername, 0);
++ return crypto_has_alg(ciphername, 0, CRYPTO_ALG_ASYNC);
+ }
+
+ /*
+@@ -272,7 +272,7 @@ static __u8 *
+ _capi_new_key (struct ipsec_alg_enc *alg, const __u8 *key, size_t keylen)
+ {
+ struct ipsec_alg_capi_cipher *cptr;
+- struct crypto_tfm *tfm=NULL;
++ struct crypto_cipher *tfm=NULL;
+
+ cptr = alg->ixt_common.ixt_data;
+ if (!cptr) {
+@@ -289,7 +289,7 @@ _capi_new_key (struct ipsec_alg_enc *alg
+ /*
+ * alloc tfm
+ */
+- tfm = crypto_alloc_tfm(cptr->ciphername, CRYPTO_TFM_MODE_CBC);
++ tfm = crypto_alloc_cipher(cptr->ciphername, 0, CRYPTO_ALG_ASYNC);
+ if (!tfm) {
+ printk(KERN_ERR "_capi_new_key(): "
+ "NULL tfm for \"%s\" cryptoapi (\"%s\") algo\n"
+@@ -300,7 +300,7 @@ _capi_new_key (struct ipsec_alg_enc *alg
+ printk(KERN_ERR "_capi_new_key(): "
+ "failed new_key() for \"%s\" cryptoapi algo (keylen=%d)\n"
+ , alg->ixt_common.ixt_name, keylen);
+- crypto_free_tfm(tfm);
++ crypto_free_cipher(tfm);
+ tfm=NULL;
+ }
+ err:
+@@ -317,23 +317,26 @@ err:
+ static int
+ _capi_cbc_encrypt(struct ipsec_alg_enc *alg, __u8 * key_e, __u8 * in, int ilen, const __u8 * iv, int encrypt) {
+ int error =0;
+- struct crypto_tfm *tfm=(struct crypto_tfm *)key_e;
++ struct crypto_blkcipher *tfm=(struct crypto_blkcipher *)key_e;
++ struct blkcipher_desc desc;
+ struct scatterlist sg = {
+ .page = virt_to_page(in),
+ .offset = (unsigned long)(in) % PAGE_SIZE,
+ .length=ilen,
+ };
++ desc.tfm = tfm;
++ desc.flags = 0;
+ if (debug_crypto > 1)
+ printk(KERN_DEBUG "klips_debug:_capi_cbc_encrypt:"
+ "key_e=%p "
+ "in=%p out=%p ilen=%d iv=%p encrypt=%d\n"
+ , key_e
+ , in, in, ilen, iv, encrypt);
+- crypto_cipher_set_iv(tfm, iv, crypto_tfm_alg_ivsize(tfm));
++ crypto_blkcipher_set_iv(tfm, iv, crypto_blkcipher_ivsize(tfm));
+ if (encrypt)
+- error = crypto_cipher_encrypt (tfm, &sg, &sg, ilen);
++ error = crypto_blkcipher_encrypt (&desc, &sg, &sg, ilen);
+ else
+- error = crypto_cipher_decrypt (tfm, &sg, &sg, ilen);
++ error = crypto_blkcipher_decrypt (&desc, &sg, &sg, ilen);
+ if (debug_crypto > 1)
+ printk(KERN_DEBUG "klips_debug:_capi_cbc_encrypt:"
+ "error=%d\n"
+@@ -370,8 +373,9 @@ setup_cipher_list (struct ipsec_alg_capi
+ * use a local ci to avoid touching cptr->ci,
+ * if register ipsec_alg success then bind cipher
+ */
+- if(cptr->alg.ixt_common.ixt_support.ias_name == NULL) {
+- cptr->alg.ixt_common.ixt_support.ias_name = cptr->ciphername;
++ if (cptr->alg.ixt_common.ixt_support.ias_name == NULL) {
++printk(KERN_DEBUG "klips_debug: ias_name was nil\n");
++// cptr->alg.ixt_common.ixt_support.ias_name = cptr->ciphername;
+ }
+
+ if( setup_cipher(cptr->ciphername) ) {
+diff -rduNp linux-2.6.21.5.openswan28/net/ipsec/sysctl_net_ipsec.c linux-2.6.21.5/net/ipsec/sysctl_net_ipsec.c
+--- linux-2.6.21.5.openswan28/net/ipsec/sysctl_net_ipsec.c 2007-06-21 10:44:07.000000000 +0200
++++ linux-2.6.21.5/net/ipsec/sysctl_net_ipsec.c 2007-06-21 22:33:51.000000000 +0200
+@@ -74,45 +74,45 @@ enum {
+ static ctl_table ipsec_table[] = {
+ #ifdef CONFIG_KLIPS_DEBUG
+ { NET_IPSEC_DEBUG_AH, "debug_ah", &debug_ah,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_DEBUG_ESP, "debug_esp", &debug_esp,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_DEBUG_TUNNEL, "debug_tunnel", &debug_tunnel,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_DEBUG_EROUTE, "debug_eroute", &debug_eroute,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_DEBUG_SPI, "debug_spi", &debug_spi,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_DEBUG_RADIJ, "debug_radij", &debug_radij,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_DEBUG_NETLINK, "debug_netlink", &debug_netlink,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_DEBUG_XFORM, "debug_xform", &debug_xform,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_DEBUG_RCV, "debug_rcv", &debug_rcv,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_DEBUG_PFKEY, "debug_pfkey", &debug_pfkey,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_DEBUG_VERBOSE, "debug_verbose",&sysctl_ipsec_debug_verbose,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ #ifdef CONFIG_KLIPS_IPCOMP
+ { NET_IPSEC_DEBUG_IPCOMP, "debug_ipcomp", &sysctl_ipsec_debug_ipcomp,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ #endif /* CONFIG_KLIPS_IPCOMP */
+
+ #ifdef CONFIG_KLIPS_REGRESS
+ { NET_IPSEC_REGRESS_PFKEY_LOSSAGE, "pfkey_lossage",
+ &sysctl_ipsec_regress_pfkey_lossage,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ #endif /* CONFIG_KLIPS_REGRESS */
+
+ #endif /* CONFIG_KLIPS_DEBUG */
+ { NET_IPSEC_ICMP, "icmp", &sysctl_ipsec_icmp,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_INBOUND_POLICY_CHECK, "inbound_policy_check", &sysctl_ipsec_inbound_policy_check,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ { NET_IPSEC_TOS, "tos", &sysctl_ipsec_tos,
+- sizeof(int), 0644, NULL, &proc_dointvec},
++ sizeof(int), 0644, &proc_dointvec},
+ {0}
+ };
+
+@@ -130,7 +130,7 @@ static struct ctl_table_header *ipsec_ta
+
+ int ipsec_sysctl_register(void)
+ {
+- ipsec_table_header = register_sysctl_table(ipsec_root_table, 0);
++ ipsec_table_header = register_sysctl_table(ipsec_root_table);
+ if (!ipsec_table_header) {
+ return -ENOMEM;
+ }
^ permalink raw reply [flat|nested] 17+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2007-06-21 22:09 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-06-21 22:09 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-21 15:09:36 -0700 (Thu, 21 Jun 2007)
New Revision: 18888
Log:
- version bump (not yet tested..)
Added:
trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-fixup.patch
trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-natt.patch
Modified:
trunk/buildroot/package/openswan/openswan-2.4.7-005-pluto.patch
trunk/buildroot/package/openswan/openswan.mk
Changeset:
Sorry, the patch is too large to include (59720 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=18888
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2007-03-24 12:46 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-03-24 12:46 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-24 05:46:46 -0700 (Sat, 24 Mar 2007)
New Revision: 18223
Log:
- fwd port
Added:
trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-natt.patch
trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-nfmark-rename.patch
trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-zzz-crypto_alg_available.patch
trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-zzz-void-sock_unregister.patch
Removed:
trunk/buildroot/package/openswan/linux-2.6.20.3-openswan-2.4.7.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.20.3-openswan-2.4.7.kernel-2.6-natt.patch
trunk/buildroot/package/openswan/linux-2.6.20.3-openswan-2.4.7.kernel-2.6-nfmark-rename.patch
trunk/buildroot/package/openswan/linux-2.6.20.3-openswan-2.4.7.kernel-2.6-zzz-crypto_alg_available.patch
trunk/buildroot/package/openswan/linux-2.6.20.3-openswan-2.4.7.kernel-2.6-zzz-void-sock_unregister.patch
Changeset:
Sorry, the patch is too large to include (119191 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=18223
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2007-03-21 10:35 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-03-21 10:35 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-21 03:35:40 -0700 (Wed, 21 Mar 2007)
New Revision: 18192
Log:
- fwd port
Added:
trunk/buildroot/package/openswan/linux-2.6.20.3-openswan-2.4.7.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.20.3-openswan-2.4.7.kernel-2.6-natt.patch
trunk/buildroot/package/openswan/linux-2.6.20.3-openswan-2.4.7.kernel-2.6-nfmark-rename.patch
trunk/buildroot/package/openswan/linux-2.6.20.3-openswan-2.4.7.kernel-2.6-zzz-crypto_alg_available.patch
trunk/buildroot/package/openswan/linux-2.6.20.3-openswan-2.4.7.kernel-2.6-zzz-void-sock_unregister.patch
Removed:
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-natt.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-nfmark-rename.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-zzz-crypto_alg_available.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-zzz-void-sock_unregister.patch
Changeset:
Sorry, the patch is too large to include (119191 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=18192
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2007-02-15 13:54 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-02-15 13:54 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-02-15 05:54:25 -0800 (Thu, 15 Feb 2007)
New Revision: 17896
Log:
- store the current patches for the kernel part somewhere
Added:
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-natt.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-nfmark-rename.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-zzz-crypto_alg_available.patch
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-zzz-void-sock_unregister.patch
Changeset:
Sorry, the patch is too large to include (59595 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=17896
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2006-12-22 11:29 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-12-22 11:29 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-22 03:29:52 -0800 (Fri, 22 Dec 2006)
New Revision: 17043
Log:
- add option to enable debugging support
Modified:
trunk/buildroot/package/openswan/Config.in
trunk/buildroot/package/openswan/openswan.mk
Changeset:
Modified: trunk/buildroot/package/openswan/Config.in
===================================================================
--- trunk/buildroot/package/openswan/Config.in 2006-12-22 10:39:56 UTC (rev 17042)
+++ trunk/buildroot/package/openswan/Config.in 2006-12-22 11:29:52 UTC (rev 17043)
@@ -7,3 +7,13 @@
Openswan is an implementation of IPsec for Linux.
http://openswan.org/
+config BR2_PACKAGE_OPENSWAN_DEBUGGING
+ bool "debugging support"
+ default n
+ depends on BR2_PACKAGE_OPENSWAN
+ help
+ Enable debugging support.
+ This is not needed if you know what you do but makes it quite
+ hard to diagnose eventual problems.
+ It is safe to say Yes here.
+
Modified: trunk/buildroot/package/openswan/openswan.mk
===================================================================
--- trunk/buildroot/package/openswan/openswan.mk 2006-12-22 10:39:56 UTC (rev 17042)
+++ trunk/buildroot/package/openswan/openswan.mk 2006-12-22 11:29:52 UTC (rev 17043)
@@ -14,6 +14,10 @@
OPENSWAN_BINARY:=programs/pluto/pluto
OPENSWAN_TARGET_BINARY:=usr/sbin/ipsec
+ifneq ($(BR2_PACKAGE_OPENSWAN_DEBUGGING),y)
+OPENSWAN_CFLAGS=-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE
+endif
+
$(DL_DIR)/$(OPENSWAN_SOURCE):
$(WGET) -P $(DL_DIR) $(OPENSWAN_SITE)/$(OPENSWAN_SOURCE)
@@ -25,17 +29,17 @@
touch $(OPENSWAN_DIR)/.unpacked
$(OPENSWAN_DIR)/$(OPENSWAN_BINARY): $(OPENSWAN_DIR)/.unpacked
- @echo $(LINUX_KERNEL)
+ @echo "using kernel $(LINUX_KERNEL)"
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(OPENSWAN_DIR) \
KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) INC_USRLOCAL=/usr \
- CC=$(TARGET_CC) USERCOMPILE="-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH=$(TARGET_DIR)/usr/lib programs
+ CC=$(TARGET_CC) USERCOMPILE="$(OPENSWAN_CFLAGS) $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH="$(TARGET_DIR)/lib:$(TARGET_DIR)/usr/lib" programs
$(TARGET_DIR)/$(OPENSWAN_TARGET_BINARY): $(OPENSWAN_DIR)/$(OPENSWAN_BINARY)
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(OPENSWAN_DIR) \
KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) INC_USRLOCAL=/usr \
- CC=$(TARGET_CC) USERCOMPILE="-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH=$(TARGET_DIR)/usr/lib install
+ CC=$(TARGET_CC) USERCOMPILE="$(OPENSWAN_CFLAGS) $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH="$(TARGET_DIR)/lib:$(TARGET_DIR)/usr/lib" install
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
^ permalink raw reply [flat|nested] 17+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2006-12-14 15:36 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-12-14 15:36 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-14 07:36:12 -0800 (Thu, 14 Dec 2006)
New Revision: 16925
Log:
- remove usage of SUSv3 legacy functions.
Added:
trunk/buildroot/package/openswan/openswan-2.4.7-010-susv3-legacy.patch
Modified:
trunk/buildroot/package/openswan/openswan.mk
Changeset:
Added: trunk/buildroot/package/openswan/openswan-2.4.7-010-susv3-legacy.patch
===================================================================
--- trunk/buildroot/package/openswan/openswan-2.4.7-010-susv3-legacy.patch 2006-12-14 15:25:47 UTC (rev 16924)
+++ trunk/buildroot/package/openswan/openswan-2.4.7-010-susv3-legacy.patch 2006-12-14 15:36:12 UTC (rev 16925)
@@ -0,0 +1,22 @@
+--- openswan-2.4.7.oorig/lib/libopenswan/alg_info.c 2006-10-06 18:47:38.000000000 +0200
++++ openswan-2.4.7/lib/libopenswan/alg_info.c 2006-12-14 14:27:29.000000000 +0100
+@@ -649,7 +649,7 @@ alg_info_esp_create_from_str (const char
+
+ if (!alg_info_esp) goto out;
+
+- pfs_name=index (alg_str, ';');
++ pfs_name=strchr (alg_str, ';');
+
+ if (pfs_name) {
+ memcpy(esp_buf, alg_str, pfs_name-alg_str);
+--- openswan-2.4.7.oorig/programs/ikeping/ikeping.c 2005-07-08 04:56:38.000000000 +0200
++++ openswan-2.4.7/programs/ikeping/ikeping.c 2006-12-14 14:31:36.000000000 +0100
+@@ -315,7 +315,7 @@ main(int argc, char **argv)
+ natt=0;
+ listen_only=0;
+ noDNS=0;
+- bzero(&laddr, sizeof(laddr));
++ memset(&laddr, 0, sizeof(laddr));
+
+ while((c = getopt_long(argc, argv, "hVnvsp:b:46E:w:", long_opts, 0))!=EOF) {
+ switch (c) {
Modified: trunk/buildroot/package/openswan/openswan.mk
===================================================================
--- trunk/buildroot/package/openswan/openswan.mk 2006-12-14 15:25:47 UTC (rev 16924)
+++ trunk/buildroot/package/openswan/openswan.mk 2006-12-14 15:36:12 UTC (rev 16925)
@@ -24,10 +24,7 @@
toolchain/patch-kernel.sh $(OPENSWAN_DIR) package/openswan/ openswan\*.patch
touch $(OPENSWAN_DIR)/.unpacked
-$(OPENSWAN_DIR)/.configured: $(OPENSWAN_DIR)/.unpacked
- touch $(OPENSWAN_DIR)/.configured
-
-$(OPENSWAN_DIR)/$(OPENSWAN_BINARY): $(OPENSWAN_DIR)/.configured
+$(OPENSWAN_DIR)/$(OPENSWAN_BINARY): $(OPENSWAN_DIR)/.unpacked
@echo $(LINUX_KERNEL)
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(OPENSWAN_DIR) \
^ permalink raw reply [flat|nested] 17+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2006-11-29 13:21 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-11-29 13:21 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-29 05:21:28 -0800 (Wed, 29 Nov 2006)
New Revision: 16719
Log:
- it helps to actually apply the patches.. ;)
Modified:
trunk/buildroot/package/openswan/openswan.mk
Changeset:
Modified: trunk/buildroot/package/openswan/openswan.mk
===================================================================
--- trunk/buildroot/package/openswan/openswan.mk 2006-11-29 12:59:56 UTC (rev 16718)
+++ trunk/buildroot/package/openswan/openswan.mk 2006-11-29 13:21:28 UTC (rev 16719)
@@ -21,7 +21,7 @@
$(OPENSWAN_DIR)/.unpacked: $(DL_DIR)/$(OPENSWAN_SOURCE)
$(OPENSWAN_CAT) $(DL_DIR)/$(OPENSWAN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(OPENSWAN_DIR) package/openswan/ openswan.patch
+ toolchain/patch-kernel.sh $(OPENSWAN_DIR) package/openswan/ openswan\*.patch
touch $(OPENSWAN_DIR)/.unpacked
$(OPENSWAN_DIR)/.configured: $(OPENSWAN_DIR)/.unpacked
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openswan
@ 2006-11-28 17:04 aldot at uclibc.org
0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-11-28 17:04 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-28 09:04:37 -0800 (Tue, 28 Nov 2006)
New Revision: 16708
Log:
- strip cruft off the pluto patch.
Modified:
trunk/buildroot/package/openswan/openswan-2.4.7-005-pluto.patch
Changeset:
Modified: trunk/buildroot/package/openswan/openswan-2.4.7-005-pluto.patch
===================================================================
--- trunk/buildroot/package/openswan/openswan-2.4.7-005-pluto.patch 2006-11-28 16:59:17 UTC (rev 16707)
+++ trunk/buildroot/package/openswan/openswan-2.4.7-005-pluto.patch 2006-11-28 17:04:37 UTC (rev 16708)
@@ -60,14 +60,6 @@
whack_log(RC_COMMENT
, "\"%s\"%s: newest ISAKMP SA: #%ld; newest IPsec SA: #%ld; "
-Only in openswan-2.4.7/programs/pluto/: connections.o
-Only in openswan-2.4.7/programs/pluto/: cookie.o
-Only in openswan-2.4.7/programs/pluto/: crypt_dh.o
-Only in openswan-2.4.7/programs/pluto/: crypt_ke.o
-Only in openswan-2.4.7/programs/pluto/: crypt_utils.o
-Only in openswan-2.4.7/programs/pluto/: crypto.o
-Only in openswan-2.4.7/programs/pluto/: db_ops.o
-Only in openswan-2.4.7/programs/pluto/: defs.o
diff -urp openswan-2.4.7.orig/programs/pluto/demux.c openswan-2.4.7/programs/pluto/demux.c
--- openswan-2.4.7.orig/programs/pluto/demux.c 2005-10-06 02:57:26.000000000 +0200
+++ openswan-2.4.7/programs/pluto/demux.c 2006-11-28 17:04:27.000000000 +0100
@@ -81,24 +73,6 @@
#endif
-Only in openswan-2.4.7/programs/pluto/: demux.o
-Only in openswan-2.4.7/programs/pluto/: dnskey.o
-Only in openswan-2.4.7/programs/pluto/: dpd.o
-Only in openswan-2.4.7/programs/pluto/: foodgroups.o
-Only in openswan-2.4.7/programs/pluto/: id.o
-Only in openswan-2.4.7/programs/pluto/: ike_alg.o
-Only in openswan-2.4.7/programs/pluto/: ike_alg_aes.o
-Only in openswan-2.4.7/programs/pluto/: ike_alginit.o
-Only in openswan-2.4.7/programs/pluto/: ikeping.o
-Only in openswan-2.4.7/programs/pluto/: ikev1_aggr.o
-Only in openswan-2.4.7/programs/pluto/: ikev1_quick.o
-Only in openswan-2.4.7/programs/pluto/: ipsec_doi.o
-Only in openswan-2.4.7/programs/pluto/: kernel.o
-Only in openswan-2.4.7/programs/pluto/: kernel_netlink.o
-Only in openswan-2.4.7/programs/pluto/: kernel_noklips.o
-Only in openswan-2.4.7/programs/pluto/: kernel_pfkey.o
-Only in openswan-2.4.7/programs/pluto/: keys.o
-Only in openswan-2.4.7/programs/pluto/: lex.o
diff -urp openswan-2.4.7.orig/programs/pluto/log.c openswan-2.4.7/programs/pluto/log.c
--- openswan-2.4.7.orig/programs/pluto/log.c 2005-07-18 21:40:15.000000000 +0200
+++ openswan-2.4.7/programs/pluto/log.c 2006-11-28 16:56:53.000000000 +0100
@@ -134,11 +108,6 @@
/* show status, usually on whack log */
extern void show_status(void);
-Only in openswan-2.4.7/programs/pluto/: log.o
-Only in openswan-2.4.7/programs/pluto/: md5.o
-Only in openswan-2.4.7/programs/pluto/: nat_traversal.o
-Only in openswan-2.4.7/programs/pluto/: pending.o
-Only in openswan-2.4.7/programs/pluto/: pluto_constants.o
diff -urp openswan-2.4.7.orig/programs/pluto/pluto_crypt.c openswan-2.4.7/programs/pluto/pluto_crypt.c
--- openswan-2.4.7.orig/programs/pluto/pluto_crypt.c 2005-07-13 04:14:08.000000000 +0200
+++ openswan-2.4.7/programs/pluto/pluto_crypt.c 2006-11-28 17:25:43.000000000 +0100
@@ -152,8 +121,6 @@
debug_prefix='!';
pluto_crypto_helper(fds[1], n);
-Only in openswan-2.4.7/programs/pluto/: pluto_crypt.o
-Only in openswan-2.4.7/programs/pluto/: plutoalg.o
diff -urp openswan-2.4.7.orig/programs/pluto/plutomain.c openswan-2.4.7/programs/pluto/plutomain.c
--- openswan-2.4.7.orig/programs/pluto/plutomain.c 2006-10-27 05:00:30.000000000 +0200
+++ openswan-2.4.7/programs/pluto/plutomain.c 2006-11-28 17:00:56.000000000 +0100
@@ -192,16 +159,3 @@
#ifdef VIRTUAL_IP
case '6': /* --virtual_private */
virtual_private = optarg;
-Only in openswan-2.4.7/programs/pluto/: plutomain.o
-Only in openswan-2.4.7/programs/pluto/: rcv_whack.o
-Only in openswan-2.4.7/programs/pluto/: rnd.o
-Only in openswan-2.4.7/programs/pluto/: server.o
-Only in openswan-2.4.7/programs/pluto/: sha1.o
-Only in openswan-2.4.7/programs/pluto/: spdb.o
-Only in openswan-2.4.7/programs/pluto/: spdb_print.o
-Only in openswan-2.4.7/programs/pluto/: spdb_struct.o
-Only in openswan-2.4.7/programs/pluto/: state.o
-Only in openswan-2.4.7/programs/pluto/: timer.o
-Only in openswan-2.4.7/programs/pluto/: vendor.o
-Only in openswan-2.4.7/programs/pluto/: virtual.o
-Only in openswan-2.4.7/programs/pluto/: xauth.o
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2009-02-24 8:56 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-29 20:51 [Buildroot] svn commit: trunk/buildroot/package/openswan aldot at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-02-24 8:56 jacmet at uclibc.org
2009-01-16 13:21 jacmet at uclibc.org
2008-12-17 10:32 jacmet at uclibc.org
2007-09-19 9:20 aldot at uclibc.org
2007-09-19 8:50 aldot at uclibc.org
2007-09-18 13:02 aldot at uclibc.org
2007-07-23 9:45 ulf at uclibc.org
2007-06-21 22:14 aldot at uclibc.org
2007-06-21 22:09 aldot at uclibc.org
2007-03-24 12:46 aldot at uclibc.org
2007-03-21 10:35 aldot at uclibc.org
2007-02-15 13:54 aldot at uclibc.org
2006-12-22 11:29 aldot at uclibc.org
2006-12-14 15:36 aldot at uclibc.org
2006-11-29 13:21 aldot at uclibc.org
2006-11-28 17:04 aldot 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