Merge commit 'nbd/master' into xburst

include/autotools.mk

@@ -32,6 +32,7 @@ update_libtool_ucxx = \
 	) \
 	$(call update_libtool_common)
 
+autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
 
 # prevent libtool from linking against host development libraries
 define libtool_fixup_libdir

include/download.mk

@@ -63,12 +63,6 @@ define DownloadMethod/cvs
 	)
 endef
 
-SVN_VERSION=$(shell svn --version | head -1 | awk '{ print $3 }' | cut -d. -f2)
-ifeq ($(SVN_VERSION),5)
-else
-SVN_OPTS:=--trust-server-cert
-endif
-
 define DownloadMethod/svn
 	$(call wrap_mirror, \
 		echo "Checking out files from the svn repository..."; \
@@ -76,7 +70,9 @@ define DownloadMethod/svn
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
-		svn export --non-interactive $(SVN_OPTS) -r$(VERSION) $(URL) $(SUBDIR) && \
+		( svn help export | grep -q trust-server-cert && \
+		svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) || \
+		svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \
 		echo "Packing checkout..." && \
 		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
 		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \

include/kernel-version.mk

@@ -17,9 +17,6 @@ endif
 ifeq ($(LINUX_VERSION),2.6.31.12)
   LINUX_KERNEL_MD5SUM:=517be354b81b780e2f4b2ad614d030de
 endif
-ifeq ($(LINUX_VERSION),2.6.32.9)
-  LINUX_KERNEL_MD5SUM:=0771a9c70503c92f40d815ef76eb62fe
-endif
 ifeq ($(LINUX_VERSION),2.6.32.10)
   LINUX_KERNEL_MD5SUM:=5d996507ad482a3a8c8e6b2d48e7994b
 endif

include/kernel.mk

@@ -30,8 +30,10 @@ else
     KERNEL_CROSS?=$(TARGET_CROSS)
   endif
 
+  ifeq ($(TARGET_BUILD),1)
     PATCH_DIR ?= ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
     FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)")
+  endif
   KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
   LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 

include/package-ipkg.mk

@@ -24,11 +24,18 @@ define BuildIPKGVariable
   $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
 endef
 
+PARENL :=(
+PARENR :=)
+
 dep_split=$(subst :,$(space),$(1))
-dep_confvar=CONFIG_$(word 1,$(call dep_split,$(1)))
+dep_rem=$(subst !,,$(subst $(strip $(PARENL)),,$(subst $(strip $(PARENR)),,$(word 1,$(call dep_split,$(1))))))
+dep_confvar=$(strip $(foreach cond,$(subst ||, ,$(call dep_rem,$(1))),$(CONFIG_$(cond))))
+dep_pos=$(if $(call dep_confvar,$(1)),$(call dep_val,$(1)))
+dep_neg=$(if $(call dep_confvar,$(1)),,$(call dep_val,$(1)))
+dep_if=$(if $(findstring !,$(1)),$(call dep_neg,$(1)),$(call dep_pos,$(1)))
 dep_val=$(word 2,$(call dep_split,$(1)))
 strip_deps=$(strip $(subst +,,$(filter-out @%,$(1))))
-filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(if $($(call dep_confvar,$(dep))),$(call dep_val,$(dep))),$(dep)))
+filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(call dep_if,$(dep)),$(dep)))
 
 ifeq ($(DUMP),)
   define BuildTarget/ipkg

include/target.mk

@@ -148,8 +148,10 @@ ifeq ($(DUMP),1)
       FEATURES += pcie
     endif
     ifneq ($(CONFIG_USB)$(CONFIG_USB_SUPPORT),)
+      ifneq ($(CONFIG_USB_ARCH_HAS_HCD)$(CONFIG_USB_EHCI_HCD),)
         FEATURES += usb
       endif
+    endif
     ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
       FEATURES += pcmcia
     endif

package/acx-mac80211/patches/001-if_init_conf_removal.patch

@@ -1,8 +1,6 @@
-Index: acx-mac80211-20100302/acx_func.h
+--- a/acx_func.h
-===================================================================
++++ b/acx_func.h
---- acx-mac80211-20100302.orig/acx_func.h	2010-03-06 12:57:25.000000000 +0100
+@@ -704,9 +704,9 @@ int acx_setup_modes(acx_device_t *adev);
-+++ acx-mac80211-20100302/acx_func.h	2010-03-06 12:58:10.000000000 +0100
-@@ -704,9 +704,9 @@
  void acx_free_modes(acx_device_t *adev);
  int acx_i_op_tx(struct ieee80211_hw *ieee,	struct sk_buff *skb);
  int acx_e_op_add_interface(struct ieee80211_hw* ieee,
@@ -14,11 +12,9 @@ Index: acx-mac80211-20100302/acx_func.h
  int acx_net_reset(struct ieee80211_hw *ieee);
  int acx_e_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
  		struct ieee80211_vif *vif, struct ieee80211_sta *sta,
-Index: acx-mac80211-20100302/common.c
+--- a/common.c
-===================================================================
++++ b/common.c
---- acx-mac80211-20100302.orig/common.c	2010-03-06 12:57:31.000000000 +0100
+@@ -4402,7 +4402,7 @@ static void acx_s_select_opmode(acx_devi
-+++ acx-mac80211-20100302/common.c	2010-03-06 12:59:51.000000000 +0100
-@@ -4402,7 +4402,7 @@
  }
  
  int acx_e_op_add_interface(struct ieee80211_hw *ieee,
@@ -27,7 +23,7 @@ Index: acx-mac80211-20100302/common.c
  {
  	acx_device_t *adev = ieee2adev(ieee);
  	unsigned long flags;
-@@ -4414,14 +4414,14 @@
+@@ -4414,14 +4414,14 @@ int acx_e_op_add_interface(struct ieee80
  	acx_sem_lock(adev);
  	acx_lock(adev, flags);
  
@@ -45,7 +41,7 @@ Index: acx-mac80211-20100302/common.c
  	}
  //	adev->mode = conf->type;
  
-@@ -4436,8 +4436,8 @@
+@@ -4436,8 +4436,8 @@ int acx_e_op_add_interface(struct ieee80
  
  	printk(KERN_INFO "acx: Virtual interface added "
  	       "(type: 0x%08X, MAC: %s)\n",
@@ -56,7 +52,7 @@ Index: acx-mac80211-20100302/common.c
  
      out_unlock:
  	acx_unlock(adev, flags);
-@@ -4448,7 +4448,7 @@
+@@ -4448,7 +4448,7 @@ int acx_e_op_add_interface(struct ieee80
  }
  
  void acx_e_op_remove_interface(struct ieee80211_hw *hw,
@@ -65,7 +61,7 @@ Index: acx-mac80211-20100302/common.c
  {
  	acx_device_t *adev = ieee2adev(hw);
  
-@@ -4457,23 +4457,23 @@
+@@ -4457,23 +4457,23 @@ void acx_e_op_remove_interface(struct ie
  	FN_ENTER;
  	acx_sem_lock(adev);
  

package/acx-mac80211/patches/002-tx_queue_stats_removal.patch

@@ -1,8 +1,6 @@
-Index: acx-mac80211-20100302/acx_func.h
+--- a/acx_func.h
-===================================================================
++++ b/acx_func.h
---- acx-mac80211-20100302.orig/acx_func.h	2010-03-06 13:01:36.000000000 +0100
+@@ -714,7 +714,6 @@ int acx_e_op_set_key(struct ieee80211_hw
-+++ acx-mac80211-20100302/acx_func.h	2010-03-06 13:01:56.000000000 +0100
-@@ -714,7 +714,6 @@
  int acx_e_op_config(struct ieee80211_hw *hw, u32 changed);
  void acx_e_op_bss_info_changed(struct ieee80211_hw *hw,
  		struct ieee80211_vif *vif, struct ieee80211_bss_conf *info, u32 changed);
@@ -10,11 +8,9 @@ Index: acx-mac80211-20100302/acx_func.h
  int acx_e_conf_tx(struct ieee80211_hw* ieee, u16 queue,
  		const struct ieee80211_tx_queue_params *params);
  //int acx_passive_scan(struct net_device *net_dev, int state, struct ieee80211_scan_conf *conf);
-Index: acx-mac80211-20100302/common.c
+--- a/common.c
-===================================================================
++++ b/common.c
---- acx-mac80211-20100302.orig/common.c	2010-03-06 13:01:38.000000000 +0100
+@@ -4662,24 +4662,6 @@ extern void acx_e_op_bss_info_changed(st
-+++ acx-mac80211-20100302/common.c	2010-03-06 13:02:37.000000000 +0100
-@@ -4662,24 +4662,6 @@
  	return;
  }
  
@@ -39,11 +35,9 @@ Index: acx-mac80211-20100302/common.c
  int acx_e_conf_tx(struct ieee80211_hw *hw,
  		u16 queue, const struct ieee80211_tx_queue_params *params)
  {
-Index: acx-mac80211-20100302/mem.c
+--- a/mem.c
-===================================================================
++++ b/mem.c
---- acx-mac80211-20100302.orig/mem.c	2010-03-06 13:01:46.000000000 +0100
+@@ -2321,7 +2321,6 @@ static const struct ieee80211_ops acxmem
-+++ acx-mac80211-20100302/mem.c	2010-03-06 13:02:28.000000000 +0100
-@@ -2321,7 +2321,6 @@
  		.bss_info_changed = acx_e_op_bss_info_changed,
  		.set_key = acx_e_op_set_key,
  		.get_stats = acx_e_op_get_stats,
@@ -51,11 +45,9 @@ Index: acx-mac80211-20100302/mem.c
  		};
  
  
-Index: acx-mac80211-20100302/pci.c
+--- a/pci.c
-===================================================================
++++ b/pci.c
---- acx-mac80211-20100302.orig/pci.c	2010-03-06 13:01:40.000000000 +0100
+@@ -1482,7 +1482,6 @@ static const struct ieee80211_ops acxpci
-+++ acx-mac80211-20100302/pci.c	2010-03-06 13:02:18.000000000 +0100
-@@ -1482,7 +1482,6 @@
  	.bss_info_changed = acx_e_op_bss_info_changed,
  	.set_key = acx_e_op_set_key,
  	.get_stats = acx_e_op_get_stats,
@@ -63,11 +55,9 @@ Index: acx-mac80211-20100302/pci.c
  };
  
  
-Index: acx-mac80211-20100302/usb.c
+--- a/usb.c
-===================================================================
++++ b/usb.c
---- acx-mac80211-20100302.orig/usb.c	2010-03-06 13:01:44.000000000 +0100
+@@ -757,7 +757,6 @@ static const struct ieee80211_ops acxusb
-+++ acx-mac80211-20100302/usb.c	2010-03-06 13:02:22.000000000 +0100
-@@ -757,7 +757,6 @@
  	.bss_info_changed = acx_e_op_bss_info_changed,
  	.set_key = acx_e_op_set_key,
  	.get_stats = acx_e_op_get_stats,

package/acx-mac80211/patches/003-build_as_modules.patch

@@ -1,8 +1,6 @@
-Index: acx-mac80211-20100302/Makefile
+--- a/Makefile
-===================================================================
++++ b/Makefile
---- acx-mac80211-20100302.orig/Makefile	2010-03-06 22:13:23.000000000 +0100
+@@ -29,7 +29,7 @@ ifneq ($(KERNELRELEASE),)
-+++ acx-mac80211-20100302/Makefile	2010-03-06 22:13:28.000000000 +0100
-@@ -29,7 +29,7 @@
  	acx-mac80211-obj-$(CONFIG_ACX_MAC80211_PCI) += pci.o
  	acx-mac80211-obj-$(CONFIG_ACX_MAC80211_USB) += usb.o
  	acx-mac80211-obj-$(CONFIG_ACX_MAC80211_MEM) += mem.o

package/acx-mac80211/patches/004-vlynq_fixes.patch

@@ -1,8 +1,6 @@
-Index: acx-mac80211-20100302/pci.c
+--- a/pci.c
-===================================================================
++++ b/pci.c
---- acx-mac80211-20100302.orig/pci.c	2010-03-06 22:22:02.000000000 +0100
+@@ -4309,7 +4309,7 @@ static __devinit int vlynq_probe(struct 
-+++ acx-mac80211-20100302/pci.c	2010-03-06 22:22:29.000000000 +0100
-@@ -4309,7 +4309,7 @@
  	addr = (u32)ioremap(vdev->mem_start, 0x1000);
  	if (!addr) {
  		printk(KERN_ERR "acx: %s: failed to remap io memory\n",
@@ -11,7 +9,7 @@ Index: acx-mac80211-20100302/pci.c
  		result = -ENXIO;
  		goto fail;
  	}
-@@ -4323,7 +4323,7 @@
+@@ -4323,7 +4323,7 @@ static __devinit int vlynq_probe(struct 
  	ieee = ieee80211_alloc_hw(sizeof(struct acx_device), &acxpci_hw_ops);
  	if (!ieee) {
  		printk("acx: could not allocate ieee80211 structure %s\n",
@@ -20,7 +18,7 @@ Index: acx-mac80211-20100302/pci.c
  		goto fail_alloc_netdev;
  	}
  	ieee->flags &=	 ~IEEE80211_HW_RX_INCLUDES_FCS;
-@@ -4365,7 +4365,7 @@
+@@ -4365,7 +4365,7 @@ static __devinit int vlynq_probe(struct 
  
  	printk("acx: found %s-based wireless network card at %s, irq:%d, "
  	       "phymem:0x%x, mem:0x%p\n",
@@ -29,7 +27,7 @@ Index: acx-mac80211-20100302/pci.c
  	       vdev->mem_start, adev->iobase);
  	log(L_ANY, "acx: the initial debug setting is 0x%04X\n", acx_debug);
  
-@@ -4416,7 +4416,7 @@
+@@ -4416,7 +4416,7 @@ static __devinit int vlynq_probe(struct 
  	 * firmware operations happening in parallel or uninitialized data */
  
  
@@ -38,7 +36,7 @@ Index: acx-mac80211-20100302/pci.c
  
  	/* Now we have our device, so make sure the kernel doesn't try
  	 * to send packets even though we're not associated to a network yet */
-@@ -4536,7 +4536,7 @@
+@@ -4536,7 +4536,7 @@ static void vlynq_remove(struct vlynq_de
  		CLEAR_BIT(adev->dev_state_mask, ACX_STATE_IFACE_UP);
  	}
  

package/acx-mac80211/patches/005-do_not_override_pci.patch

@@ -1,7 +1,5 @@
-Index: acx-mac80211-20100302/pci.c
+--- a/pci.c
-===================================================================
++++ b/pci.c
---- acx-mac80211-20100302.orig/pci.c	2010-03-07 12:39:38.000000000 +0100
-+++ acx-mac80211-20100302/pci.c	2010-03-07 12:40:02.000000000 +0100
 @@ -17,8 +17,6 @@
   */
  #define ACX_MAC80211_PCI 1

package/acx/patches/002-disable-usb.diff

@@ -1,8 +1,6 @@
-Index: acx-20070101/Makefile
+--- a/Makefile
-===================================================================
++++ b/Makefile
---- acx-20070101.orig/Makefile	2007-06-04 13:22:42.463399864 +0200
+@@ -4,7 +4,7 @@ KERNELDIR = /lib/modules/$(KVER)/build
-+++ acx-20070101/Makefile	2007-06-04 13:22:42.747356696 +0200
-@@ -1,7 +1,7 @@
  obj-m += acx.o
  
  acx-obj-y += pci.o
@@ -11,15 +9,13 @@ Index: acx-20070101/Makefile
  
  acx-objs := wlan.o conv.o ioctl.o common.o $(acx-obj-y)
  
-Index: acx-20070101/acx_config.h
+--- a/acx_config.h
-===================================================================
++++ b/acx_config.h
---- acx-20070101.orig/acx_config.h	2007-06-04 13:22:42.469398952 +0200
-+++ acx-20070101/acx_config.h	2007-06-04 13:22:42.747356696 +0200
 @@ -1,6 +1,6 @@
  /* temporary hack until proper Kconfig integration */
  #define CONFIG_ACX_PCI 1
 -#define CONFIG_ACX_USB 1
 +/*#define CONFIG_ACX_USB 1*/
  
- #define ACX_RELEASE "v0.3.36"
+ #define ACX_RELEASE "v0.3.37"
  

package/acx/patches/003-encrypt-broadcast-traffic.diff

@@ -1,6 +1,6 @@
---- acx-20080210/common.c.orig	2008-04-19 17:38:46.000000000 +0100
+--- a/common.c
-+++ acx-20080210/common.c	2008-04-19 17:40:10.000000000 +0100
++++ b/common.c
-@@ -4155,6 +4155,11 @@
+@@ -4155,6 +4155,11 @@ acx_l_process_data_frame_master(acx_devi
  		/* To_DS = 0, From_DS = 1 */
  		hdr->fc = WF_FC_FROMDSi + WF_FTYPE_DATAi;
  

package/acx/patches/004-add_request_info.patch

@@ -1,6 +1,6 @@
---- acx-20080210/ioctl.c	2008-02-10 14:06:42.000000000 -0600
+--- a/ioctl.c
-+++ ioctl.c	2008-11-16 02:08:58.000000000 -0600
++++ b/ioctl.c
-@@ -488,6 +488,7 @@
+@@ -488,6 +488,7 @@ end_unlock:
  /* helper. not sure whether it's really a _s_leeping fn */
  static char*
  acx_s_scan_add_station(
@@ -8,7 +8,7 @@
  	acx_device_t *adev,
  	char *ptr,
  	char *end_buf,
-@@ -503,14 +504,14 @@
+@@ -503,14 +504,14 @@ acx_s_scan_add_station(
  	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
  	MAC_COPY(iwe.u.ap_addr.sa_data, bss->bssid);
  	acxlog_mac(L_IOCTL, "scan, station address: ", bss->bssid, "\n");
@@ -25,7 +25,7 @@
  
  	/* Add mode */
  	iwe.cmd = SIOCGIWMODE;
-@@ -520,7 +521,7 @@
+@@ -520,7 +521,7 @@ acx_s_scan_add_station(
  		else
  			iwe.u.mode = IW_MODE_ADHOC;
  		log(L_IOCTL, "scan, mode: %d\n", iwe.u.mode);
@@ -34,7 +34,7 @@
  	}
  
  	/* Add frequency */
-@@ -528,7 +529,7 @@
+@@ -528,7 +529,7 @@ acx_s_scan_add_station(
  	iwe.u.freq.m = acx_channel_freq[bss->channel - 1] * 100000;
  	iwe.u.freq.e = 1;
  	log(L_IOCTL, "scan, frequency: %d\n", iwe.u.freq.m);
@@ -43,7 +43,7 @@
  
  	/* Add link quality */
  	iwe.cmd = IWEVQUAL;
-@@ -546,7 +547,7 @@
+@@ -546,7 +547,7 @@ acx_s_scan_add_station(
  	iwe.u.qual.updated = 7;
  	log(L_IOCTL, "scan, link quality: %d/%d/%d\n",
  			iwe.u.qual.level, iwe.u.qual.noise, iwe.u.qual.qual);
@@ -52,7 +52,7 @@
  
  	/* Add encryption */
  	iwe.cmd = SIOCGIWENCODE;
-@@ -556,7 +557,7 @@
+@@ -556,7 +557,7 @@ acx_s_scan_add_station(
  		iwe.u.data.flags = IW_ENCODE_DISABLED;
  	iwe.u.data.length = 0;
  	log(L_IOCTL, "scan, encryption flags: %X\n", iwe.u.data.flags);
@@ -61,7 +61,7 @@
  
  	/* add rates */
  	iwe.cmd = SIOCGIWRATE;
-@@ -570,7 +571,7 @@
+@@ -570,7 +571,7 @@ acx_s_scan_add_station(
  		if (rate & 1) {
  			iwe.u.bitrate.value = *p * 500000; /* units of 500kb/s */
  			log(L_IOCTL, "scan, rate: %d\n", iwe.u.bitrate.value);
@@ -70,7 +70,7 @@
  						&iwe, IW_EV_PARAM_LEN);
  		}
  		rate >>= 1;
-@@ -625,7 +626,7 @@
+@@ -625,7 +626,7 @@ acx_ioctl_get_scan(
  	for (i = 0; i < ARRAY_SIZE(adev->sta_list); i++) {
  		struct client *bss = &adev->sta_list[i];
  		if (!bss->used) continue;
@@ -79,4 +79,3 @@
  			extra + IW_SCAN_MAX_DATA, bss);
  	}
  	dwrq->length = ptr - extra;
-

package/acx/patches/005-2.6.30_fixes.patch

@@ -1,7 +1,6 @@
-diff -urN acx-20080210/pci.c acx-20080210.new/pci.c
+--- a/pci.c
---- acx-20080210/pci.c	2009-08-04 00:28:37.000000000 +0200
++++ b/pci.c
-+++ acx-20080210.new/pci.c	2009-08-04 00:28:42.000000000 +0200
+@@ -2005,7 +2005,12 @@ static void acxpci_s_down(struct net_dev
-@@ -2005,7 +2005,12 @@
  	/* then wait until interrupts have finished executing on other CPUs */
  	acx_lock(adev, flags);
  	disable_acx_irq(adev);
@@ -14,7 +13,7 @@ diff -urN acx-20080210/pci.c acx-20080210.new/pci.c
  	acx_unlock(adev, flags);
  
  	/* we really don't want to have an asynchronous tasklet disturb us
-@@ -4164,7 +4169,11 @@
+@@ -4164,7 +4169,11 @@ static __devinit int vlynq_probe(struct 
         addr = (u32)ioremap(vdev->mem_start, 0x1000);
         if (!addr) {
  	       printk(KERN_ERR "%s: failed to remap io memory\n",
@@ -26,7 +25,7 @@ diff -urN acx-20080210/pci.c acx-20080210.new/pci.c
  	       result = -ENXIO;
  	       goto fail;
         }
-@@ -4231,7 +4240,11 @@
+@@ -4231,7 +4240,11 @@ static __devinit int vlynq_probe(struct 
  
         printk("acx: found %s-based wireless network card at %s, irq:%d, "
  	      "phymem:0x%x, mem:0x%p\n",
@@ -38,9 +37,8 @@ diff -urN acx-20080210/pci.c acx-20080210.new/pci.c
  	      vdev->mem_start, adev->iobase);
         log(L_ANY, "initial debug setting is 0x%04X\n", acx_debug);
  
-diff -urN acx-20080210/wlan_compat.h acx-20080210.new/wlan_compat.h
+--- a/wlan_compat.h
---- acx-20080210/wlan_compat.h	2008-02-10 21:06:42.000000000 +0100
++++ b/wlan_compat.h
-+++ acx-20080210.new/wlan_compat.h	2009-08-04 00:24:26.000000000 +0200
 @@ -221,8 +221,10 @@
  #ifndef IRQ_NONE
  #define IRQ_NONE

package/acx/patches/006-netdev_ops.patch

@@ -1,8 +1,6 @@
-Index: acx-20080210/pci.c
+--- a/pci.c
-===================================================================
++++ b/pci.c
---- acx-20080210.orig/pci.c	2010-03-06 13:43:06.000000000 +0100
+@@ -4135,6 +4135,18 @@ static struct vlynq_device_id acx_vlynq_
-+++ acx-20080210/pci.c	2010-03-06 13:46:38.000000000 +0100
-@@ -4135,6 +4135,18 @@
         { 0, 0, 0 },
  };
  
@@ -21,7 +19,7 @@ Index: acx-20080210/pci.c
  static __devinit int vlynq_probe(struct vlynq_device *vdev,
  				struct vlynq_device_id *id)
  {
-@@ -4191,17 +4203,24 @@
+@@ -4191,17 +4203,24 @@ static __devinit int vlynq_probe(struct 
  		goto fail_alloc_netdev;
  	}
  	ether_setup(ndev);

package/admswconfig/patches/001-matrix.patch

@@ -1,6 +1,6 @@
---- admswconfig-0.1.orig/admswconfig.c	2007-05-30 12:55:35.000000000 +0200
+--- a/admswconfig.c
-+++ admswconfig-0.1/admswconfig.c	2007-07-24 19:22:14.000000000 +0200
++++ b/admswconfig.c
-@@ -111,9 +111,9 @@
+@@ -111,9 +111,9 @@ int main(int argc, char **argv)
  		}
  	} else {
  		/* display matrix */

package/apex/patches/100-openwrt_nslu2_armeb_config.patch

@@ -1,6 +1,6 @@
---- apex-1.5.6/src/mach-ixp42x/slugos-nslu2-armeb_config	2007-06-02 10:06:45.000000000 +0930
+--- a/src/mach-ixp42x/slugos-nslu2-armeb_config
-+++ apex-1.5.6/src/mach-ixp42x/slugos-nslu2-armeb_config~	2007-06-03 02:22:18.000000000 +0930
++++ b/src/mach-ixp42x/slugos-nslu2-armeb_config
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y
  #
  # General Setup
  #
@@ -9,7 +9,7 @@
  CONFIG_CROSS_COMPILE=""
  CONFIG_AEABI=y
  CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-@@ -143,7 +143,7 @@
+@@ -150,9 +150,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern
  #    Overrides
  #
  CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
@@ -19,3 +19,5 @@
 -CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
 +CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
  # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
+ # CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
+ CONFIG_USES_NOR_BOOTFLASH=y

package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch

@@ -1,6 +1,6 @@
---- apex-1.5.6/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config	2007-06-02 10:06:45.000000000 +0930
+--- a/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config
-+++ apex-1.5.6/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config~	2007-06-03 02:22:18.000000000 +0930
++++ b/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y
  #
  # General Setup
  #
@@ -9,7 +9,7 @@
  CONFIG_CROSS_COMPILE=""
  CONFIG_AEABI=y
  CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-@@ -143,7 +143,7 @@
+@@ -150,9 +150,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern
  #    Overrides
  #
  CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
@@ -19,3 +19,5 @@
 -CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
 +CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
  # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
+ # CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
+ CONFIG_USES_NOR_BOOTFLASH=y

package/apex/patches/140-openwrt_fsg3_armeb_config.patch

@@ -1,15 +1,15 @@
---- apex-1.5.6/src/mach-ixp42x/slugos-fsg3-armeb_config	2007-06-02 10:06:45.000000000 +0930
+--- a/src/mach-ixp42x/slugos-fsg3-armeb_config
-+++ apex-1.5.6/src/mach-ixp42x/slugos-fsg3-armeb_config~	2007-06-03 02:22:18.000000000 +0930
++++ b/src/mach-ixp42x/slugos-fsg3-armeb_config
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y
  #
  # General Setup
  #
 -CONFIG_TARGET_DESCRIPTION="SlugOS FSG3/BE"
 +CONFIG_TARGET_DESCRIPTION="OpenWRT FSG3"
  CONFIG_CROSS_COMPILE=""
+ CONFIG_AEABI=y
  CONFIG_CC_OPTIMIZE_FOR_SIZE=y
- # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
+@@ -148,9 +148,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern
-@@ -143,7 +143,7 @@
  #    Overrides
  #
  CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
@@ -19,3 +19,5 @@
 -CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/sda2 rootdelay=10 console=ttyS0,115200"
 +CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock2 rootfstype=squashfs console=ttyS0,115200 init=/etc/preinit noinitrd"
  # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
+ # CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
+ CONFIG_USES_NOR_BOOTFLASH=y

package/apex/patches/150-limit_ram_to_64mb.patch

@@ -1,6 +1,6 @@
---- apex-1.5.13/src/mach-ixp42x/slugos-nslu2-armeb_config~	2008-11-28 14:05:56.905634749 +0000
+--- a/src/mach-ixp42x/slugos-nslu2-armeb_config
-+++ apex-1.5.13/src/mach-ixp42x/slugos-nslu2-armeb_config	2008-12-06 13:15:49.857504031 +0000
++++ b/src/mach-ixp42x/slugos-nslu2-armeb_config
-@@ -135,7 +135,7 @@
+@@ -137,7 +137,7 @@ CONFIG_AUTOBOOT_DELAY=10
  CONFIG_ENV_STARTUP_KERNEL_COPY=y
  # CONFIG_ENV_REGION_KERNEL_SWAP is not set
  CONFIG_ENV_STARTUP_PREFIX_P=y
@@ -9,9 +9,9 @@
  
  #
  #    Regions
---- apex-1.5.13/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config~	2008-11-28 14:05:56.905634749 +0000
+--- a/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config
-+++ apex-1.5.13/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config	2008-12-06 13:17:41.311867740 +0000
++++ b/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config
-@@ -135,7 +135,7 @@
+@@ -137,7 +137,7 @@ CONFIG_AUTOBOOT_DELAY=10
  CONFIG_ENV_STARTUP_KERNEL_COPY=y
  # CONFIG_ENV_REGION_KERNEL_SWAP is not set
  CONFIG_ENV_STARTUP_PREFIX_P=y

package/apex/patches/160-openwrt_nas100d_armeb_config.patch

@@ -1,18 +1,20 @@
---- apex-1.5.6/src/mach-ixp42x/slugos-nas100d-armeb_config	2007-06-02 10:06:45.000000000 +0930
+--- a/src/mach-ixp42x/slugos-nas100d-armeb_config
-+++ apex-1.5.6/src/mach-ixp42x/slugos-nas100d-armeb_config~	2007-06-03 02:22:18.000000000 +0930
++++ b/src/mach-ixp42x/slugos-nas100d-armeb_config
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y
  #
  # General Setup
  #
 -CONFIG_TARGET_DESCRIPTION="SlugOS NAS100D/BE"
 +CONFIG_TARGET_DESCRIPTION="OpenWRT NAS100D"
  CONFIG_CROSS_COMPILE=""
+ CONFIG_AEABI=y
  CONFIG_CC_OPTIMIZE_FOR_SIZE=y
- # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
+@@ -145,7 +145,7 @@ CONFIG_ENV_REGION_KERNEL="fis://kernel"
-@@ -143,5 +143,5 @@
  #    Overrides
  #
  CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
 -CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200"
 +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
  # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
+ CONFIG_USES_NOR_BOOTFLASH=y
+ CONFIG_RELOCATE_SIMPLE=y

package/avila-wdt/src/avila-wdt.c

@@ -21,6 +21,8 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/jiffies.h>
+#include <linux/timer.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>

package/base-files/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=40
+PKG_RELEASE:=41
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 

package/base-files/files/etc/config/system

@@ -1,3 +1,12 @@
 config system
 	option hostname	OpenWrt
 	option timezone	UTC
+
+config rdate
+	list server ac-ntp0.net.cmu.edu
+	list server ptbtime1.ptb.de
+	list server ac-ntp1.net.cmu.edu
+	list server ntp.xs4all.nl
+	list server ptbtime2.ptb.de
+	list server cudns.cit.cornell.edu
+	list server ptbtime3.ptb.de

package/base-files/files/etc/hotplug.d/iface/40-rdate

@@ -0,0 +1,46 @@
+uci_get_one()
+{
+	for var in "$@"; do
+		uci -P /var/state get "$var" 2>/dev/null && break
+	done
+}
+
+rand()
+{
+	random=$(awk 'BEGIN { srand(); print int(rand() * 10 + 1); }')
+}
+
+sync_rdate()
+{
+	local servers=$(uci_get_one "network.$INTERFACE.lease_timesrv" \
+		"system.@rdate[0].server")
+
+	if [ -n "$servers" ]; then
+		match=0
+		tries=3
+		rand
+
+		while [ $match = 0 ] && [ $tries != 0 ]; do
+			for server in $servers; do
+				if [ $((--random)) = 0 ]; then
+					rdate -s $server >/dev/null 2>/dev/null && {
+						logger -t rdate "Synced with $server"
+						match=1
+					} || {
+						logger -t rdate "Failed to sync with $server"
+						let tries="$tries - 1"
+						rand
+					}
+
+					break
+				fi
+			done
+		done
+	else
+		logger -t rdate "No usable time server found"
+	fi
+}
+
+case "$ACTION" in
+	ifup) route -n | grep -q ^0.0.0.0 && sync_rdate;;
+esac

package/base-files/files/etc/rc.common

@@ -74,5 +74,5 @@ EOF
 
 ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}"
 list_contains ALL_COMMANDS "$action" || action=help
-[ "$action" == reload ] && action='eval reload "$@" || restart "$@" && :'
+[ "$action" = "reload" ] && action='eval reload "$@" || restart "$@" && :'
 $action "$@"

package/base-files/files/lib/preinit/30_failsafe_wait

@@ -39,7 +39,7 @@ fs_wait_for_key () {
 	rm -f $keypress_wait
     } &
 
-    echo "Press $1<ENTER> $2"
+    echo "Press the [$1] key and hit [enter] $2"
     # if we're on the console we wait for input
     { 
 	while [ -r $keypress_wait ]; do

package/block-extroot/files/50_determine_usb_root

@@ -38,7 +38,7 @@ determine_external_root() {
 		config_load fstab
 		config_foreach config_mount_by_section mount 1
 		
-		[ "$rootfs_found" = "1" ] && grep -q /overlay /proc/mounts && { 
+		[ "$rootfs_found" = "1" ] && grep -q ' /overlay ' /proc/mounts && { 
 			pi_extroot_mount_success=true
 			pi_mount_skip_next=false
 		}

package/br2684ctl/Makefile

@@ -6,6 +6,7 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=br2684ctl
 PKG_VERSION:=20040226
@@ -15,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/b/br2684ctl
 PKG_MD5SUM:=6eb4d8cd174e24a7c078eb4f594f5b69
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
 PKG_BUILD_DEPENDS:=linux-atm
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,6 +29,7 @@ define Package/$(PKG_NAME)
   URL:=http://ftp.debian.org/debian/pool/main/b/br2684ctl
 endef
 
+TARGET_CPPFLAGS += -I$(LINUX_DIR)/include
 MAKE_FLAGS += CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)"
 
 define Package/$(PKG_NAME)/install

package/br2684ctl/patches/100-debian.patch

@@ -1,7 +1,5 @@
-Index: br2684ctl-20040226.orig/br2684ctl.c
+--- a/br2684ctl.c
-===================================================================
++++ b/br2684ctl.c
---- br2684ctl-20040226.orig.orig/br2684ctl.c	2007-06-04 13:22:22.142489112 +0200
-+++ br2684ctl-20040226.orig/br2684ctl.c	2007-06-04 13:22:22.213478320 +0200
 @@ -3,6 +3,8 @@
  #include <unistd.h>
  #include <errno.h>
@@ -24,7 +22,7 @@ Index: br2684ctl-20040226.orig/br2684ctl.c
  
  
  int lastsock, lastitf;
-@@ -39,10 +41,16 @@
+@@ -39,10 +41,16 @@ void fatal(const char *str, int i)
  
  void exitFunc(void)
  {
@@ -42,7 +40,7 @@ Index: br2684ctl-20040226.orig/br2684ctl.c
  int create_pidfile(int num)
  {
    FILE *pidfile = NULL;
-@@ -80,7 +88,7 @@
+@@ -80,7 +88,7 @@ int create_br(char *nstr)
        err=ioctl (lastsock, ATM_NEWBACKENDIF, &ni);
    
        if (err == 0)
@@ -51,7 +49,7 @@ Index: br2684ctl-20040226.orig/br2684ctl.c
        else
  	syslog(LOG_INFO, "Interface \"%s\" could not be created, reason: %s\n",
  	       ni.ifname,
-@@ -112,7 +120,7 @@
+@@ -112,7 +120,7 @@ int assign_vcc(char *astr, int encap, in
      addr.sap_addr.vpi = 0;
      addr.sap_addr.vci = vci;
  #endif
@@ -60,7 +58,7 @@ Index: br2684ctl-20040226.orig/br2684ctl.c
  	   addr.sap_addr.vpi,
  	   addr.sap_addr.vci,
  	   encap?"VC mux":"LLC");
-@@ -261,11 +269,13 @@
+@@ -261,11 +269,13 @@ int main (int argc, char **argv)
    }
    
    create_pidfile(itfnum);
@@ -75,10 +73,8 @@ Index: br2684ctl-20040226.orig/br2684ctl.c
    return 0;
  }
  
-Index: br2684ctl-20040226.orig/Makefile
+--- /dev/null
-===================================================================
++++ b/Makefile
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ br2684ctl-20040226.orig/Makefile	2007-06-04 13:22:22.215478016 +0200
 @@ -0,0 +1,13 @@
 +OPTS := -O2
 +CFLAGS := -Wall -g

package/br2684ctl/patches/101-routed_support.patch

@@ -1,6 +1,5 @@
-diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
+--- a/br2684ctl.c
---- br2684ctl-20040226.orig/br2684ctl.c	2008-03-25 22:26:59.000000000 +0000
++++ b/br2684ctl.c
-+++ br2684ctl.orig/br2684ctl.c	2008-03-31 10:11:06.000000000 +0100
 @@ -10,6 +10,10 @@
  #include <atm.h>
  #include <linux/atmdev.h>
@@ -52,7 +51,7 @@ diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
    exit(0);
  }
  
-@@ -58,7 +71,7 @@
+@@ -58,7 +71,7 @@ int create_pidfile(int num)
  
    if (num < 0) return -1;
  
@@ -61,7 +60,7 @@ diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
    pidfile = fopen(name, "w");
    if (pidfile == NULL) return -1;
    fprintf(pidfile, "%d", getpid());
-@@ -67,9 +80,9 @@
+@@ -67,9 +80,9 @@ int create_pidfile(int num)
    return 0;
  }
  
@@ -73,7 +72,7 @@ diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
    
    if(lastsock<0) {
      lastsock = socket(PF_ATMPVC, SOCK_DGRAM, ATM_AAL5);
-@@ -78,31 +91,36 @@
+@@ -78,31 +91,36 @@ int create_br(char *nstr)
      syslog(LOG_ERR, "socket creation failed: %s",strerror(errno));
    } else {
      /* create the device with ioctl: */
@@ -118,7 +117,7 @@ diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
  {
      int err;
      struct sockaddr_atmpvc addr;
-@@ -112,21 +130,17 @@
+@@ -112,21 +130,17 @@ int assign_vcc(char *astr, int encap, in
      memset(&addr, 0, sizeof(addr));
      err=text2atm(astr,(struct sockaddr *)(&addr), sizeof(addr), T2A_PVC);
      if (err!=0)
@@ -145,7 +144,7 @@ diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
      
      if (qos.aal == 0) {
        qos.aal                     = ATM_AAL5;
-@@ -137,7 +151,7 @@
+@@ -137,7 +151,7 @@ int assign_vcc(char *astr, int encap, in
      }
  
      if ( (err=setsockopt(fd,SOL_SOCKET,SO_SNDBUF, &bufsize ,sizeof(bufsize))) )
@@ -154,7 +153,7 @@ diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
      
      if (setsockopt(fd, SOL_ATM, SO_ATMQOS, &qos, sizeof(qos)) < 0)
        syslog(LOG_ERR,"setsockopt SO_ATMQOS %d", errno);
-@@ -145,7 +159,7 @@
+@@ -145,7 +159,7 @@ int assign_vcc(char *astr, int encap, in
      err = connect(fd, (struct sockaddr*)&addr, sizeof(struct sockaddr_atmpvc));
      
      if (err < 0)
@@ -163,7 +162,7 @@ diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
      
      /* attach the vcc to device: */
      
-@@ -169,10 +183,30 @@
+@@ -169,10 +183,30 @@ int assign_vcc(char *astr, int encap, in
      return fd ;
  }
  
@@ -195,7 +194,7 @@ diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
    exit(1);
  }
  
-@@ -180,47 +214,63 @@
+@@ -180,47 +214,63 @@ void usage(char *s)
  
  int main (int argc, char **argv)
  {
@@ -276,7 +275,7 @@ diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
        case '?':
        case 'h':
        default:
-@@ -231,6 +281,8 @@
+@@ -231,6 +281,8 @@ int main (int argc, char **argv)
  
    if (argc != optind) usage(argv[0]);
    
@@ -285,7 +284,7 @@ diff -Nu br2684ctl-20040226.orig/br2684ctl.c br2684ctl.orig/br2684ctl.c
    if(lastsock>=0) close(lastsock);
    
    if (background) {
-@@ -268,11 +275,11 @@
+@@ -268,11 +320,11 @@ int main (int argc, char **argv)
      
    }
    

package/bridge-utils/patches/001-libbridge_cflags.patch

@@ -1,6 +1,6 @@
 --- a/libbridge/Makefile.in
 +++ b/libbridge/Makefile.in
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ AR=ar
  RANLIB=@RANLIB@
  
  CC=@CC@

package/broadcom-wl/patches/100-timer_fix.patch

@@ -1,8 +1,6 @@
-Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
+--- a/router/shared/linux_timer.c
-===================================================================
++++ b/router/shared/linux_timer.c
---- broadcom-wl-4.150.10.5.2.orig/router/shared/linux_timer.c	2008-04-07 00:15:24.914329846 +0200
+@@ -94,6 +94,7 @@ typedef long uclock_t;
-+++ broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c	2008-04-07 00:14:52.288470602 +0200
-@@ -94,6 +94,7 @@
  #define TFLAG_NONE	0
  #define TFLAG_CANCELLED	(1<<0)
  #define TFLAG_DELETED	(1<<1)
@@ -10,7 +8,7 @@ Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
  
  struct event {
      struct timeval it_interval;
-@@ -207,6 +208,7 @@
+@@ -207,6 +208,7 @@ int timer_create(
  
  	event_freelist = event->next;
  	event->next = NULL;
@@ -18,7 +16,7 @@ Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
  
  	check_event_queue();
  
-@@ -387,6 +389,7 @@
+@@ -387,6 +389,7 @@ int timer_settime
  	}
  
  	event->flags &= ~TFLAG_CANCELLED;
@@ -26,7 +24,7 @@ Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
  
  	unblock_timer();
  
-@@ -502,7 +505,15 @@
+@@ -502,7 +505,15 @@ static void alarm_handler(int i)
  		(*(event->func))((timer_t) event, (int)event->arg);
  
  		/* If the event has been cancelled, do NOT put it back on the queue. */
@@ -43,7 +41,7 @@ Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
  
  			/* if the event is a recurring event, reset the timer and
  			 * find its correct place in the sorted list of events.
-@@ -545,6 +556,7 @@
+@@ -545,6 +556,7 @@ static void alarm_handler(int i)
  				/* link our new event into the pending event queue. */
  				event->next = *ppevent;
  				*ppevent = event;

package/busybox/config/networking/Config.in

@@ -144,13 +144,13 @@ config BUSYBOX_CONFIG_HOSTNAME
 
 config BUSYBOX_CONFIG_HTTPD
 	bool "httpd"
-	default y
+	default n
 	help
 	  Serve web pages via an HTTP server.
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES
 	bool "Support 'Ranges:' header"
-	default y
+	default n
 	depends on BUSYBOX_CONFIG_HTTPD
 	help
 	  Makes httpd emit "Accept-Ranges: bytes" header and understand
@@ -177,7 +177,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
 	bool "Enable Basic http Authentication"
-	default y
+	default n
 	depends on BUSYBOX_CONFIG_HTTPD
 	help
 	  Utilizes password settings from /etc/httpd.conf for basic
@@ -185,7 +185,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5
 	bool "Support MD5 crypted passwords for http Authentication"
-	default y
+	default n
 	depends on BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
 	help
 	  Enables basic per URL authentication from /etc/httpd.conf
@@ -193,7 +193,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
 	bool "Support Common Gateway Interface (CGI)"
-	default y
+	default n
 	depends on BUSYBOX_CONFIG_HTTPD
 	help
 	  This option allows scripts and executables to be invoked
@@ -201,7 +201,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
 	bool "Support for running scripts through an interpreter"
-	default y
+	default n
 	depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
 	help
 	  This option enables support for running scripts through an
@@ -212,7 +212,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
 	bool "Set REMOTE_PORT environment variable for CGI"
-	default y
+	default n
 	depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
 	help
 	  Use of this option can assist scripts in generating
@@ -220,7 +220,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
 	bool "Enable -e option (useful for CGIs written as shell scripts)"
-	default y
+	default n
 	depends on BUSYBOX_CONFIG_HTTPD
 	help
 	  This option allows html encoding of arbitrary strings for display
@@ -230,7 +230,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES
 	bool "Support for custom error pages"
-	default y
+	default n
 	depends on BUSYBOX_CONFIG_HTTPD
 	help
 	  This option allows you to define custom error pages in
@@ -243,7 +243,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES
 
 config BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY
 	bool "Support for reverse proxy"
-	default y
+	default n
 	depends on BUSYBOX_CONFIG_HTTPD
 	help
 	  This option allows you to define URLs that will be forwarded

package/busybox/files/httpd

@@ -1,54 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=50
-HTTPD_BIN="/usr/sbin/httpd"
-
-system_config() {
-	local cfg="$1"
-
-	config_get hostname "$cfg" hostname
-}
-
-httpd_config() {
-	local cfg="$1"
-	local c_file port realm home args
-
-	config_get c_file "$cfg" c_file
-	[ -n "$c_file" -a -f "$c_file" ] && append args "-c \"$c_file\""
-	config_get port "$cfg" port
-	append args "-p ${port:-80}"
-	config_get home "$cfg" home
-	home="${home:-/www}"
-	[ -d "$home" ] || return 1
-	append args "-h \"$home\""
-	config_get realm "$cfg" realm
-	realm="${realm:-$hostname}"
-	append args "-r \"$realm\""
-	eval "$HTTPD_BIN $args"
-}
-
-start() {
-	[ -x "$HTTPD_BIN" ] || return 1
-
-	unset hostname
-	config_load system
-	config_foreach system_config system
-	hostname="${hostname:-OpenWrt}"
-
-	unset args
-	config_load httpd
-	[ "$?" != "0" ] && {
-		uci_set_default httpd <<EOF
-config 'httpd'
-	option 'port' '80'
-	option 'home' '/www'
-EOF
-		config_load httpd
-	}
-	config_foreach httpd_config httpd
-}
-
-stop() {
-	killall httpd
-}

package/busybox/patches/460-truncated_ping_results.patch

@@ -1,8 +1,6 @@
-Index: busybox-1.15.3/networking/ping.c
+--- a/networking/ping.c
-===================================================================
++++ b/networking/ping.c
---- busybox-1.15.3.orig/networking/ping.c	2010-02-28 13:47:00.000000000 +0100
+@@ -79,6 +79,7 @@ static int in_cksum(unsigned short *buf,
-+++ busybox-1.15.3/networking/ping.c	2010-02-28 13:47:19.000000000 +0100
-@@ -79,6 +79,7 @@
  /* simple version */
  
  static char *hostname;
@@ -10,7 +8,7 @@ Index: busybox-1.15.3/networking/ping.c
  
  static void noresp(int ign UNUSED_PARAM)
  {
-@@ -91,7 +92,7 @@
+@@ -91,7 +92,7 @@ static void ping4(len_and_sockaddr *lsa)
  	struct sockaddr_in pingaddr;
  	struct icmp *pkt;
  	int pingsock, c;
@@ -19,7 +17,7 @@ Index: busybox-1.15.3/networking/ping.c
  
  	pingsock = create_icmp_socket();
  	pingaddr = lsa->u.sin;
-@@ -101,7 +102,7 @@
+@@ -101,7 +102,7 @@ static void ping4(len_and_sockaddr *lsa)
  	pkt->icmp_type = ICMP_ECHO;
  	pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
  
@@ -28,7 +26,7 @@ Index: busybox-1.15.3/networking/ping.c
  			   (struct sockaddr *) &pingaddr, sizeof(pingaddr));
  
  	/* listen for replies */
-@@ -135,7 +136,7 @@
+@@ -135,7 +136,7 @@ static void ping6(len_and_sockaddr *lsa)
  	struct icmp6_hdr *pkt;
  	int pingsock, c;
  	int sockopt;
@@ -37,7 +35,7 @@ Index: busybox-1.15.3/networking/ping.c
  
  	pingsock = create_icmp6_socket();
  	pingaddr = lsa->u.sin6;
-@@ -147,7 +148,7 @@
+@@ -147,7 +148,7 @@ static void ping6(len_and_sockaddr *lsa)
  	sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
  	setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));
  

package/carl9170/patches/100-request_firmware_compat.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/carl9170/usb.c
 +++ b/drivers/net/wireless/ath/carl9170/usb.c
-@@ -983,11 +983,28 @@ err_failed:
+@@ -988,11 +988,28 @@ err_failed:
  	ar9170_usb_firmware_failed(aru);
  }
  

package/carl9170/patches/110-ht_default.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/carl9170/main.c
 +++ b/drivers/net/wireless/ath/carl9170/main.c
-@@ -50,7 +50,7 @@ static int modparam_nohwcrypt;
+@@ -51,7 +51,7 @@ static int modparam_nohwcrypt;
  module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
  MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
  

package/comgt/patches/001-Makefile.patch

@@ -1,7 +1,5 @@
-Index: comgt.0.32/Makefile
+--- a/Makefile
-===================================================================
++++ b/Makefile
---- comgt.0.32.orig/Makefile	2007-06-04 13:22:22.665409616 +0200
-+++ comgt.0.32/Makefile	2007-06-04 13:22:22.730399736 +0200
 @@ -1,7 +1,6 @@
  #
 -#   Makefile - build and install the comgt package

package/compcache/patches/000-provide_lzo_kmod.patch

@@ -1,6 +1,5 @@
-diff -uNr compcache-org/Makefile compcache-0.6.2/Makefile
+--- a/Makefile
---- compcache-org/Makefile	2010-01-24 17:46:50.000000000 +0100
++++ b/Makefile
-+++ compcache-0.6.2/Makefile	2010-03-18 16:00:41.000000000 +0100
 @@ -1,14 +1,17 @@
  KERNEL_BUILD_PATH ?= "/lib/modules/$(shell uname -r)/build"
  
@@ -20,16 +19,15 @@ diff -uNr compcache-org/Makefile compcache-0.6.2/Makefile
  	make -C sub-projects/rzscontrol
  
  doc:
-@@ -16,5 +19,6 @@
+@@ -16,5 +19,6 @@ doc:
  
  clean:
  	make -C $(KERNEL_BUILD_PATH) M=$(PWD) clean
 +	make -C $(KERNEL_BUILD_PATH) M=$(PWD)/$(LZO) clean
  	make -C sub-projects/rzscontrol clean
  	@rm -rf *.ko
-diff -uNr compcache-org/ramzswap_drv.c compcache-0.6.2/ramzswap_drv.c
+--- a/ramzswap_drv.c
---- compcache-org/ramzswap_drv.c	2010-01-24 17:52:19.000000000 +0100
++++ b/ramzswap_drv.c
-+++ compcache-0.6.2/ramzswap_drv.c	2010-03-18 16:03:23.000000000 +0100
 @@ -23,13 +23,13 @@
  #include <linux/device.h>
  #include <linux/genhd.h>
@@ -45,9 +43,8 @@ diff -uNr compcache-org/ramzswap_drv.c compcache-0.6.2/ramzswap_drv.c
  #include "compat.h"
  #include "ramzswap_drv.h"
  
-diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x.c compcache/sub-projects/compression/lzo-kmod/lzo1x.c
+--- /dev/null
---- compcache-old/sub-projects/compression/lzo-kmod/lzo1x.c	1970-01-01 01:00:00.000000000 +0100
++++ b/sub-projects/compression/lzo-kmod/lzo1x.c
-+++ compcache/sub-projects/compression/lzo-kmod/lzo1x.c	2009-10-17 09:35:59.000000000 +0200
 @@ -0,0 +1,7 @@
 +#include <linux/module.h>
 +
@@ -56,9 +53,8 @@ diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x.c compcache/sub-
 +
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("LZO1X Lib");
-diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c compcache/sub-projects/compression/lzo-kmod/lzo1x_compress.c
+--- /dev/null
---- compcache-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c	1970-01-01 01:00:00.000000000 +0100
++++ b/sub-projects/compression/lzo-kmod/lzo1x_compress.c
-+++ compcache/sub-projects/compression/lzo-kmod/lzo1x_compress.c	2009-10-17 09:35:59.000000000 +0200
 @@ -0,0 +1,227 @@
 +/*
 + *  LZO1X Compressor from MiniLZO
@@ -287,9 +283,8 @@ diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c compc
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("LZO1X-1 Compressor");
 +
-diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c compcache/sub-projects/compression/lzo-kmod/lzo1x_decompress.c
+--- /dev/null
---- compcache-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c	1970-01-01 01:00:00.000000000 +0100
++++ b/sub-projects/compression/lzo-kmod/lzo1x_decompress.c
-+++ compcache/sub-projects/compression/lzo-kmod/lzo1x_decompress.c	2009-10-17 09:35:59.000000000 +0200
 @@ -0,0 +1,255 @@
 +/*
 + *  LZO1X Decompressor from MiniLZO
@@ -546,9 +541,8 @@ diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c com
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("LZO1X Decompressor");
 +
-diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzodefs.h compcache/sub-projects/compression/lzo-kmod/lzodefs.h
+--- /dev/null
---- compcache-old/sub-projects/compression/lzo-kmod/lzodefs.h	1970-01-01 01:00:00.000000000 +0100
++++ b/sub-projects/compression/lzo-kmod/lzodefs.h
-+++ compcache/sub-projects/compression/lzo-kmod/lzodefs.h	2009-10-17 09:35:59.000000000 +0200
 @@ -0,0 +1,43 @@
 +/*
 + *  lzodefs.h -- architecture, OS and compiler specific defines
@@ -593,9 +587,8 @@ diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzodefs.h compcache/su
 +#define DX2(p, s1, s2)	(((((size_t)((p)[2]) << (s2)) ^ (p)[1]) \
 +							<< (s1)) ^ (p)[0])
 +#define DX3(p, s1, s2, s3)	((DX2((p)+1, s2, s3) << (s1)) ^ (p)[0])
-diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo.h compcache/sub-projects/compression/lzo-kmod/lzo.h
+--- /dev/null
---- compcache-old/sub-projects/compression/lzo-kmod/lzo.h	1970-01-01 01:00:00.000000000 +0100
++++ b/sub-projects/compression/lzo-kmod/lzo.h
-+++ compcache/sub-projects/compression/lzo-kmod/lzo.h	2009-10-17 09:35:59.000000000 +0200
 @@ -0,0 +1,44 @@
 +#ifndef __LZO_H__
 +#define __LZO_H__
@@ -641,9 +634,8 @@ diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo.h compcache/sub-pr
 +#define LZO_E_NOT_YET_IMPLEMENTED	(-9)
 +
 +#endif
-diff -uNr compcache-old/sub-projects/compression/lzo-kmod/Makefile compcache/sub-projects/compression/lzo-kmod/Makefile
+--- /dev/null
---- compcache-old/sub-projects/compression/lzo-kmod/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ b/sub-projects/compression/lzo-kmod/Makefile
-+++ compcache/sub-projects/compression/lzo-kmod/Makefile	2009-10-17 09:35:59.000000000 +0200
 @@ -0,0 +1,8 @@
 +obj-m += lzo1x_compress.o lzo1x_decompress.o
 +

package/compcache/patches/001-lzo-speed.patch

@@ -1,7 +1,6 @@
-diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c compcache-0.5.3/sub-projects/compression/lzo-kmod/lzo1x_compress.c
+--- a/sub-projects/compression/lzo-kmod/lzo1x_compress.c
---- compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c	2009-04-20 06:28:30.000000000 +0200
++++ b/sub-projects/compression/lzo-kmod/lzo1x_compress.c
-+++ compcache-0.5.3/sub-projects/compression/lzo-kmod/lzo1x_compress.c	2009-04-20 06:29:21.000000000 +0200
+@@ -62,8 +62,12 @@ _lzo1x_1_do_compress(const unsigned char
-@@ -62,8 +62,12 @@
  		goto literal;
  
  try_match:
@@ -14,7 +13,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c
  			if (likely(m_pos[2] == ip[2]))
  					goto match;
  		}
-@@ -94,9 +98,14 @@
+@@ -94,9 +98,14 @@ match:
  				}
  				*op++ = tt;
  			}
@@ -32,7 +31,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c
  		}
  
  		ip += 3;
-@@ -208,9 +217,14 @@
+@@ -208,9 +217,14 @@ int lzo1x_1_compress(const unsigned char
  
  			*op++ = tt;
  		}
@@ -50,15 +49,14 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c
  	}
  
  	*op++ = M4_MARKER | 1;
-@@ -224,4 +238,3 @@
+@@ -224,4 +238,3 @@ EXPORT_SYMBOL_GPL(lzo1x_1_compress);
  
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("LZO1X-1 Compressor");
 -
-diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress.c compcache-0.5.3/sub-projects/compression/lzo-kmod/lzo1x_decompress.c
+--- a/sub-projects/compression/lzo-kmod/lzo1x_decompress.c
---- compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress.c	2009-04-20 06:28:30.000000000 +0200
++++ b/sub-projects/compression/lzo-kmod/lzo1x_decompress.c
-+++ compcache-0.5.3/sub-projects/compression/lzo-kmod/lzo1x_decompress.c	2009-04-20 06:29:21.000000000 +0200
+@@ -45,10 +45,7 @@ int lzo1x_decompress_safe(const unsigned
-@@ -45,10 +45,7 @@
  			goto output_overrun;
  		if (HAVE_IP(t + 1, ip_end, ip))
  			goto input_overrun;
@@ -70,7 +68,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress
  	}
  
  	while ((ip < ip_end)) {
-@@ -71,30 +68,27 @@
+@@ -71,30 +68,27 @@ int lzo1x_decompress_safe(const unsigned
  		if (HAVE_IP(t + 4, ip_end, ip))
  			goto input_overrun;
  
@@ -116,7 +114,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress
  		t = *ip++;
  		if (t >= 16)
  			goto match;
-@@ -139,8 +133,7 @@
+@@ -139,8 +133,7 @@ match:
  					t += 31 + *ip++;
  				}
  				m_pos = op - 1;
@@ -126,7 +124,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress
  				ip += 2;
  			} else if (t >= 16) {
  				m_pos = op;
-@@ -158,8 +151,7 @@
+@@ -158,8 +151,7 @@ match:
  					}
  					t += 7 + *ip++;
  				}
@@ -136,7 +134,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress
  				ip += 2;
  				if (m_pos == op)
  					goto eof_found;
-@@ -184,21 +176,33 @@
+@@ -184,21 +176,33 @@ match:
  			if (HAVE_OP(t + 3 - 1, op_end, op))
  				goto output_overrun;
  

package/cyassl/Makefile

@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=cyassl
+PKG_VERSION:=1.4.0
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
+PKG_SOURCE_URL:=http://www.yassl.com/
+PKG_MD5SUM:=037397c7df84b9a12e614bf46135df1c
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libcyassl
+  SECTION:=libs
+  SUBMENU:=SSL
+  CATEGORY:=Libraries
+  DEPENDS:=+zlib
+  TITLE:=CyaSSL library
+  URL:=http://www.yassl.com/
+endef
+
+define Package/libcyassl/description
+CyaSSL is an SSL library optimized for small footprint, both on disk and for
+memory use.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--without-zlib \
+	--enable-singleThreaded
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcyassl.{a,so*,la} $(1)/usr/lib/
+endef
+
+define Package/libcyassl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcyassl.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libcyassl))

package/cyassl/patches/100-makefile_dollar_make.patch

@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,7 +4,7 @@ EXTRA_DIST = cyassl.dsp cyassl.dsw certs
+     doc/*.pdf
+ 
+ basic:
+-	cd src; make; cd ../testsuite; make; cd ../
++	cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../
+ 
+ openssl-links:
+ 	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -638,7 +638,7 @@ uninstall-am:
+ 
+ 
+ basic:
+-	cd src; make; cd ../testsuite; make; cd ../
++	cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../
+ 
+ openssl-links:
+ 	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \

package/cyassl/patches/110-makefile_disable_examples_tests.patch

@@ -0,0 +1,53 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,10 +1,10 @@
+-SUBDIRS = src ctaocrypt examples testsuite
++SUBDIRS = src ctaocrypt
+ EXTRA_DIST = cyassl.dsp cyassl.dsw certs/*.pem certs/*.der certs/*.txt \
+     lib/dummy cyassl.sln cyassl.vcproj cyassl-iphone.xcodeproj/project.pbxproj \
+     doc/*.pdf
+ 
+ basic:
+-	cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../
++	cd src; $(MAKE); cd ../
+ 
+ openssl-links:
+ 	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -190,7 +190,7 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src ctaocrypt examples testsuite
++SUBDIRS = src ctaocrypt
+ EXTRA_DIST = cyassl.dsp cyassl.dsw certs/*.pem certs/*.der certs/*.txt \
+     lib/dummy cyassl.sln cyassl.vcproj cyassl-iphone.xcodeproj/project.pbxproj \
+     doc/*.pdf
+@@ -638,7 +638,7 @@ uninstall-am:
+ 
+ 
+ basic:
+-	cd src; $(MAKE); cd ../testsuite; $(MAKE); cd ../
++	cd src; $(MAKE); cd ../
+ 
+ openssl-links:
+ 	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
+--- a/ctaocrypt/Makefile.am
++++ b/ctaocrypt/Makefile.am
+@@ -1,3 +1,3 @@
+-SUBDIRS = src test benchmark
++SUBDIRS = src
+ EXTRA_DIST = ctaocrypt.dsw ctaocrypt.dsp ctaocrypt.sln ctaocrypt.vcproj
+ 
+--- a/ctaocrypt/Makefile.in
++++ b/ctaocrypt/Makefile.in
+@@ -174,7 +174,7 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src test benchmark
++SUBDIRS = src
+ EXTRA_DIST = ctaocrypt.dsw ctaocrypt.dsp ctaocrypt.sln ctaocrypt.vcproj
+ all: all-recursive
+ 

package/cyassl/patches/120-makefile_destdir.patch

@@ -0,0 +1,49 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,14 +8,11 @@ basic:
+ 
+ openssl-links:
+ 	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
+-    ln -s ../src/.libs/libcyassl.a libssl.a; \
+-    ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../
++	ln -s ../src/.libs/libcyassl.a libssl.a; \
++	ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../
+ 
+ install:
+-	mkdir ${prefix}/cyassl; \
+-    mkdir ${prefix}/cyassl/include; \
+-    mkdir ${prefix}/cyassl/include/openssl; \
+-    cp include/openssl/*.h ${prefix}/cyassl/include/openssl; \
+-    make openssl-links; \
+-    mkdir ${prefix}/cyassl/lib; \
+-    cp lib/*.a ${prefix}/cyassl/lib
++	$(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \
++	cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \
++	make openssl-links; \
++	cp -fpR src/.libs/libcyassl.{a,so*} src/libcyassl.la $(DESTDIR)$(libdir)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -642,17 +642,14 @@ basic:
+ 
+ openssl-links:
+ 	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
+-    ln -s ../src/.libs/libcyassl.a libssl.a; \
+-    ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../
++	ln -s ../src/.libs/libcyassl.a libssl.a; \
++	ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../
+ 
+ install:
+-	mkdir ${prefix}/cyassl; \
+-    mkdir ${prefix}/cyassl/include; \
+-    mkdir ${prefix}/cyassl/include/openssl; \
+-    cp include/openssl/*.h ${prefix}/cyassl/include/openssl; \
+-    make openssl-links; \
+-    mkdir ${prefix}/cyassl/lib; \
+-    cp lib/*.a ${prefix}/cyassl/lib
++	$(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \
++	cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \
++	make openssl-links; \
++	cp -fpR src/.libs/libcyassl.{a,so*} src/libcyassl.la $(DESTDIR)$(libdir)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

package/cyassl/patches/130-configure_disable_pthreads_tests.patch

@@ -0,0 +1,444 @@
+--- a/configure
++++ b/configure
+@@ -874,10 +874,6 @@ F77
+ FFLAGS
+ ac_ct_F77
+ LIBTOOL
+-acx_pthread_config
+-PTHREAD_CC
+-PTHREAD_LIBS
+-PTHREAD_CFLAGS
+ LIBOBJS
+ LTLIBOBJS'
+ ac_subst_files=''
+@@ -21946,430 +21942,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-acx_pthread_ok=no
+-
+-# We used to check for pthread.h first, but this fails if pthread.h
+-# requires special compiler flags (e.g. on True64 or Sequent).
+-# It gets checked for in the link test anyway.
+-
+-# First of all, check if the user has set any of the PTHREAD_LIBS,
+-# etcetera environment variables, and if threads linking works using
+-# them:
+-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+-        save_CFLAGS="$CFLAGS"
+-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-        save_LIBS="$LIBS"
+-        LIBS="$PTHREAD_LIBS $LIBS"
+-        { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
+-echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; }
+-        cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char pthread_join ();
+-int
+-main ()
+-{
+-return pthread_join ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  acx_pthread_ok=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-        { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
+-echo "${ECHO_T}$acx_pthread_ok" >&6; }
+-        if test x"$acx_pthread_ok" = xno; then
+-                PTHREAD_LIBS=""
+-                PTHREAD_CFLAGS=""
+-        fi
+-        LIBS="$save_LIBS"
+-        CFLAGS="$save_CFLAGS"
+-fi
+-
+-# We must check for the threads library under a number of different
+-# names; the ordering is very important because some systems
+-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+-# libraries is broken (non-POSIX).
+-
+-# Create a list of thread flags to try.  Items starting with a "-" are
+-# C compiler flags, and other items are library names, except for "none"
+-# which indicates that we try without any flags at all, and "pthread-config"
+-# which is a program returning the flags for the Pth emulation library.
+-
+-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+-
+-# The ordering *is* (sometimes) important.  Some notes on the
+-# individual items follow:
+-
+-# pthreads: AIX (must check this before -lpthread)
+-# none: in case threads are in libc; should be tried before -Kthread and
+-#       other compiler flags to prevent continual compiler warnings
+-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+-# -pthreads: Solaris/gcc
+-# -mthreads: Mingw32/gcc, Lynx/gcc
+-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+-#      doesn't hurt to check since this sometimes defines pthreads too;
+-#      also defines -D_REENTRANT)
+-#      ... -mt is also the pthreads flag for HP/aCC
+-# pthread: Linux, etcetera
+-# --thread-safe: KAI C++
+-# pthread-config: use pthread-config program (for GNU Pth library)
+-
+-case "${host_cpu}-${host_os}" in
+-        *solaris*)
+-
+-        # On Solaris (at least, for some versions), libc contains stubbed
+-        # (non-functional) versions of the pthreads routines, so link-based
+-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+-        # a function called by this macro, so we could check for that, but
+-        # who knows whether they'll stub that too in a future libc.)  So,
+-        # we'll just look for -pthreads and -lpthread first:
+-
+-        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
+-        ;;
+-esac
+-
+-if test x"$acx_pthread_ok" = xno; then
+-for flag in $acx_pthread_flags; do
+-
+-        case $flag in
+-                none)
+-                { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
+-echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; }
+-                ;;
+-
+-                -*)
+-                { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
+-echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; }
+-                PTHREAD_CFLAGS="$flag"
+-                ;;
+-
+-		pthread-config)
+-		# Extract the first word of "pthread-config", so it can be a program name with args.
+-set dummy pthread-config; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_acx_pthread_config+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$acx_pthread_config"; then
+-  ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_acx_pthread_config="yes"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no"
+-fi
+-fi
+-acx_pthread_config=$ac_cv_prog_acx_pthread_config
+-if test -n "$acx_pthread_config"; then
+-  { echo "$as_me:$LINENO: result: $acx_pthread_config" >&5
+-echo "${ECHO_T}$acx_pthread_config" >&6; }
+-else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-		if test x"$acx_pthread_config" = xno; then continue; fi
+-		PTHREAD_CFLAGS="`pthread-config --cflags`"
+-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+-		;;
+-
+-                *)
+-                { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
+-echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; }
+-                PTHREAD_LIBS="-l$flag"
+-                ;;
+-        esac
+-
+-        save_LIBS="$LIBS"
+-        save_CFLAGS="$CFLAGS"
+-        LIBS="$PTHREAD_LIBS $LIBS"
+-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-
+-        # Check for various functions.  We must include pthread.h,
+-        # since some functions may be macros.  (On the Sequent, we
+-        # need a special flag -Kthread to make this header compile.)
+-        # We check for pthread_join because it is in -lpthread on IRIX
+-        # while pthread_create is in libc.  We check for pthread_attr_init
+-        # due to DEC craziness with -lpthreads.  We check for
+-        # pthread_cleanup_push because it is one of the few pthread
+-        # functions on Solaris that doesn't have a non-functional libc stub.
+-        # We try pthread_create on general principles.
+-        cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <pthread.h>
+-int
+-main ()
+-{
+-pthread_t th; pthread_join(th, 0);
+-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
+-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  acx_pthread_ok=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-
+-        LIBS="$save_LIBS"
+-        CFLAGS="$save_CFLAGS"
+-
+-        { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
+-echo "${ECHO_T}$acx_pthread_ok" >&6; }
+-        if test "x$acx_pthread_ok" = xyes; then
+-                break;
+-        fi
+-
+-        PTHREAD_LIBS=""
+-        PTHREAD_CFLAGS=""
+-done
+-fi
+-
+-# Various other checks:
+-if test "x$acx_pthread_ok" = xyes; then
+-        save_LIBS="$LIBS"
+-        LIBS="$PTHREAD_LIBS $LIBS"
+-        save_CFLAGS="$CFLAGS"
+-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-
+-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+-	{ echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5
+-echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; }
+-	attr_name=unknown
+-	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+-	    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <pthread.h>
+-int
+-main ()
+-{
+-int attr=$attr; return attr;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  attr_name=$attr; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-	done
+-        { echo "$as_me:$LINENO: result: $attr_name" >&5
+-echo "${ECHO_T}$attr_name" >&6; }
+-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PTHREAD_CREATE_JOINABLE $attr_name
+-_ACEOF
+-
+-        fi
+-
+-        { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
+-echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
+-        flag=no
+-        case "${host_cpu}-${host_os}" in
+-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+-            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+-        esac
+-        { echo "$as_me:$LINENO: result: ${flag}" >&5
+-echo "${ECHO_T}${flag}" >&6; }
+-        if test "x$flag" != xno; then
+-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+-        fi
+-
+-        LIBS="$save_LIBS"
+-        CFLAGS="$save_CFLAGS"
+-
+-        # More AIX lossage: must compile with xlc_r or cc_r
+-	if test x"$GCC" != xyes; then
+-          for ac_prog in xlc_r cc_r
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$PTHREAD_CC"; then
+-  ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_PTHREAD_CC="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
+-if test -n "$PTHREAD_CC"; then
+-  { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5
+-echo "${ECHO_T}$PTHREAD_CC" >&6; }
+-else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-  test -n "$PTHREAD_CC" && break
+-done
+-test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}"
+-
+-        else
+-          PTHREAD_CC=$CC
+-	fi
+-else
+-        PTHREAD_CC="$CC"
+-fi
+-
+-
+-
+-
+-
+-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+-if test x"$acx_pthread_ok" = xyes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PTHREAD 1
+-_ACEOF
+-
+-        :
+-else
+-        acx_pthread_ok=no
+-
+-fi
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-
+-LIBS="$PTHREAD_LIBS $LIBS"
+-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-
+ 
+ 	{ echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
+ echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; }

package/dropbear/patches/100-pubkey_path.patch

@@ -1,7 +1,6 @@
-diff -ur dropbear-0.52.orig/svr-authpubkey.c dropbear-0.52/svr-authpubkey.c
+--- a/svr-authpubkey.c
---- dropbear-0.52.orig/svr-authpubkey.c	2009-04-08 00:32:16.000000000 +0200
++++ b/svr-authpubkey.c
-+++ dropbear-0.52/svr-authpubkey.c	2009-04-08 00:44:11.000000000 +0200
+@@ -209,17 +209,21 @@ static int checkpubkey(unsigned char* al
-@@ -209,17 +209,21 @@
  		goto out;
  	}
  
@@ -34,7 +33,7 @@ diff -ur dropbear-0.52.orig/svr-authpubkey.c dropbear-0.52/svr-authpubkey.c
  	if (authfile == NULL) {
  		goto out;
  	}
-@@ -372,26 +376,35 @@
+@@ -372,26 +376,35 @@ static int checkpubkeyperms() {
  		goto out;
  	}
  

package/dropbear/patches/110-change_user.patch

@@ -1,8 +1,6 @@
-Index: dropbear-0.52/svr-chansession.c
+--- a/svr-chansession.c
-===================================================================
++++ b/svr-chansession.c
---- dropbear-0.52.orig/svr-chansession.c	2008-04-22 17:29:49.000000000 -0700
+@@ -852,12 +852,12 @@ static void execchild(void *user_data) {
-+++ dropbear-0.52/svr-chansession.c	2008-04-22 17:29:49.000000000 -0700
-@@ -852,12 +852,12 @@
  	/* We can only change uid/gid as root ... */
  	if (getuid() == 0) {
  

package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch

@@ -1,8 +1,6 @@
-Index: dropbear-0.52/cli-runopts.c
+--- a/cli-runopts.c
-===================================================================
++++ b/cli-runopts.c
---- dropbear-0.52.orig/cli-runopts.c	2008-04-22 17:29:49.000000000 -0700
+@@ -271,6 +271,10 @@ void cli_getopts(int argc, char ** argv)
-+++ dropbear-0.52/cli-runopts.c	2008-04-22 17:29:50.000000000 -0700
-@@ -271,6 +271,10 @@
  					debug_trace = 1;
  					break;
  #endif
@@ -13,7 +11,7 @@ Index: dropbear-0.52/cli-runopts.c
  				case 'F':
  				case 'e':
  				case 'c':
-@@ -282,7 +286,6 @@
+@@ -282,7 +286,6 @@ void cli_getopts(int argc, char ** argv)
  #ifndef ENABLE_CLI_LOCALTCPFWD
  				case 'L':
  #endif

package/dropbear/patches/150-dbconvert_standalone.patch

@@ -1,7 +1,5 @@
-Index: dropbear-0.52/options.h
+--- a/options.h
-===================================================================
++++ b/options.h
---- dropbear-0.52.orig/options.h	2008-04-22 17:29:49.000000000 -0700
-+++ dropbear-0.52/options.h	2008-04-22 17:29:50.000000000 -0700
 @@ -5,6 +5,11 @@
  #ifndef _OPTIONS_H_
  #define _OPTIONS_H_

package/e2fsprogs/Makefile

@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.40.11
+PKG_VERSION:=1.41.11
-PKG_MD5SUM:=004cea70d724fdc7f1a952dffe4c9db8
+PKG_MD5SUM:=fb507a40c2706bc38306f150d069e345
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

package/e2fsprogs/patches/001-fix_abs_shlibs_symlinks.patch

@@ -1,11 +0,0 @@
---- a/lib/Makefile.elf-lib
-+++ b/lib/Makefile.elf-lib
-@@ -45,7 +45,7 @@ install-shlibs install:: $(ELF_LIB) inst
- 	@echo "	SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
- 	@$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
- 	@echo "	SYMLINK $(libdir)/$(ELF_IMAGE).so"
--	@$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
-+	@$(LN_S) -f $(ELF_SONAME) \
- 		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
- 	@echo "	LDCONFIG"
- 	@-$(LDCONFIG)

package/fuse/patches/112-no_break_on_mknod.patch

@@ -1,7 +1,6 @@
-diff -Nurp fuse-2.8.1.orig/util/Makefile.in fuse-2.8.1/util/Makefile.in
+--- a/util/Makefile.in
---- fuse-2.8.1.orig/util/Makefile.in	2009-09-11 12:50:00.000000000 +0200
++++ b/util/Makefile.in
-+++ fuse-2.8.1/util/Makefile.in	2009-12-17 01:05:15.720554385 +0100
+@@ -585,7 +585,7 @@ uninstall-am: uninstall-binPROGRAMS unin
-@@ -543,7 +543,7 @@ uninstall-am: uninstall-binPROGRAMS unin
  install-exec-hook:
  	-chown root $(DESTDIR)$(bindir)/fusermount
  	-chmod u+s $(DESTDIR)$(bindir)/fusermount

package/fuse/patches/300-workaround-uclibc-pthread-breakage.patch

@@ -1,6 +1,5 @@
-diff -Nurp fuse-2.8.1.orig/lib/helper.c fuse-2.8.1/lib/helper.c
+--- a/lib/helper.c
---- fuse-2.8.1.orig/lib/helper.c	2009-06-18 13:14:09.000000000 +0200
++++ b/lib/helper.c
-+++ fuse-2.8.1/lib/helper.c	2009-12-17 01:11:32.773356000 +0100
 @@ -180,13 +180,41 @@ err:
  int fuse_daemonize(int foreground)
  {

package/hostapd/Config.in

@@ -10,7 +10,7 @@ config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
 choice
 	prompt "Choose TLS provider"
 	default WPA_SUPPLICANT_INTERNAL
-	depends PACKAGE_wpa-supplicant
+	depends PACKAGE_wpa-supplicant || PACKAGE_wpad
 
 config WPA_SUPPLICANT_INTERNAL
 	bool "internal"

package/hostapd/Makefile

@@ -54,15 +54,16 @@ DRIVER_MAKEOPTS= \
 	CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-mac80211) \
 	CONFIG_DRIVER_MADWIFI=$(CONFIG_PACKAGE_kmod-madwifi) \
 	CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \
-	CONFIG_IEEE80211N=$(CONFIG_PACKAGE_kmod-ath9k)
+	CONFIG_IEEE80211N=$(CONFIG_PACKAGE_kmod-ath9k) \
-
+	CONFIG_IEEE80211W=$(CONFIG_PACKAGE_kmod-ath9k)
-ifeq ($(LOCAL_TYPE),supplicant)
-  ifeq ($(LOCAL_VARIANT),full)
-    DRIVER_MAKEOPTS += $(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),CONFIG_TLS=openssl)
-  endif
-endif
 
 ifneq ($(LOCAL_TYPE),hostapd)
+  ifdef CONFIG_WPA_SUPPLICANT_OPENSSL
+    ifeq ($(LOCAL_VARIANT),full)
+      DRIVER_MAKEOPTS += CONFIG_TLS=openssl
+      TARGET_LDFLAGS += -lcrypto -lssl
+    endif
+  endif
   ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
     TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK
   endif
@@ -70,12 +71,14 @@ ifneq ($(LOCAL_TYPE),hostapd)
 	CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch)
 endif
 
+DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
+
 define Package/hostapd/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator
   URL:=http://hostap.epitest.fi/
-  DEPENDS:= +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
+  DEPENDS:=$(DRV_DEPENDS)
   MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 endef
 
@@ -116,13 +119,13 @@ define Package/wpad/Default
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator/Supplicant
   URL:=http://hostap.epitest.fi/
-  DEPENDS:= +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
   MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 endef
 
 define Package/wpad
 $(call Package/wpad/Default)
   TITLE+= (full)
+  DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl
   VARIANT:=wpad-full
 endef
 
@@ -134,6 +137,7 @@ endef
 define Package/wpad-mini
 $(call Package/wpad/Default)
   TITLE+= (WPA-PSK only)
+  DEPENDS:=$(DRV_DEPENDS)
   VARIANT:=wpad-mini
 endef
 
@@ -146,7 +150,7 @@ define Package/wpa-supplicant
   CATEGORY:=Network
   TITLE:=WPA Supplicant
   URL:=http://hostap.epitest.fi/wpa_supplicant/
-  DEPENDS:= +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
+  DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl
   VARIANT:=supplicant-full
   MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 endef
@@ -162,7 +166,7 @@ endef
 define Package/wpa-supplicant-mini
   $(Package/wpa-supplicant)
   TITLE:=WPA Supplicant (minimal version)
-  DEPENDS:=$(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),+libopenssl)
+  DEPENDS:=$(DRV_DEPENDS)
   VARIANT:=supplicant-mini
 endef
 

package/hostapd/files/hostapd.sh

@@ -106,6 +106,21 @@ hostapd_set_bss_options() {
 	append "$var" "ssid=$ssid" "$N"
 	[ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N"
 	[ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N"
+
+	[ "$wpa" -ge "2" ] && config_get ieee80211w "$vif" ieee80211w
+	case "$ieee80211w" in
+		[012])
+			append "$var" "ieee80211w=$ieee80211w" "$N"
+			[ "$ieee80211w" -gt "0" ] && {
+				config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout
+				config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout
+				[ -n "$ieee80211w_max_timeout" ] && \
+					append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
+				[ -n "$ieee80211w_retry_timeout" ] && \
+					append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N"
+			}
+		;;
+	esac
 }
 
 hostapd_setup_vif() {

package/hostapd/files/wpa_supplicant-full.config

@@ -301,7 +301,7 @@ CONFIG_PEERKEY=y
 # This version is an experimental implementation based on IEEE 802.11w/D1.0
 # draft and is subject to change since the standard has not yet been finalized.
 # Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
+CONFIG_IEEE80211W=y
 
 # Select TLS implementation
 # openssl = OpenSSL (default)

package/hostapd/files/wpa_supplicant.sh

@@ -50,28 +50,25 @@ wpa_supplicant_setup_vif() {
 		*psk*)
 			key_mgmt='WPA-PSK'
 			config_get_bool usepassphrase "$vif" passphrase 1
+			if [ "$usepassphrase" = "1" ]; then
+				passphrase="psk=\"${key}\""
+			else
+				passphrase="psk=${key}"
+			fi
 			case "$enc" in
 				*psk2*)
 					proto='proto=RSN'
-					if [ "$usepassphrase" = "1" ]; then
+					config_get ieee80211w "$vif" ieee80211w
-						passphrase="psk=\"${key}\""
-					else
-						passphrase="psk=${key}"
-					fi
 				;;
 				*psk*)
 					proto='proto=WPA'
-					if [ "$usepassphrase" = "1" ]; then
-						passphrase="psk=\"${key}\""
-					else
-						passphrase="psk=${key}"
-					fi
 				;;
 			esac
 		;;
 		*wpa*|*8021x*)
 			proto='proto=WPA2'
 			key_mgmt='WPA-EAP'
+			config_get ieee80211w "$vif" ieee80211w
 			config_get ca_cert "$vif" ca_cert
 			ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""}
 			case "$eap_type" in
@@ -95,6 +92,13 @@ wpa_supplicant_setup_vif() {
 			eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')"
 		;;
 	esac
+
+	case "$ieee80211w" in
+		[012])
+			ieee80211w="ieee80211w=$ieee80211w"
+		;;
+	esac
+
 	config_get ifname "$vif" ifname
 	config_get bridge "$vif" bridge
 	config_get ssid "$vif" ssid
@@ -109,6 +113,7 @@ network={
 	$bssid
 	key_mgmt=$key_mgmt
 	$proto
+	$ieee80211w
 	$passphrase
 	$pairwise
 	$group

package/hotplug2/patches/100-env_memleak.patch

@@ -1,7 +1,6 @@
-diff -Naur a/action.c b/action.c
+--- a/action.c
---- a/action.c	2009-11-18 13:15:21.000000000 +0000
++++ b/action.c
-+++ b/action.c	2009-11-18 13:11:19.000000000 +0000
+@@ -31,6 +31,30 @@ static void action_dumb(const struct set
-@@ -31,6 +31,30 @@
  }
  
  /**
@@ -32,7 +31,7 @@ diff -Naur a/action.c b/action.c
   * Choose what action should be taken according to passed settings.
   *
   * @1 Hotplug settings
-@@ -41,16 +65,25 @@
+@@ -41,16 +65,25 @@ static void action_dumb(const struct set
   */
  void action_perform(struct settings_t *settings, struct uevent_t *event) {
  	int i;

package/hotplug2/patches/110-static_worker.patch

@@ -1,6 +1,5 @@
-diff -Naur a/common.mak b/common.mak
+--- a/common.mak
---- a/common.mak	2009-11-18 13:15:21.000000000 +0000
++++ b/common.mak
-+++ b/common.mak	2009-11-18 13:25:18.000000000 +0000
 @@ -1,7 +1,7 @@
  # vim:set sw=8 nosta:
  
@@ -10,10 +9,9 @@ diff -Naur a/common.mak b/common.mak
  
  CFLAGS=$(COPTS)
  FPIC=-fPIC
-diff -Naur a/Makefile b/Makefile
+--- a/Makefile
---- a/Makefile	2009-11-18 13:15:21.000000000 +0000
++++ b/Makefile
-+++ b/Makefile	2009-11-18 13:25:18.000000000 +0000
+@@ -40,5 +40,6 @@ ifdef STATIC_WORKER
-@@ -40,5 +40,6 @@
    CFLAGS += -DSTATIC_WORKER=1
  else
    CFLAGS += $(FPIC)

package/ifxmips-dsl-api/Config.in

@@ -19,5 +19,6 @@ endchoice
 
 config IFXMIPS_DSL_DEBUG
 	bool "ifxmips-dsl debugging"
+	depends on PACKAGE_kmod-ifxmips-dsl-api
 	help
 	  Say Y, if you need ifxmips-dsl to display debug messages.

package/ifxmips-dsl-api/Makefile

@@ -117,6 +117,11 @@ define Build/Prepare
 	$(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(FW_BASE_NAME)_b-$(FW_B_VER).tar.gz
 endef
 
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); aclocal && autoconf && automake)
+	$(call Build/Configure/Default)
+endef
+
 define Build/Compile
 	cd $(LINUX_DIR); \
 		ARCH=mips CROSS_COMPILE="$(KERNEL_CROSS)" \

package/ifxmips-dsl-api/patches/100-dsl_compat.patch

@@ -1,7 +1,5 @@
-Index: drv_dsl_cpe_api-3.24.4.4/src/include/drv_dsl_cpe_device_danube.h
+--- a/src/include/drv_dsl_cpe_device_danube.h
-===================================================================
++++ b/src/include/drv_dsl_cpe_device_danube.h
---- drv_dsl_cpe_api-3.24.4.4.orig/src/include/drv_dsl_cpe_device_danube.h	2009-05-12 20:02:16.000000000 +0200
-+++ drv_dsl_cpe_api-3.24.4.4/src/include/drv_dsl_cpe_device_danube.h	2009-11-01 00:57:23.000000000 +0100
 @@ -24,7 +24,7 @@
     #include "drv_dsl_cpe_simulator_danube.h"
  #else
@@ -11,10 +9,8 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/include/drv_dsl_cpe_device_danube.h
  #endif /* defined(DSL_CPE_SIMULATOR_DRIVER) && defined(WIN32)*/
  
  #define DSL_MAX_LINE_NUMBER 1
-Index: drv_dsl_cpe_api-3.24.4.4/src/common/drv_dsl_cpe_os_linux.c
+--- a/src/common/drv_dsl_cpe_os_linux.c
-===================================================================
++++ b/src/common/drv_dsl_cpe_os_linux.c
---- drv_dsl_cpe_api-3.24.4.4.orig/src/common/drv_dsl_cpe_os_linux.c	2009-11-01 01:00:08.000000000 +0100
-+++ drv_dsl_cpe_api-3.24.4.4/src/common/drv_dsl_cpe_os_linux.c	2009-11-01 01:03:51.000000000 +0100
 @@ -11,6 +11,7 @@
  #ifdef __LINUX__
  
@@ -23,7 +19,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/common/drv_dsl_cpe_os_linux.c
  
  #include "drv_dsl_cpe_api.h"
  #include "drv_dsl_cpe_api_ioctl.h"
-@@ -1058,6 +1059,7 @@
+@@ -1058,6 +1059,7 @@ static void DSL_DRV_DebugInit(void)
  /* Entry point of driver */
  int __init DSL_ModuleInit(void)
  {
@@ -31,7 +27,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/common/drv_dsl_cpe_os_linux.c
     DSL_int_t i;
  
     printk(DSL_DRV_CRLF DSL_DRV_CRLF "Infineon CPE API Driver version: %s" DSL_DRV_CRLF,
-@@ -1104,7 +1106,8 @@
+@@ -1104,7 +1106,8 @@ int __init DSL_ModuleInit(void)
     }
  
     DSL_DRV_DevNodeInit();

package/ifxmips-dsl-api/patches/200-mei_compat.patch

@@ -1,7 +1,5 @@
-Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
+--- a/src/mei/ifxmips_mei.c
-===================================================================
++++ b/src/mei/ifxmips_mei.c
---- drv_dsl_cpe_api-3.24.4.4.orig/src/mei/ifxmips_mei.c	2009-10-31 23:30:20.000000000 +0100
-+++ drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c	2010-01-24 14:21:32.000000000 +0100
 @@ -41,18 +41,20 @@
  #include <linux/init.h>
  #include <linux/ioport.h>
@@ -39,7 +37,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
  #define IFX_MEI_EMSG(fmt, args...) printk(KERN_ERR  "[%s %d]: " fmt,__FUNCTION__, __LINE__, ## args)
  #define IFX_MEI_DMSG(fmt, args...) printk(KERN_INFO "[%s %d]: " fmt,__FUNCTION__, __LINE__, ## args)
  
-@@ -173,7 +175,8 @@
+@@ -173,7 +175,8 @@ static u32 *mei_arc_swap_buff = NULL;	//
  extern void ifxmips_mask_and_ack_irq(unsigned int irq_nr);
  #define MEI_MASK_AND_ACK_IRQ ifxmips_mask_and_ack_irq
  
@@ -49,7 +47,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
  
  static struct file_operations bsp_mei_operations = {
        owner:THIS_MODULE,
-@@ -2294,10 +2297,10 @@
+@@ -2294,10 +2297,10 @@ IFX_MEI_InitDevice (int num)
  		IFX_MEI_EMSG ("request_irq %d failed!\n", pDev->nIrq[IFX_DFEIR]);
  		return -1;
  	}
@@ -62,7 +60,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
  //	IFX_MEI_DMSG("Device %d initialized. IER %#x\n", num, bsp_get_irq_ier(pDev->nIrq[IFX_DYING_GASP]));
  	return 0;
  }
-@@ -2922,6 +2925,7 @@
+@@ -2922,6 +2925,7 @@ int __init
  IFX_MEI_ModuleInit (void)
  {
  	int i = 0;
@@ -70,7 +68,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
  
  	printk ("IFX MEI Version %ld.%02ld.%02ld", bsp_mei_version.major, bsp_mei_version.minor, bsp_mei_version.revision);
  
-@@ -2935,14 +2939,15 @@
+@@ -2935,14 +2939,15 @@ IFX_MEI_ModuleInit (void)
  		IFX_MEI_InitProcFS (i);
  #endif
  	}
@@ -88,7 +86,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_mei.c
  	return 0;
  }
  
-@@ -2996,3 +3001,5 @@
+@@ -2996,3 +3001,5 @@ EXPORT_SYMBOL (DSL_BSP_EventCBUnregister
  
  module_init (IFX_MEI_ModuleInit);
  module_exit (IFX_MEI_ModuleExit);

package/ifxmips-dsl-api/patches/300-atm_compat.patch

@@ -1,7 +1,5 @@
-Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_core.c
+--- a/src/mei/ifxmips_atm_core.c
-===================================================================
++++ b/src/mei/ifxmips_atm_core.c
---- drv_dsl_cpe_api-3.24.4.4.orig/src/mei/ifxmips_atm_core.c	2009-11-01 14:29:05.000000000 +0100
-+++ drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_core.c	2009-11-01 16:07:46.000000000 +0100
 @@ -58,9 +58,8 @@
  /*
   *  Chip Specific Head File
@@ -14,7 +12,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_core.c
  #include "ifxmips_atm_core.h"
  
  
-@@ -1146,7 +1145,7 @@
+@@ -1146,7 +1145,7 @@ static INLINE void mailbox_signal(unsign
  
  static void set_qsb(struct atm_vcc *vcc, struct atm_qos *qos, unsigned int queue)
  {
@@ -23,7 +21,7 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_core.c
      unsigned int qsb_qid = queue + FIRST_QSB_QID;
      union qsb_queue_parameter_table qsb_queue_parameter_table = {{0}};
      union qsb_queue_vbr_parameter_table qsb_queue_vbr_parameter_table = {{0}};
-@@ -1318,7 +1317,7 @@
+@@ -1318,7 +1317,7 @@ static void set_qsb(struct atm_vcc *vcc,
  
  static void qsb_global_set(void)
  {
@@ -32,15 +30,13 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_core.c
      int i;
      unsigned int tmp1, tmp2, tmp3;
  
-@@ -2505,3 +2504,4 @@
+@@ -2505,3 +2504,4 @@ static void __exit ifx_atm_exit(void)
  
  module_init(ifx_atm_init);
  module_exit(ifx_atm_exit);
 +MODULE_LICENSE("Dual BSD/GPL");
-Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_ppe_common.h
+--- a/src/mei/ifxmips_atm_ppe_common.h
-===================================================================
++++ b/src/mei/ifxmips_atm_ppe_common.h
---- drv_dsl_cpe_api-3.24.4.4.orig/src/mei/ifxmips_atm_ppe_common.h	2009-11-01 14:30:55.000000000 +0100
-+++ drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_ppe_common.h	2009-11-01 15:58:50.000000000 +0100
 @@ -1,9 +1,10 @@
  #ifndef IFXMIPS_ATM_PPE_COMMON_H
  #define IFXMIPS_ATM_PPE_COMMON_H
@@ -63,10 +59,8 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_ppe_common.h
  /*
   *  Code/Data Memory (CDM) Interface Configuration Register
   */
-Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_core.h
+--- a/src/mei/ifxmips_atm_core.h
-===================================================================
++++ b/src/mei/ifxmips_atm_core.h
---- drv_dsl_cpe_api-3.24.4.4.orig/src/mei/ifxmips_atm_core.h	2009-11-01 14:30:55.000000000 +0100
-+++ drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_core.h	2009-11-01 15:58:50.000000000 +0100
 @@ -25,8 +25,8 @@
  #define IFXMIPS_ATM_CORE_H
  
@@ -78,10 +72,8 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_core.h
  #include "ifxmips_atm_ppe_common.h"
  #include "ifxmips_atm_fw_regs_common.h"
  
-Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_compat.h
+--- /dev/null
-===================================================================
++++ b/src/mei/ifxmips_compat.h
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_compat.h	2009-11-01 15:58:50.000000000 +0100
 @@ -0,0 +1,43 @@
 +#ifndef _IFXMIPS_COMPAT_H__
 +#define _IFXMIPS_COMPAT_H__
@@ -126,10 +118,8 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_compat.h
 +#define CONFIG_IFXMIPS_DSL_CPE_MEI	y
 +
 +#endif
-Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_ppe_danube.h
+--- a/src/mei/ifxmips_atm_ppe_danube.h
-===================================================================
++++ b/src/mei/ifxmips_atm_ppe_danube.h
---- drv_dsl_cpe_api-3.24.4.4.orig/src/mei/ifxmips_atm_ppe_danube.h	2009-11-01 14:30:55.000000000 +0100
-+++ drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_ppe_danube.h	2009-11-01 15:58:50.000000000 +0100
 @@ -1,7 +1,7 @@
  #ifndef IFXMIPS_ATM_PPE_DANUBE_H
  #define IFXMIPS_ATM_PPE_DANUBE_H
@@ -148,10 +138,8 @@ Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_ppe_danube.h
  
  
  
-Index: drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_danube.c
+--- a/src/mei/ifxmips_atm_danube.c
-===================================================================
++++ b/src/mei/ifxmips_atm_danube.c
---- drv_dsl_cpe_api-3.24.4.4.orig/src/mei/ifxmips_atm_danube.c	2009-11-01 14:29:18.000000000 +0100
-+++ drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_danube.c	2009-11-01 15:58:50.000000000 +0100
 @@ -45,10 +45,9 @@
  /*
   *  Chip Specific Head File

package/ifxmips-dsl-api/patches/400-debug-output.patch

@@ -1,6 +1,6 @@
---- drv_dsl_cpe_api-3.24.4.4.orig/src/mei/ifxmips_mei.c	2010-03-14 02:59:49.000000000 +0100
+--- a/src/mei/ifxmips_mei.c
-+++ drv_dsl_cpe_api-3.24.4.4/src/mei//ifxmips_mei.c	2010-03-14 03:02:13.000000000 +0100
++++ b/src/mei/ifxmips_mei.c
-@@ -78,8 +78,8 @@
+@@ -79,8 +79,8 @@
  #define ifxmips_w32(val, reg)                   __raw_writel(val, reg)
  #define ifxmips_w32_mask(clear, set, reg)       ifxmips_w32((ifxmips_r32(reg) & ~clear) | set, reg)
  */
@@ -11,7 +11,7 @@
  
  #ifdef CONFIG_IFXMIPS_MEI_FW_LOOPBACK
  //#define DFE_MEM_TEST
-@@ -1300,7 +1300,7 @@ IFX_MEI_RunAdslModem (DSL_DEV_Device_t *
+@@ -1301,7 +1301,7 @@ IFX_MEI_RunAdslModem (DSL_DEV_Device_t *
  			IFX_MEI_EMSG (">>> malloc fail for codeswap buff!!! <<<\n");
  			return DSL_DEV_MEI_ERR_FAILURE;
  		}
@@ -20,7 +20,7 @@
  	}
  
  	DSL_DEV_PRIVATE(pDev)->img_hdr =
-@@ -1475,7 +1475,7 @@ IFX_MEI_DFEMemoryFree (DSL_DEV_Device_t 
+@@ -1476,7 +1476,7 @@ IFX_MEI_DFEMemoryFree (DSL_DEV_Device_t 
          }
  
  	if(mei_arc_swap_buff != NULL){
@@ -29,7 +29,7 @@
  		kfree(mei_arc_swap_buff);
  		mei_arc_swap_buff=NULL;
  	}
-@@ -1495,7 +1495,7 @@ IFX_MEI_DFEMemoryAlloc (DSL_DEV_Device_t
+@@ -1496,7 +1496,7 @@ IFX_MEI_DFEMemoryAlloc (DSL_DEV_Device_t
  //		DSL_DEV_PRIVATE(pDev)->adsl_mem_info;
  	int allocate_size = SDRAM_SEGMENT_SIZE;
  
@@ -38,7 +38,7 @@
  	// Alloc Swap Pages
  	for (idx = 0; size > 0 && idx < MAX_BAR_REGISTERS; idx++) {
  		// skip bar15 for XDATA usage.
-@@ -1595,7 +1595,7 @@ DSL_BSP_FWDownload (DSL_DEV_Device_t * p
+@@ -1596,7 +1596,7 @@ DSL_BSP_FWDownload (DSL_DEV_Device_t * p
  	ssize_t retval = -ENOMEM;
  	int idx = 0;
  
@@ -47,7 +47,7 @@
  
  	if (*loff == 0) {
  		if (size < sizeof (img_hdr_tmp)) {
-@@ -1647,7 +1647,7 @@ DSL_BSP_FWDownload (DSL_DEV_Device_t * p
+@@ -1648,7 +1648,7 @@ DSL_BSP_FWDownload (DSL_DEV_Device_t * p
  			goto error;
  		}
  		adsl_mem_info[XDATA_REGISTER].type = FREE_RELOAD;
@@ -56,7 +56,7 @@
  		IFX_MEI_BarUpdate (pDev, (DSL_DEV_PRIVATE(pDev)->nBar));
  	}
  	else if (DSL_DEV_PRIVATE(pDev)-> image_size == 0) {
-@@ -1926,7 +1926,7 @@ static void
+@@ -1927,7 +1927,7 @@ static void
  WriteMbox (u32 * mboxarray, u32 size)
  {
  	IFX_MEI_DebugWrite (&dsl_devices[0], IMBOX_BASE, mboxarray, size);
@@ -65,7 +65,7 @@
  	IFX_MEI_LongWordWriteOffset (&dsl_devices[0], (u32) ME_ME2ARC_INT, MEI_TO_ARC_MSGAV);
  }
  
-@@ -1935,7 +1935,7 @@ static void
+@@ -1936,7 +1936,7 @@ static void
  ReadMbox (u32 * mboxarray, u32 size)
  {
  	IFX_MEI_DebugRead (&dsl_devices[0], OMBOX_BASE, mboxarray, size);
@@ -74,7 +74,7 @@
  }
  
  static void
-@@ -1965,7 +1965,7 @@ arc_code_page_download (uint32_t arc_cod
+@@ -1966,7 +1966,7 @@ arc_code_page_download (uint32_t arc_cod
  {
  	int count;
  
@@ -83,7 +83,7 @@
  	IFX_MEI_ControlModeSet (&dsl_devices[0], MEI_MASTER_MODE);
  	IFX_MEI_HaltArc (&dsl_devices[0]);
  	IFX_MEI_LongWordWriteOffset (&dsl_devices[0], (u32) ME_DX_AD, 0);
-@@ -2004,21 +2004,21 @@ dfe_loopback_irq_handler (DSL_DEV_Device
+@@ -2005,21 +2005,21 @@ dfe_loopback_irq_handler (DSL_DEV_Device
  	memset (&rd_mbox[0], 0, 10 * 4);
  	ReadMbox (&rd_mbox[0], 6);
  	if (rd_mbox[0] == 0x0) {
@@ -110,7 +110,7 @@
  			}
  		}
  	}
-@@ -2036,21 +2036,21 @@ wait_mem_test_result (void)
+@@ -2037,21 +2037,21 @@ wait_mem_test_result (void)
  	uint32_t mbox[5];
  	mbox[0] = 0;
  
@@ -137,7 +137,7 @@
  	}
  }
  
-@@ -2066,7 +2066,7 @@ arc_ping_testing (DSL_DEV_Device_t *pDev
+@@ -2067,7 +2067,7 @@ arc_ping_testing (DSL_DEV_Device_t *pDev
  		rd_mbox[i] = 0;
  	}
  
@@ -146,7 +146,7 @@
  	wr_mbox[0] = MEI_PING;
  	WriteMbox (&wr_mbox[0], 10);
  
-@@ -2074,7 +2074,7 @@ arc_ping_testing (DSL_DEV_Device_t *pDev
+@@ -2075,7 +2075,7 @@ arc_ping_testing (DSL_DEV_Device_t *pDev
  		MEI_WAIT (100);
  	}
  
@@ -155,7 +155,7 @@
  	got_int = 0;
  
  	wr_mbox[0] = 0x4;
-@@ -2093,14 +2093,14 @@ arc_ping_testing (DSL_DEV_Device_t *pDev
+@@ -2094,14 +2094,14 @@ arc_ping_testing (DSL_DEV_Device_t *pDev
  	IFX_MEI_LongWordWriteOffset (&dsl_devices[0],
  					   (u32) ME_ME2ARC_INT,
  					   MEI_TO_ARC_MSGAV);
@@ -173,7 +173,7 @@
  			got_int = 0;
  			//schedule();
  			DSL_ENABLE_IRQ (pDev->nIrq[IFX_DFEIR]);
-@@ -2151,7 +2151,7 @@ DFE_Loopback_Test (void)
+@@ -2152,7 +2152,7 @@ DFE_Loopback_Test (void)
  			DSL_DEV_PRIVATE(pDev)->adsl_mem_info[idx].type = FREE_RELOAD;
  			IFX_MEI_WRITE_REGISTER_L ((((uint32_t) DSL_DEV_PRIVATE(pDev)->adsl_mem_info[idx].address) & 0x0fffffff),
  							IFXMIPS_MEI_BASE_ADDR + ME_XMEM_BAR_BASE  + idx * 4);
@@ -182,7 +182,7 @@
  				IFXMIPS_MEI_BASE_ADDR + ME_XMEM_BAR_BASE  +
  				idx * 4, (((uint32_t)
  					   ((ifx_mei_device_private_t *)
-@@ -2168,20 +2168,20 @@ DFE_Loopback_Test (void)
+@@ -2169,20 +2169,20 @@ DFE_Loopback_Test (void)
  		return DSL_DEV_MEI_ERR_FAILURE;
  	}
  	//WriteARCreg(AUX_IC_CTRL,2);
@@ -207,7 +207,7 @@
  	memcpy ((u8 *) (DSL_DEV_PRIVATE(pDev)->
  			adsl_mem_info[0].address + 0x1004),
  		&arc_ahb_access_code[0], sizeof (arc_ahb_access_code));
-@@ -2189,13 +2189,13 @@ DFE_Loopback_Test (void)
+@@ -2190,13 +2190,13 @@ DFE_Loopback_Test (void)
  
  #endif //DFE_PING_TEST
  
@@ -223,7 +223,7 @@
  #endif //DFE_MEM_TEST
  #ifdef DFE_ATM_LOOPBACK
  	arc_debug_data = 0xf;
-@@ -2214,7 +2214,7 @@ DFE_Loopback_Test (void)
+@@ -2215,7 +2215,7 @@ DFE_Loopback_Test (void)
  	IFX_MEI_DebugWrite (&dsl_devices[0], 0x32010, &arc_debug_data, 1);
  #endif //DFE_ATM_LOOPBACK
  	IFX_MEI_IRQEnable (pDev);
@@ -232,7 +232,7 @@
  	IFX_MEI_RunArc (&dsl_devices[0]);
  
  #ifdef DFE_PING_TEST
-@@ -2525,7 +2525,7 @@ IFX_MEI_Ioctls (DSL_DEV_Device_t * pDev,
+@@ -2526,7 +2526,7 @@ IFX_MEI_Ioctls (DSL_DEV_Device_t * pDev,
  		break;
  
  	case DSL_FIO_BSP_DSL_START:
@@ -241,7 +241,7 @@
  		if ((meierr = IFX_MEI_RunAdslModem (pDev)) != DSL_DEV_MEI_ERR_SUCCESS) {
  			IFX_MEI_EMSG ("IFX_MEI_RunAdslModem() error...");
  			meierr = DSL_DEV_MEI_ERR_FAILURE;
-@@ -2926,11 +2926,11 @@ IFX_MEI_ModuleInit (void)
+@@ -2927,11 +2927,11 @@ IFX_MEI_ModuleInit (void)
  	int i = 0;
  	static struct class *dsl_class;
  
@@ -255,7 +255,7 @@
  			return -EIO;
  		}
  		IFX_MEI_InitDevNode (i);
-@@ -2942,7 +2942,7 @@ IFX_MEI_ModuleInit (void)
+@@ -2943,7 +2943,7 @@ IFX_MEI_ModuleInit (void)
  		dsl_bsp_event_callback[i].function = NULL;
  
  #ifdef CONFIG_IFXMIPS_MEI_FW_LOOPBACK
@@ -264,9 +264,9 @@
  	DFE_Loopback_Test ();
  #endif
  	dsl_class = class_create(THIS_MODULE, "ifx_mei");
---- drv_dsl_cpe_api-3.24.4.4.orig/src/mei/ifxmips_atm_core.c	2010-03-13 16:42:49.000000000 +0100
+--- a/src/mei/ifxmips_atm_core.c
-+++ drv_dsl_cpe_api-3.24.4.4/src/mei/ifxmips_atm_core.c	2010-03-14 03:39:05.000000000 +0100
++++ b/src/mei/ifxmips_atm_core.c
-@@ -2336,7 +2335,7 @@ static int atm_showtime_enter(struct por
+@@ -2335,7 +2335,7 @@ static int atm_showtime_enter(struct por
      IFX_REG_W32(0x0F, UTP_CFG);
  #endif
  
@@ -275,7 +275,7 @@
  
      return IFX_SUCCESS;
  }
-@@ -2352,7 +2351,7 @@ static int atm_showtime_exit(void)
+@@ -2351,7 +2351,7 @@ static int atm_showtime_exit(void)
      //  TODO: ReTX clean state
      g_xdata_addr = NULL;
  
@@ -284,4 +284,3 @@
  
      return IFX_SUCCESS;
  }
-

package/ifxmips-dsl-api/patches/500-portability.patch

@@ -0,0 +1,184 @@
+--- a/configure.in
++++ b/configure.in
+@@ -333,12 +333,12 @@ AC_ARG_ENABLE(ifxos-include,
+             echo Set the lib_ifxos include path $enableval
+             AC_SUBST([IFXOS_INCLUDE_PATH],[$enableval])
+         else
+-            echo -e Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
++            echo Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
+             AC_SUBST([IFXOS_INCLUDE_PATH],[$DEFAULT_IFXOS_INCLUDE_PATH])
+         fi
+     ],
+     [
+-        echo -e Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
++        echo Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
+         AC_SUBST([IFXOS_INCLUDE_PATH],[$DEFAULT_IFXOS_INCLUDE_PATH])
+     ]
+ )
+@@ -1702,73 +1702,73 @@ dnl Set the configure params for dist ch
+ AC_SUBST([DISTCHECK_CONFIGURE_PARAMS],[$CONFIGURE_OPTIONS])
+ 
+ AC_CONFIG_COMMANDS_PRE([
+-echo -e "------------------------------------------------------------------------"
+-echo -e " Configuration for drv_dsl_cpe_api:"
+-echo -e "  Configure model type:             $DSL_CONFIG_MODEL_TYPE"
+-echo -e "  Source code location:             $srcdir"
+-echo -e "  Compiler:                         $CC"
+-echo -e "  Compiler c-flags:                 $CFLAGS"
+-echo -e "  Extra compiler c-flags:           $EXTRA_DRV_CFLAGS"
+-echo -e "  Host System Type:                 $host"
+-echo -e "  Install path:                     $prefix"
+-echo -e "  Linux kernel include path:        $KERNEL_INCL_PATH"
+-echo -e "  Linux kernel build path:          $KERNEL_BUILD_PATH"
+-echo -e "  Linux kernel architecture:        $KERNEL_ARCH"
+-echo -e "  Include IFXOS:                    $INCLUDE_DSL_CPE_API_IFXOS_SUPPORT"
+-echo -e "  IFXOS include path:               $IFXOS_INCLUDE_PATH"
+-echo -e "  Driver Include Path               $DSL_DRIVER_INCL_PATH"
+-echo -e "  DSL device:                       $DSL_DEVICE_NAME"
+-echo -e "  Max device number:                $DSL_DRV_MAX_DEVICE_NUMBER"
+-echo -e "  Channels per line:                $DSL_CHANNELS_PER_LINE"
+-echo -e "  Build lib (only for kernel 2.6)   $DSL_CPE_API_LIBRARY_BUILD_2_6"
+-echo -e "  DSL data led flash frequency:     $DSL_DATA_LED_FLASH_FREQUENCY Hz"
+-echo -e "  Disable debug prints:             $DSL_DEBUG_DISABLE"
+-echo -e "  Preselection of max. debug level: $DSL_DBG_MAX_LEVEL_SET"
+-echo -e "  Preselected max. debug level:     $DSL_DBG_MAX_LEVEL_PRE"
+-echo -e "  Include deprecated functions:     $INCLUDE_DEPRECATED"
+-echo -e "  Include Device Exception Codes:   $INCLUDE_DEVICE_EXCEPTION_CODES"
+-echo -e "  Include FW request support:       $INCLUDE_FW_REQUEST_SUPPORT"
+-echo -e "  Include ADSL trace buffer:        $INCLUDE_DSL_CPE_TRACE_BUFFER"
+-echo -e "  Include ADSL MIB:                 $INCLUDE_DSL_ADSL_MIB"
+-echo -e "  Include ADSL LED:                 $INCLUDE_ADSL_LED"
+-echo -e "  Include CEOC:                     $INCLUDE_DSL_CEOC"
+-echo -e "  Include config get support:       $INCLUDE_DSL_CONFIG_GET"
+-echo -e "  Include System i/f configuration: $INCLUDE_DSL_SYSTEM_INTERFACE"
+-echo -e "  Include Resource Statistics:      $INCLUDE_DSL_RESOURCE_STATISTICS"
+-echo -e "  Include Framing Parameters:       $INCLUDE_DSL_FRAMING_PARAMETERS"
+-echo -e "  Include G997 Line Inventory:      $INCLUDE_DSL_G997_LINE_INVENTORY"
+-echo -e "  Include G997 Framing Parameters:  $INCLUDE_DSL_G997_FRAMING_PARAMETERS"
+-echo -e "  Include G997 per tone data:       $INCLUDE_DSL_G997_PER_TONE"
+-echo -e "  Include G997 status:              $INCLUDE_DSL_G997_STATUS"
+-echo -e "  Include G997 alarm:               $INCLUDE_DSL_G997_ALARM"
+-echo -e "  Include DSL Bonding:              $INCLUDE_DSL_BONDING"
+-echo -e "  Include Misc Line Status          $INCLUDE_DSL_CPE_MISC_LINE_STATUS"
+-echo -e "  Include DELT:                     $INCLUDE_DSL_DELT"
+-echo -e "  Include DELT data static storage: $DSL_CPE_STATIC_DELT_DATA"
+-echo -e "  Include PM:                       $INCLUDE_DSL_PM"
+-echo -e "  Include PM config:                $INCLUDE_DSL_CPE_PM_CONFIG"
+-echo -e "  Include PM total:                 $INCLUDE_DSL_CPE_PM_TOTAL_COUNTERS"
+-echo -e "  Include PM history:               $INCLUDE_DSL_CPE_PM_HISTORY"
+-echo -e "  Include PM showtime:              $INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS"
+-echo -e "  Include PM optional:              $INCLUDE_DSL_CPE_PM_OPTIONAL_PARAMETERS"
+-echo -e "  Include PM line:                  $INCLUDE_DSL_CPE_PM_LINE_COUNTERS"
+-echo -e "  Include PM line event showtime:   $INCLUDE_DSL_CPE_PM_LINE_EVENT_SHOWTIME_COUNTERS"
+-echo -e "  Include PM channel:               $INCLUDE_DSL_CPE_PM_CHANNEL_COUNTERS"
+-echo -e "  Include PM channel extended:      $INCLUDE_DSL_CPE_PM_CHANNEL_EXT_COUNTERS"
+-echo -e "  Include PM data path:             $INCLUDE_DSL_CPE_PM_DATA_PATH_COUNTERS"
+-echo -e "  Include PM data path failure:     $INCLUDE_DSL_CPE_PM_DATA_PATH_FAILURE_COUNTERS"
+-echo -e "  Include PM ReTx:                  $INCLUDE_DSL_CPE_PM_RETX_COUNTERS"
+-echo -e "  Include PM line threshold:        $INCLUDE_DSL_CPE_PM_LINE_THRESHOLDS"
+-echo -e "  Include PM channel threshold:     $INCLUDE_DSL_CPE_PM_CHANNEL_THRESHOLDS"
+-echo -e "  Include PM data path threshold:   $INCLUDE_DSL_CPE_PM_DATA_PATH_THRESHOLDS"
+-echo -e "  Include PM ReTx threshold:        $INCLUDE_DSL_CPE_PM_RETX_THRESHOLDS"
+-echo -e "  Include FW memory free support:   $INCLUDE_DSL_FIRMWARE_MEMORY_FREE"
+-echo -e "----------------------- deprectated ! ----------------------------------"
+-echo -e "  Include PM line failure:          $INCLUDE_DSL_CPE_PM_LINE_FAILURE_COUNTERS"
+-echo -e ""
+-echo -e " Settings:"
+-echo -e "  Configure options:                $CONFIGURE_OPTIONS"
+-echo -e "------------------------------------------------------------------------"
++echo "------------------------------------------------------------------------"
++echo " Configuration for drv_dsl_cpe_api:"
++echo "  Configure model type:             $DSL_CONFIG_MODEL_TYPE"
++echo "  Source code location:             $srcdir"
++echo "  Compiler:                         $CC"
++echo "  Compiler c-flags:                 $CFLAGS"
++echo "  Extra compiler c-flags:           $EXTRA_DRV_CFLAGS"
++echo "  Host System Type:                 $host"
++echo "  Install path:                     $prefix"
++echo "  Linux kernel include path:        $KERNEL_INCL_PATH"
++echo "  Linux kernel build path:          $KERNEL_BUILD_PATH"
++echo "  Linux kernel architecture:        $KERNEL_ARCH"
++echo "  Include IFXOS:                    $INCLUDE_DSL_CPE_API_IFXOS_SUPPORT"
++echo "  IFXOS include path:               $IFXOS_INCLUDE_PATH"
++echo "  Driver Include Path               $DSL_DRIVER_INCL_PATH"
++echo "  DSL device:                       $DSL_DEVICE_NAME"
++echo "  Max device number:                $DSL_DRV_MAX_DEVICE_NUMBER"
++echo "  Channels per line:                $DSL_CHANNELS_PER_LINE"
++echo "  Build lib (only for kernel 2.6)   $DSL_CPE_API_LIBRARY_BUILD_2_6"
++echo "  DSL data led flash frequency:     $DSL_DATA_LED_FLASH_FREQUENCY Hz"
++echo "  Disable debug prints:             $DSL_DEBUG_DISABLE"
++echo "  Preselection of max. debug level: $DSL_DBG_MAX_LEVEL_SET"
++echo "  Preselected max. debug level:     $DSL_DBG_MAX_LEVEL_PRE"
++echo "  Include deprecated functions:     $INCLUDE_DEPRECATED"
++echo "  Include Device Exception Codes:   $INCLUDE_DEVICE_EXCEPTION_CODES"
++echo "  Include FW request support:       $INCLUDE_FW_REQUEST_SUPPORT"
++echo "  Include ADSL trace buffer:        $INCLUDE_DSL_CPE_TRACE_BUFFER"
++echo "  Include ADSL MIB:                 $INCLUDE_DSL_ADSL_MIB"
++echo "  Include ADSL LED:                 $INCLUDE_ADSL_LED"
++echo "  Include CEOC:                     $INCLUDE_DSL_CEOC"
++echo "  Include config get support:       $INCLUDE_DSL_CONFIG_GET"
++echo "  Include System i/f configuration: $INCLUDE_DSL_SYSTEM_INTERFACE"
++echo "  Include Resource Statistics:      $INCLUDE_DSL_RESOURCE_STATISTICS"
++echo "  Include Framing Parameters:       $INCLUDE_DSL_FRAMING_PARAMETERS"
++echo "  Include G997 Line Inventory:      $INCLUDE_DSL_G997_LINE_INVENTORY"
++echo "  Include G997 Framing Parameters:  $INCLUDE_DSL_G997_FRAMING_PARAMETERS"
++echo "  Include G997 per tone data:       $INCLUDE_DSL_G997_PER_TONE"
++echo "  Include G997 status:              $INCLUDE_DSL_G997_STATUS"
++echo "  Include G997 alarm:               $INCLUDE_DSL_G997_ALARM"
++echo "  Include DSL Bonding:              $INCLUDE_DSL_BONDING"
++echo "  Include Misc Line Status          $INCLUDE_DSL_CPE_MISC_LINE_STATUS"
++echo "  Include DELT:                     $INCLUDE_DSL_DELT"
++echo "  Include DELT data static storage: $DSL_CPE_STATIC_DELT_DATA"
++echo "  Include PM:                       $INCLUDE_DSL_PM"
++echo "  Include PM config:                $INCLUDE_DSL_CPE_PM_CONFIG"
++echo "  Include PM total:                 $INCLUDE_DSL_CPE_PM_TOTAL_COUNTERS"
++echo "  Include PM history:               $INCLUDE_DSL_CPE_PM_HISTORY"
++echo "  Include PM showtime:              $INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS"
++echo "  Include PM optional:              $INCLUDE_DSL_CPE_PM_OPTIONAL_PARAMETERS"
++echo "  Include PM line:                  $INCLUDE_DSL_CPE_PM_LINE_COUNTERS"
++echo "  Include PM line event showtime:   $INCLUDE_DSL_CPE_PM_LINE_EVENT_SHOWTIME_COUNTERS"
++echo "  Include PM channel:               $INCLUDE_DSL_CPE_PM_CHANNEL_COUNTERS"
++echo "  Include PM channel extended:      $INCLUDE_DSL_CPE_PM_CHANNEL_EXT_COUNTERS"
++echo "  Include PM data path:             $INCLUDE_DSL_CPE_PM_DATA_PATH_COUNTERS"
++echo "  Include PM data path failure:     $INCLUDE_DSL_CPE_PM_DATA_PATH_FAILURE_COUNTERS"
++echo "  Include PM ReTx:                  $INCLUDE_DSL_CPE_PM_RETX_COUNTERS"
++echo "  Include PM line threshold:        $INCLUDE_DSL_CPE_PM_LINE_THRESHOLDS"
++echo "  Include PM channel threshold:     $INCLUDE_DSL_CPE_PM_CHANNEL_THRESHOLDS"
++echo "  Include PM data path threshold:   $INCLUDE_DSL_CPE_PM_DATA_PATH_THRESHOLDS"
++echo "  Include PM ReTx threshold:        $INCLUDE_DSL_CPE_PM_RETX_THRESHOLDS"
++echo "  Include FW memory free support:   $INCLUDE_DSL_FIRMWARE_MEMORY_FREE"
++echo "----------------------- deprectated ! ----------------------------------"
++echo "  Include PM line failure:          $INCLUDE_DSL_CPE_PM_LINE_FAILURE_COUNTERS"
++echo ""
++echo " Settings:"
++echo "  Configure options:                $CONFIGURE_OPTIONS"
++echo "------------------------------------------------------------------------"
+ ])
+ 
+ AC_CONFIG_FILES([Makefile src/Makefile])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -303,7 +303,7 @@ if KERNEL_2_6
+ drv_dsl_cpe_api_OBJS = "$(subst .c,.o,$(filter %.c,$(drv_dsl_cpe_api_SOURCES)))"
+ 
+ drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SOURCES)
+-	@echo -e "drv_dsl_cpe_api: Making Linux 2.6.x kernel object"
++	@echo "drv_dsl_cpe_api: Making Linux 2.6.x kernel object"
+ 	if test ! -e common/drv_dsl_cpe_api.c ; then \
+ 		echo "copy source files (as links only!)"; \
+ 		for f in $(filter %.c,$(drv_dsl_cpe_api_SOURCES)); do \
+@@ -311,10 +311,10 @@ drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SO
+ 			cp -s $(addprefix @abs_srcdir@/,$$f) $(PWD)/`dirname $$f`/ ; \
+ 		done \
+ 	fi
+-	@echo -e "# drv_dsl_cpe_api: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
+-	@echo -e "obj-m := $(subst .ko,.o,$@)"			>> $(PWD)/Kbuild
+-	@echo -e "$(subst .ko,,$@)-y := $(drv_dsl_cpe_api_OBJS)"	>> $(PWD)/Kbuild
+-	@echo -e "EXTRA_CFLAGS := $(CFLAGS) -DHAVE_CONFIG_H $(drv_dsl_cpe_api_CFLAGS) $(DSL_DRIVER_INCL_PATH) $(IFXOS_INCLUDE_PATH) -I@abs_srcdir@/include -I$(PWD)/include"	>> $(PWD)/Kbuild
++	@echo "# drv_dsl_cpe_api: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
++	@echo "obj-m := $(subst .ko,.o,$@)"			>> $(PWD)/Kbuild
++	@echo "$(subst .ko,,$@)-y := $(drv_dsl_cpe_api_OBJS)"	>> $(PWD)/Kbuild
++	@echo "EXTRA_CFLAGS := $(CFLAGS) -DHAVE_CONFIG_H $(drv_dsl_cpe_api_CFLAGS) $(DSL_DRIVER_INCL_PATH) $(IFXOS_INCLUDE_PATH) -I@abs_srcdir@/include -I$(PWD)/include"	>> $(PWD)/Kbuild
+ 	$(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules
+ 
+ clean-generic:

package/ifxmips-dsl-control/Makefile

@@ -7,6 +7,7 @@
 # ralph / blogic
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_BASE_NAME:=dsl_cpe_control_danube
 PKG_VERSION:=3.24.4.4
@@ -73,6 +74,8 @@ CONFIGURE_ARGS += \
 	--enable-soap-support
 endif
 
+TARGET_CFLAGS += -I$(LINUX_DIR)/include
+
 define Package/ifxmips-dsl-control/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/ifx_cpe_control_init.sh $(1)/etc/init.d/

package/ifxos/Makefile

@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: $
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=lib_ifxos
+PKG_VERSION:=1.5.10
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_RELEASE:=1
+PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
+PKG_MD5SUM:=3602797b0f531f37546c6beb748d50cf
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/ifxos
+  SUBMENU:=Lantiq
+  TITLE:=Lantiq OS abstraction library
+  URL:=http://www.lantiq.com/
+  MAINTAINER:=Lantiq
+  DEPENDS:=@TARGET_ifxmips
+  FILES:=$(PKG_BUILD_DIR)/src/drv_ifxos.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,10,drv_ifxos)
+endef
+
+CONFIGURE_ARGS += \
+	ARCH=$(LINUX_KARCH) \
+	--enable-linux-26 \
+	--enable-kernelbuild="$(LINUX_DIR)" \
+	--enable-kernelincl="$(LINUX_DIR)/include" \
+	--enable-add_drv_cflags="-fno-pic -mno-abicalls -mlong-calls -G 0"
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); aclocal && autoconf && automake)
+	$(call Build/Configure/Default)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/{lib,include/ifxos}
+	$(CP) $(PKG_BUILD_DIR)/src/include/* $(1)/usr/include/ifxos
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/src/libifxos.a $(1)/usr/lib/libifxos.a
+endef
+
+$(eval $(call KernelPackage,ifxos))

package/ifxos/patches/100-portability.patch

@@ -0,0 +1,43 @@
+--- a/configure.in
++++ b/configure.in
+@@ -149,12 +149,12 @@ AC_ARG_ENABLE(targetincl,
+        echo Set the target image include path $enableval
+        AC_SUBST([TARGET_INCL_PATH],[$enableval])
+     else
+-       echo -e Set the default target image include path $DEFAULT_TARGET_INCL_PATH
++       echo Set the default target image include path $DEFAULT_TARGET_INCL_PATH
+        AC_SUBST([TARGET_INCL_PATH],[$DEFAULT_TARGET_INCL_PATH])
+     fi
+    ],
+    [
+-      echo -e Set the default target image include path $DEFAULT_TARGET_INCL_PATH
++      echo Set the default target image include path $DEFAULT_TARGET_INCL_PATH
+       AC_SUBST([TARGET_INCL_PATH],[$DEFAULT_TARGET_INCL_PATH])
+    ]
+ )
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -610,7 +610,7 @@ if KERNEL_2_6
+ drv_ifxos_OBJS = "$(subst .c,.o,$(filter %.c,$(drv_ifxos_SOURCES)))"
+ 
+ drv_ifxos.ko: $(drv_ifxos_SOURCES)
+-	@echo -e "drv_ifxos: Making Linux 2.6.x kernel object"
++	@echo "drv_ifxos: Making Linux 2.6.x kernel object"
+ 	if test ! -e common/ifxos_debug.c ; then \
+ 		echo "copy source files (as links only!)"; \
+ 		for f in $(filter %.c,$(drv_ifxos_SOURCES)); do \
+@@ -618,10 +618,10 @@ drv_ifxos.ko: $(drv_ifxos_SOURCES)
+ 			cp -s $(addprefix @abs_srcdir@/,$$f) $(PWD)/`dirname $$f`/ ; \
+ 		done \
+ 	fi
+-	@echo -e "# drv_ifxos: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
+-	@echo -e "obj-m := $(subst .ko,.o,$@)"			>> $(PWD)/Kbuild
+-	@echo -e "$(subst .ko,,$@)-y := $(drv_ifxos_OBJS)"	>> $(PWD)/Kbuild
+-	@echo -e "EXTRA_CFLAGS := $(CFLAGS) -DHAVE_CONFIG_H $(drv_ifxos_CFLAGS) $(DSL_DRIVER_INCL_PATH) -I@abs_srcdir@/include -I$(PWD)/include"	>> $(PWD)/Kbuild
++	@echo "# drv_ifxos: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
++	@echo "obj-m := $(subst .ko,.o,$@)"			>> $(PWD)/Kbuild
++	@echo "$(subst .ko,,$@)-y := $(drv_ifxos_OBJS)"	>> $(PWD)/Kbuild
++	@echo "EXTRA_CFLAGS := $(CFLAGS) -DHAVE_CONFIG_H $(drv_ifxos_CFLAGS) $(DSL_DRIVER_INCL_PATH) -I@abs_srcdir@/include -I$(PWD)/include"	>> $(PWD)/Kbuild
+ 	$(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules
+ 
+ clean-generic:

package/iproute2/patches/110-extra-ccopts.patch

@@ -1,6 +1,6 @@
---- ./Makefile.old	2009-10-18 21:14:18.344641842 +0200
+--- a/Makefile
-+++ ./Makefile	2009-10-18 21:14:33.558618672 +0200
++++ b/Makefile
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
  
  CC = gcc
  HOSTCC = gcc

package/iptables/patches/002-layer7_2.17.patch

@@ -1,6 +1,5 @@
-diff -Nur a/libxt_layer7.c b/libxt_layer7.c
+--- /dev/null
---- a/extensions/libxt_layer7.c	1970-01-01 01:00:00.000000000 +0100
++++ b/extensions/libxt_layer7.c
-+++ b/extensions/libxt_layer7.c	2008-08-22 16:00:52.000000000 +0200
 @@ -0,0 +1,368 @@
 +/* 
 +   Shared library add-on to iptables for layer 7 matching support. 
@@ -370,9 +369,8 @@ diff -Nur a/libxt_layer7.c b/libxt_layer7.c
 +{
 +	xtables_register_match(&layer7);
 +}
-diff -Nur a/libxt_layer7.man b/libxt_layer7.man
+--- /dev/null
---- a/extensions/libxt_layer7.man	1970-01-01 01:00:00.000000000 +0100
++++ b/extensions/libxt_layer7.man
-+++ b/extensions/libxt_layer7.man	2008-08-22 16:00:52.000000000 +0200
 @@ -0,0 +1,14 @@
 +This module matches packets based on the application layer data of 
 +their connections.  It uses regular expression matching to compare 

package/iptables/patches/009-table-alignment.patch

@@ -1,6 +1,6 @@
 --- a/libiptc/libiptc.c
 +++ b/libiptc/libiptc.c
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ static const char *hooknames[] = {
  struct ipt_error_target
  {
  	STRUCT_ENTRY_TARGET t;

package/iptables/patches/010-multiport-linux-2.4-compat.patch

@@ -22,7 +22,7 @@
  static void multiport_help_v1(void)
  {
  	printf(
-@@ -71,26 +56,6 @@
+@@ -71,26 +56,6 @@ proto_to_name(u_int8_t proto)
  	}
  }
  
@@ -49,7 +49,7 @@
  static void
  parse_multi_ports_v1(const char *portstring, 
  		     struct xt_multiport_v1 *multiinfo,
-@@ -154,73 +119,6 @@
+@@ -154,73 +119,6 @@ check_proto(u_int16_t pnum, u_int8_t inv
  /* Function which parses command options; returns true if it
     ate an option */
  static int
@@ -123,7 +123,7 @@
  __multiport_parse_v1(int c, char **argv, int invert, unsigned int *flags,
                       struct xt_entry_match **match, u_int16_t pnum,
                       u_int8_t invflags)
-@@ -313,55 +211,6 @@
+@@ -313,55 +211,6 @@ print_port(u_int16_t port, u_int8_t prot
  }
  
  /* Prints out the matchinfo. */
@@ -179,7 +179,7 @@
  static void __multiport_print_v1(const struct xt_entry_match *match,
                                   int numeric, u_int16_t proto)
  {
-@@ -418,48 +267,6 @@
+@@ -418,48 +267,6 @@ static void multiport_print6_v1(const vo
  }
  
  /* Saves the union ipt_matchinfo in parsable form to stdout. */
@@ -228,7 +228,7 @@
  static void __multiport_save_v1(const struct xt_entry_match *match,
                                  u_int16_t proto)
  {
-@@ -513,34 +320,6 @@
+@@ -513,34 +320,6 @@ static struct xtables_match multiport_mt
  	{
  		.family        = NFPROTO_IPV4,
  		.name          = "multiport",

package/kernel/modules/crypto.mk

@@ -267,7 +267,6 @@ $(call KernelPackage/crypto/Depends,)
 	$(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/crypto/tea.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/crypto/twofish.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/crypto/twofish_common.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/crypto/wp512.$(LINUX_KMOD_SUFFIX)
 endef
 
@@ -276,7 +275,8 @@ define KernelPackage/crypto-misc/2.6
 	$(LINUX_DIR)/crypto/camellia.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/crypto/fcrypt.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/crypto/tgr192.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/crypto/tgr192.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/crypto/twofish_common.$(LINUX_KMOD_SUFFIX)
 endef
 
 define KernelPackage/crypto-misc/x86

package/kernel/modules/other.mk

@@ -133,7 +133,6 @@ define KernelPackage/pcmcia-core
 	CONFIG_PCMCIA \
 	CONFIG_CARDBUS \
 	CONFIG_PCCARD \
-	CONFIG_PCCARD_NONSTATIC \
 	PCMCIA_DEBUG=n
 endef
 
@@ -143,15 +142,15 @@ define KernelPackage/pcmcia-core/2.4
 #	CONFIG_CARDBUS
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) \
-  AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds)
+	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds yenta_socket)
 endef
 
 define KernelPackage/pcmcia-core/2.6
 #  KCONFIG:= \
 #	CONFIG_PCCARD \
 #	CONFIG_PCMCIA \
-#	CONFIG_PCCARD_NONSTATIC \
 #	PCMCIA_DEBUG=n
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
@@ -169,20 +168,10 @@ $(eval $(call KernelPackage,pcmcia-core))
 define KernelPackage/pcmcia-yenta
   SUBMENU:=$(OTHER_MENU)
   TITLE:=yenta socket driver
-  DEPENDS:=kmod-pcmcia-core
+  DEPENDS:=@LINUX_2_6 kmod-pcmcia-core
   KCONFIG:= \
-	CONFIG_PCMCIA \
+	CONFIG_PCCARD_NONSTATIC \
-	CONFIG_CARDBUS \
 	CONFIG_YENTA
-endef
-
-define KernelPackage/pcmcia-yenta/2.4
-  FILES:= \
-	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,41,yenta_socket)
-endef
-
-define KernelPackage/pcmcia-yenta/2.6
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)

package/kernel/modules/video.mk

@@ -120,7 +120,7 @@ $(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core)
   TITLE:=SN9C102 Camera Chip support
   KCONFIG:=CONFIG_USB_SN9C102
   FILES:=$(LINUX_DIR)/drivers/media/video/sn9c102/sn9c102.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,sn9c102)
+  AUTOLOAD:=$(call AutoLoad,70,gspca_sn9c20x)
 endef
 
 

package/kernel/modules/xen.mk

@@ -71,7 +71,7 @@ define KernelPackage/xen-fbdev
   )
 endef
 
-define KernelPackage/xen-fs/description
+define KernelPackage/xen-fbdev/description
   Kernel module for the Xen virtual frame buffer
 endef
 

package/kexec-tools/patches/0004-mips_regdefs.patch

@@ -1,6 +1,5 @@
-diff -urN kexec-tools-testing-20080324/kexec/arch/mips/regdef.h kexec-tools-testing-20080324.new/kexec/arch/mips/regdef.h
+--- /dev/null
---- kexec-tools-testing-20080324/kexec/arch/mips/regdef.h	1970-01-01 01:00:00.000000000 +0100
++++ b/kexec/arch/mips/regdef.h
-+++ kexec-tools-testing-20080324.new/kexec/arch/mips/regdef.h	2008-07-18 13:37:18.000000000 +0200
 @@ -0,0 +1,100 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public

package/kexec-tools/patches/0005-mips64_support.patch

@@ -1,7 +1,5 @@
-Index: kexec-tools-2.0.1/kexec/arch/mips/Makefile
+--- a/kexec/arch/mips/Makefile
-===================================================================
++++ b/kexec/arch/mips/Makefile
---- kexec-tools-2.0.1.orig/kexec/arch/mips/Makefile	2008-07-15 02:46:43.000000000 +0200
-+++ kexec-tools-2.0.1/kexec/arch/mips/Makefile	2009-09-27 19:07:26.000000000 +0200
 @@ -4,7 +4,7 @@
  mips_KEXEC_SRCS =  kexec/arch/mips/kexec-mips.c
  mips_KEXEC_SRCS += kexec/arch/mips/kexec-elf-mips.c
@@ -11,10 +9,8 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/Makefile
  
  mips_ADD_BUFFER =
  mips_ADD_SEGMENT =
-Index: kexec-tools-2.0.1/kexec/arch/mips/crashdump-mips.c
+--- /dev/null
-===================================================================
++++ b/kexec/arch/mips/crashdump-mips.c
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ kexec-tools-2.0.1/kexec/arch/mips/crashdump-mips.c	2009-09-27 19:07:26.000000000 +0200
 @@ -0,0 +1,371 @@
 +/*
 + * kexec: Linux boots Linux
@@ -387,10 +383,8 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/crashdump-mips.c
 +      (start != end) : 0;
 +}
 +
-Index: kexec-tools-2.0.1/kexec/arch/mips/crashdump-mips.h
+--- /dev/null
-===================================================================
++++ b/kexec/arch/mips/crashdump-mips.h
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ kexec-tools-2.0.1/kexec/arch/mips/crashdump-mips.h	2009-09-27 19:07:26.000000000 +0200
 @@ -0,0 +1,26 @@
 +#ifndef CRASHDUMP_MIPS_H
 +#define CRASHDUMP_MIPS_H
@@ -418,10 +412,8 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/crashdump-mips.h
 +#define BACKUP_SRC_SIZE    (BACKUP_SRC_END - BACKUP_SRC_START + 1)
 +
 +#endif /* CRASHDUMP_MIPS_H */
-Index: kexec-tools-2.0.1/kexec/arch/mips/include/arch/options.h
+--- a/kexec/arch/mips/include/arch/options.h
-===================================================================
++++ b/kexec/arch/mips/include/arch/options.h
---- kexec-tools-2.0.1.orig/kexec/arch/mips/include/arch/options.h	2008-07-15 02:46:43.000000000 +0200
-+++ kexec-tools-2.0.1/kexec/arch/mips/include/arch/options.h	2009-09-27 19:18:21.000000000 +0200
 @@ -2,10 +2,21 @@
  #define KEXEC_ARCH_MIPS_OPTIONS_H
  
@@ -444,10 +436,8 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/include/arch/options.h
 +#endif
  
  #endif /* KEXEC_ARCH_MIPS_OPTIONS_H */
-Index: kexec-tools-2.0.1/kexec/arch/mips/kexec-elf-mips.c
+--- a/kexec/arch/mips/kexec-elf-mips.c
-===================================================================
++++ b/kexec/arch/mips/kexec-elf-mips.c
---- kexec-tools-2.0.1.orig/kexec/arch/mips/kexec-elf-mips.c	2008-07-15 02:46:43.000000000 +0200
-+++ kexec-tools-2.0.1/kexec/arch/mips/kexec-elf-mips.c	2009-09-27 19:16:39.000000000 +0200
 @@ -25,51 +25,18 @@
  #include <ip_checksum.h>
  #include "../../kexec.h"
@@ -504,7 +494,7 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/kexec-elf-mips.c
  
  int elf_mips_probe(const char *buf, off_t len)
  {
-@@ -108,16 +75,14 @@
+@@ -108,16 +75,14 @@ int elf_mips_load(int argc, char **argv,
  	struct kexec_info *info)
  {
  	struct mem_ehdr ehdr;
@@ -528,7 +518,7 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/kexec-elf-mips.c
  	static const struct option options[] = {
  		KEXEC_ARCH_OPTIONS
  		{"command-line", 1, 0, OPT_APPEND},
-@@ -144,38 +109,81 @@
+@@ -144,38 +109,81 @@ int elf_mips_load(int argc, char **argv,
  			break;
  		}
  	}
@@ -636,11 +626,9 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/kexec-elf-mips.c
  
  	return 0;
  }
-Index: kexec-tools-2.0.1/kexec/arch/mips/kexec-mips.c
+--- a/kexec/arch/mips/kexec-mips.c
-===================================================================
++++ b/kexec/arch/mips/kexec-mips.c
---- kexec-tools-2.0.1.orig/kexec/arch/mips/kexec-mips.c	2008-07-15 02:46:43.000000000 +0200
+@@ -97,8 +97,18 @@ int file_types = sizeof(file_type) / siz
-+++ kexec-tools-2.0.1/kexec/arch/mips/kexec-mips.c	2009-09-27 19:20:25.000000000 +0200
-@@ -97,8 +97,18 @@
  
  void arch_usage(void)
  {
@@ -659,7 +647,7 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/kexec-mips.c
  int arch_process_options(int argc, char **argv)
  {
  	static const struct option options[] = {
-@@ -113,6 +123,11 @@
+@@ -113,6 +123,11 @@ int arch_process_options(int argc, char 
  		switch(opt) {
  		default:
  			break;
@@ -671,7 +659,7 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/kexec-mips.c
  		}
  	}
  	/* Reset getopt for the next pass; called in other source modules */
-@@ -126,6 +141,10 @@
+@@ -126,6 +141,10 @@ const struct arch_map_entry arches[] = {
  	 * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_MIPS here.
  	 */
  	{ "mips", KEXEC_ARCH_DEFAULT },
@@ -682,7 +670,7 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/kexec-mips.c
  	{ 0 },
  };
  
-@@ -138,18 +157,9 @@
+@@ -138,18 +157,9 @@ void arch_update_purgatory(struct kexec_
  {
  }
  
@@ -702,10 +690,8 @@ Index: kexec-tools-2.0.1/kexec/arch/mips/kexec-mips.c
  }
  
  /*
-Index: kexec-tools-2.0.1/kexec/arch/mips/kexec-mips.h
+--- a/kexec/arch/mips/kexec-mips.h
-===================================================================
++++ b/kexec/arch/mips/kexec-mips.h
---- kexec-tools-2.0.1.orig/kexec/arch/mips/kexec-mips.h	2008-07-15 02:46:43.000000000 +0200
-+++ kexec-tools-2.0.1/kexec/arch/mips/kexec-mips.h	2009-09-27 19:21:32.000000000 +0200
 @@ -1,17 +1,16 @@
  #ifndef KEXEC_MIPS_H
  #define KEXEC_MIPS_H

package/libpcap/patches/102-makefile_disable_manpages.patch

@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -461,14 +461,6 @@
+@@ -461,14 +461,6 @@ install: libpcap.a pcap-config
  	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
  	[ -d $(DESTDIR)$(includedir)/pcap ] || \
  	    (mkdir -p $(DESTDIR)$(includedir)/pcap; chmod 755 $(DESTDIR)$(includedir)/pcap)
@@ -15,7 +15,7 @@
  	$(INSTALL_DATA) $(srcdir)/pcap/pcap.h \
  	    $(DESTDIR)$(includedir)/pcap/pcap.h
  	$(INSTALL_DATA) $(srcdir)/pcap/bpf.h \
-@@ -487,36 +479,6 @@
+@@ -487,36 +479,6 @@ install: libpcap.a pcap-config
  	[ -d $(DESTDIR)$(bindir) ] || \
  	    (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
  	$(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
@@ -52,7 +52,7 @@
  
  install-shared: install-shared-$(DYEXT)
  install-shared-so: libpcap.so
-@@ -536,23 +498,6 @@
+@@ -536,23 +498,6 @@ uninstall:
  	rm -f $(DESTDIR)$(includedir)/pcap.h
  	rm -f $(DESTDIR)$(includedir)/pcap-bpf.h
  	rm -f $(DESTDIR)$(includedir)/pcap-namedb.h

package/libreadline/patches/100-fix_avr32_compile

@@ -1,6 +1,6 @@
 --- a/support/config.sub
 +++ b/support/config.sub
-@@ -228,7 +228,7 @@
+@@ -228,7 +228,7 @@ case $basic_machine in
  	| a29k \
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
@@ -9,7 +9,7 @@
  	| clipper \
  	| d10v | d30v | dlx | dsp16xx \
  	| fr30 | frv \
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ case $basic_machine in
  	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  	| amd64-* \
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \

package/linux-atm/Makefile

@@ -6,6 +6,7 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=linux-atm
 PKG_VERSION:=2.5.1
@@ -40,37 +41,35 @@ define Package/atm-tools/description
   This package contains the Linux ATM tools.
 endef
 
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(INSTALL_BIN) $(SCRIPT_DIR)/config.sub $(SCRIPT_DIR)/config.guess $(PKG_BUILD_DIR)/
-endef
-
 define Build/Configure
 	$(call Build/Configure/Default)
 	# prevent autoheader invocation
 	touch $(PKG_BUILD_DIR)/stamp-h.in
 endef
 
+TARGET_CFLAGS += -I$(LINUX_DIR)/include
+
 define Build/Compile
+	# src/qgen is built with HOSTCC, which does not really like our LDFLAGS
+	$(MAKE) -C $(PKG_BUILD_DIR)/src/qgen \
+		LDFLAGS="" \
+		all 
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-ifneq ($(CONFIG_PACKAGE_linux-atm),)
+define Build/InstallDev
-  define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr
-	mkdir -p $(1)/usr/include
+	$(CP) \
-	$(CP)	$(PKG_BUILD_DIR)/src/include/atm{,d,sap}.h \
+		$(PKG_INSTALL_DIR)/usr/include \
-		$(1)/usr/include/
+		$(PKG_INSTALL_DIR)/usr/lib \
-	mkdir -p $(1)/usr/lib
+		$(1)/usr/
-	$(CP)	$(PKG_BUILD_DIR)/src/lib/.libs/libatm.{a,so*} \
+endef
-		$(1)/usr/lib/
-  endef
-endif
 
 define Package/linux-atm/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/lib/.libs/libatm.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.so* $(1)/usr/lib/
 endef
 
 define Package/atm-tools/install

package/linux-atm/patches/200-no_libfl.patch

@@ -1,8 +1,6 @@
-Index: linux-atm-2.5.1/src/qgen/Makefile.am
+--- a/src/qgen/Makefile.am
-===================================================================
++++ b/src/qgen/Makefile.am
---- linux-atm-2.5.1.orig/src/qgen/Makefile.am	2010-02-27 01:36:10.156687492 +0100
+@@ -2,7 +2,7 @@ noinst_PROGRAMS = qgen
-+++ linux-atm-2.5.1/src/qgen/Makefile.am	2010-02-27 01:36:23.388686762 +0100
-@@ -2,7 +2,7 @@
  
  qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
  		qgen.h second.c third.c
@@ -11,11 +9,9 @@ Index: linux-atm-2.5.1/src/qgen/Makefile.am
  
  CC = @CC_FOR_BUILD@
  CFLAGS = @CFLAGS_FOR_BUILD@
-Index: linux-atm-2.5.1/src/qgen/Makefile.in
+--- a/src/qgen/Makefile.in
-===================================================================
++++ b/src/qgen/Makefile.in
---- linux-atm-2.5.1.orig/src/qgen/Makefile.in	2010-02-27 01:36:10.156687492 +0100
+@@ -58,7 +58,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+++ linux-atm-2.5.1/src/qgen/Makefile.in	2010-02-27 02:06:38.992684137 +0100
-@@ -58,7 +58,7 @@
  am__depfiles_maybe = depfiles
  am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -24,7 +20,7 @@ Index: linux-atm-2.5.1/src/qgen/Makefile.in
  LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -208,7 +208,7 @@
+@@ -208,7 +208,7 @@ top_srcdir = @top_srcdir@
  qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
  		qgen.h second.c third.c
  
@@ -33,11 +29,9 @@ Index: linux-atm-2.5.1/src/qgen/Makefile.in
  
  #TESTS = $(check_PROGRAMS)
  EXTRA_DIST = ql_y.h ql_y.c ql_l.c
-Index: linux-atm-2.5.1/src/sigd/Makefile.am
+--- a/src/sigd/Makefile.am
-===================================================================
++++ b/src/sigd/Makefile.am
---- linux-atm-2.5.1.orig/src/sigd/Makefile.am	2010-02-27 01:36:10.160686786 +0100
+@@ -8,7 +8,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s
-+++ linux-atm-2.5.1/src/sigd/Makefile.am	2010-02-27 01:36:23.392683892 +0100
-@@ -8,7 +8,7 @@
  			$(top_builddir)/src/q2931/qd.dump.o \
  			$(top_builddir)/src/lib/libatm.la \
  			$(top_builddir)/src/saal/libsaal.a
@@ -46,11 +40,9 @@ Index: linux-atm-2.5.1/src/sigd/Makefile.am
  atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
  
  CLEANFILES = mess.c
-Index: linux-atm-2.5.1/src/sigd/Makefile.in
+--- a/src/sigd/Makefile.in
-===================================================================
++++ b/src/sigd/Makefile.in
---- linux-atm-2.5.1.orig/src/sigd/Makefile.in	2010-02-27 01:36:10.160686786 +0100
+@@ -244,7 +244,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s
-+++ linux-atm-2.5.1/src/sigd/Makefile.in	2010-02-27 01:36:23.396685195 +0100
-@@ -244,7 +244,7 @@
  			$(top_builddir)/src/lib/libatm.la \
  			$(top_builddir)/src/saal/libsaal.a
  
@@ -59,10 +51,8 @@ Index: linux-atm-2.5.1/src/sigd/Makefile.in
  atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
  CLEANFILES = mess.c
  sysconf_DATA = atmsigd.conf
-Index: linux-atm-2.5.1/src/switch/debug/debug.c
+--- a/src/switch/debug/debug.c
-===================================================================
++++ b/src/switch/debug/debug.c
---- linux-atm-2.5.1.orig/src/switch/debug/debug.c	2010-02-27 01:36:10.160686786 +0100
-+++ linux-atm-2.5.1/src/switch/debug/debug.c	2010-02-27 01:36:23.396685195 +0100
 @@ -20,6 +20,11 @@
  
  #define PRV(call) ((FAB *) (call)->fab)
@@ -75,11 +65,9 @@ Index: linux-atm-2.5.1/src/switch/debug/debug.c
  
  typedef struct _fab {
      CALL *next; /* relay.c may not keep track of calls, but WE are */
-Index: linux-atm-2.5.1/src/switch/debug/Makefile.am
+--- a/src/switch/debug/Makefile.am
-===================================================================
++++ b/src/switch/debug/Makefile.am
---- linux-atm-2.5.1.orig/src/switch/debug/Makefile.am	2010-02-27 01:36:10.164686879 +0100
+@@ -5,7 +5,7 @@ INCLUDES = -I$(srcdir)/../../q2931
-+++ linux-atm-2.5.1/src/switch/debug/Makefile.am	2010-02-27 01:36:23.396685195 +0100
-@@ -5,7 +5,7 @@
  sw_debug_SOURCES = debug.c
  sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
  			$(top_builddir)/src/lib/libatm.la
@@ -88,11 +76,9 @@ Index: linux-atm-2.5.1/src/switch/debug/Makefile.am
  			
  sw_debug_DEPENDENCIES = $(sw_debug_XTRAS)
  
-Index: linux-atm-2.5.1/src/switch/debug/Makefile.in
+--- a/src/switch/debug/Makefile.in
-===================================================================
++++ b/src/switch/debug/Makefile.in
---- linux-atm-2.5.1.orig/src/switch/debug/Makefile.in	2010-02-27 01:36:10.164686879 +0100
+@@ -199,7 +199,8 @@ sw_debug_SOURCES = debug.c
-+++ linux-atm-2.5.1/src/switch/debug/Makefile.in	2010-02-27 01:36:23.396685195 +0100
-@@ -199,7 +199,8 @@
  sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
  			$(top_builddir)/src/lib/libatm.la
  
@@ -102,11 +88,9 @@ Index: linux-atm-2.5.1/src/switch/debug/Makefile.in
  sw_debug_DEPENDENCIES = $(sw_debug_XTRAS)
  EXTRA_DIST = demo README
  all: all-am
-Index: linux-atm-2.5.1/src/switch/tcp/Makefile.am
+--- a/src/switch/tcp/Makefile.am
-===================================================================
++++ b/src/switch/tcp/Makefile.am
---- linux-atm-2.5.1.orig/src/switch/tcp/Makefile.am	2010-02-27 01:36:10.201682113 +0100
+@@ -5,7 +5,7 @@ INCLUDES = -I$(srcdir)/../../q2931
-+++ linux-atm-2.5.1/src/switch/tcp/Makefile.am	2010-02-27 01:36:23.412882977 +0100
-@@ -5,7 +5,7 @@
  sw_tcp_SOURCES = tcpsw.c
  sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
  		$(top_builddir)/src/lib/libatm.la
@@ -115,11 +99,9 @@ Index: linux-atm-2.5.1/src/switch/tcp/Makefile.am
  sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
  
  EXTRA_DIST = mkfiles README
-Index: linux-atm-2.5.1/src/switch/tcp/Makefile.in
+--- a/src/switch/tcp/Makefile.in
-===================================================================
++++ b/src/switch/tcp/Makefile.in
---- linux-atm-2.5.1.orig/src/switch/tcp/Makefile.in	2010-02-27 01:36:10.209681349 +0100
+@@ -199,7 +199,7 @@ sw_tcp_SOURCES = tcpsw.c
-+++ linux-atm-2.5.1/src/switch/tcp/Makefile.in	2010-02-27 01:36:23.417680887 +0100
-@@ -199,7 +199,7 @@
  sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
  		$(top_builddir)/src/lib/libatm.la
  
@@ -128,10 +110,8 @@ Index: linux-atm-2.5.1/src/switch/tcp/Makefile.in
  sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
  EXTRA_DIST = mkfiles README
  all: all-am
-Index: linux-atm-2.5.1/src/switch/tcp/tcpsw.c
+--- a/src/switch/tcp/tcpsw.c
-===================================================================
++++ b/src/switch/tcp/tcpsw.c
---- linux-atm-2.5.1.orig/src/switch/tcp/tcpsw.c	2010-02-27 01:36:10.221684444 +0100
-+++ linux-atm-2.5.1/src/switch/tcp/tcpsw.c	2010-02-27 01:36:23.428680415 +0100
 @@ -35,6 +35,10 @@
  #define MAX_PACKET (ATM_MAX_AAL5_PDU+sizeof(struct atmtcp_hdr))
  #define BUFFER_SIZE (MAX_PACKET*2)
@@ -143,11 +123,9 @@ Index: linux-atm-2.5.1/src/switch/tcp/tcpsw.c
  
  typedef struct _table {
      struct _link *out;	/* output port */
-Index: linux-atm-2.5.1/src/test/Makefile.am
+--- a/src/test/Makefile.am
-===================================================================
++++ b/src/test/Makefile.am
---- linux-atm-2.5.1.orig/src/test/Makefile.am	2010-02-27 01:36:10.221684444 +0100
+@@ -20,7 +20,7 @@ br_SOURCES = br.c
-+++ linux-atm-2.5.1/src/test/Makefile.am	2010-02-27 01:36:23.428680415 +0100
-@@ -20,7 +20,7 @@
  bw_SOURCES = bw.c
  isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l
  isp_XTRAS = $(LDADD)
@@ -156,11 +134,9 @@ Index: linux-atm-2.5.1/src/test/Makefile.am
  isp_DEPENDENCIES = $(isp_XTRAS)
  window_SOURCES = window.c
  
-Index: linux-atm-2.5.1/src/test/Makefile.in
+--- a/src/test/Makefile.in
-===================================================================
++++ b/src/test/Makefile.in
---- linux-atm-2.5.1.orig/src/test/Makefile.in	2010-02-27 01:36:10.225688778 +0100
+@@ -282,7 +282,7 @@ br_SOURCES = br.c
-+++ linux-atm-2.5.1/src/test/Makefile.in	2010-02-27 01:36:23.432685583 +0100
-@@ -282,7 +282,7 @@
  bw_SOURCES = bw.c
  isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l
  isp_XTRAS = $(LDADD)
@@ -169,15 +145,12 @@ Index: linux-atm-2.5.1/src/test/Makefile.in
  isp_DEPENDENCIES = $(isp_XTRAS)
  window_SOURCES = window.c
  CLEANFILES = errnos.inc
-
+--- a/src/test/ispl_l.l
-Index: linux-atm-2.5.1/src/test/ispl_l.l
++++ b/src/test/ispl_l.l
-===================================================================
+@@ -18,6 +18,11 @@
---- linux-atm-2.5.1/src/test/ispl_l.l-orig	2010-03-15 10:52:39.000000000 -0500
-+++ linux-atm-2.5.1/src/test/ispl_l.l	2010-03-15 10:54:45.000000000 -0500
-@@ -17,6 +17,11 @@
- #include "isp.h"
  #include "ispl_y.h"
  
+ 
 +int yywrap(void)
 +{
 +       return 1;
@@ -186,14 +159,12 @@ Index: linux-atm-2.5.1/src/test/ispl_l.l
  static int lineno = 1;
  
  %}
-Index: linux-atm-2.5.1/src/qgen/ql_l.l
+--- a/src/qgen/ql_l.l
-===================================================================
++++ b/src/qgen/ql_l.l
---- linux-atm-2.5.1/src/qgen/ql_l.l.orig	2010-03-15 11:07:01.000000000 -0500
+@@ -11,6 +11,11 @@
-+++ linux-atm-2.5.1/src/qgen/ql_l.l	2010-03-15 11:06:04.000000000 -0500
-@@ -10,6 +10,11 @@
- #include "qgen.h"
  #include "ql_y.h"
  
+ 
 +int yywrap(void)
 +{
 +        return 1;
@@ -202,11 +173,8 @@ Index: linux-atm-2.5.1/src/qgen/ql_l.l
  typedef struct _tree {
      struct _tree *left,*right;
      const char str[0];
-
+--- a/src/sigd/cfg_l.l
-Index: linux-atm-2.5.1/src/sigd/cfg_l.l
++++ b/src/sigd/cfg_l.l
-===================================================================
---- linux-atm-2.5.1/src/sigd/cfg_l.l-orig	2010-03-15 11:12:39.000000000 -0500
-+++ linux-atm-2.5.1/src/sigd/cfg_l.l	2010-03-15 11:13:22.000000000 -0500
 @@ -16,6 +16,10 @@
  
  #include "cfg_y.h"

package/lua/patches/015-lnum-ppc-compat.patch

@@ -1,8 +1,6 @@
-Index: lua-5.1.3/src/lua.h
+--- a/src/lua.h
-===================================================================
++++ b/src/lua.h
---- lua-5.1.3.orig/src/lua.h	2008-06-29 11:45:55.000000000 +0200
+@@ -79,7 +79,7 @@ typedef void * (*lua_Alloc) (void *ud, v
-+++ lua-5.1.3/src/lua.h	2008-06-29 11:46:28.000000000 +0200
-@@ -79,7 +79,7 @@
   *     not acceptable for 5.1, maybe 5.2 onwards?
   *  9: greater than existing (5.1) type values.
  */

package/lua/patches/020-shared_liblua.patch

@@ -1,8 +1,6 @@
-Index: lua-5.1.4/Makefile
+--- a/Makefile
-===================================================================
++++ b/Makefile
---- lua-5.1.4.orig/Makefile	2008-08-24 16:46:37.000000000 +0200
+@@ -42,8 +42,8 @@ PLATS= aix ansi bsd freebsd generic linu
-+++ lua-5.1.4/Makefile	2008-08-24 16:48:42.000000000 +0200
-@@ -42,8 +42,8 @@
  
  # What to install.
  TO_BIN= lua luac
@@ -13,7 +11,7 @@ Index: lua-5.1.4/Makefile
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-@@ -63,6 +63,7 @@
+@@ -63,6 +63,7 @@ install: dummy
  	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
  	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
  	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
@@ -21,11 +19,9 @@ Index: lua-5.1.4/Makefile
  	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
  
  ranlib:
-Index: lua-5.1.4/src/ldo.h
+--- a/src/ldo.h
-===================================================================
++++ b/src/ldo.h
---- lua-5.1.4.orig/src/ldo.h	2008-08-24 16:46:37.000000000 +0200
+@@ -46,7 +46,7 @@ LUAI_FUNC int luaD_pcall (lua_State *L, 
-+++ lua-5.1.4/src/ldo.h	2008-08-24 16:48:42.000000000 +0200
-@@ -46,7 +46,7 @@
  LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult);
  LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize);
  LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
@@ -34,10 +30,8 @@ Index: lua-5.1.4/src/ldo.h
  
  LUAI_FUNC void luaD_throw (lua_State *L, int errcode);
  LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
-Index: lua-5.1.4/src/lfunc.h
+--- a/src/lfunc.h
-===================================================================
++++ b/src/lfunc.h
---- lua-5.1.4.orig/src/lfunc.h	2008-08-24 16:46:37.000000000 +0200
-+++ lua-5.1.4/src/lfunc.h	2008-08-24 16:48:42.000000000 +0200
 @@ -18,7 +18,7 @@
                           cast(int, sizeof(TValue *)*((n)-1)))
  
@@ -47,10 +41,8 @@ Index: lua-5.1.4/src/lfunc.h
  LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e);
  LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e);
  LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
-Index: lua-5.1.4/src/lmem.h
+--- a/src/lmem.h
-===================================================================
++++ b/src/lmem.h
---- lua-5.1.4.orig/src/lmem.h	2008-08-24 16:46:37.000000000 +0200
-+++ lua-5.1.4/src/lmem.h	2008-08-24 16:48:42.000000000 +0200
 @@ -38,9 +38,9 @@
     ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
  
@@ -63,10 +55,8 @@ Index: lua-5.1.4/src/lmem.h
  LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
                                 size_t size_elem, int limit,
                                 const char *errormsg);
-Index: lua-5.1.4/src/lstring.h
+--- a/src/lstring.h
-===================================================================
++++ b/src/lstring.h
---- lua-5.1.4.orig/src/lstring.h	2008-08-24 16:46:37.000000000 +0200
-+++ lua-5.1.4/src/lstring.h	2008-08-24 16:48:42.000000000 +0200
 @@ -25,7 +25,7 @@
  
  LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
@@ -76,11 +66,9 @@ Index: lua-5.1.4/src/lstring.h
  
  
  #endif
-Index: lua-5.1.4/src/lundump.h
+--- a/src/lundump.h
-===================================================================
++++ b/src/lundump.h
---- lua-5.1.4.orig/src/lundump.h	2008-08-24 16:46:37.000000000 +0200
+@@ -17,7 +17,7 @@ LUAI_FUNC Proto* luaU_undump (lua_State*
-+++ lua-5.1.4/src/lundump.h	2008-08-24 16:48:42.000000000 +0200
-@@ -17,7 +17,7 @@
  LUAI_FUNC void luaU_header (char* h);
  
  /* dump one chunk; from ldump.c */
@@ -89,11 +77,9 @@ Index: lua-5.1.4/src/lundump.h
  
  #ifdef luac_c
  /* print one chunk; from print.c */
-Index: lua-5.1.4/src/Makefile
+--- a/src/Makefile
-===================================================================
++++ b/src/Makefile
---- lua-5.1.4.orig/src/Makefile	2008-08-24 16:48:20.000000000 +0200
+@@ -23,6 +23,7 @@ MYLIBS=
-+++ lua-5.1.4/src/Makefile	2008-08-24 16:48:42.000000000 +0200
-@@ -23,6 +23,7 @@
  PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  
  LUA_A=	liblua.a
@@ -101,7 +87,7 @@ Index: lua-5.1.4/src/Makefile
  CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
  	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
  	lundump.o lvm.o lzio.o lnum.o
-@@ -33,11 +34,12 @@
+@@ -33,11 +34,12 @@ LUA_T=	lua
  LUA_O=	lua.o
  
  LUAC_T=	luac
@@ -116,7 +102,7 @@ Index: lua-5.1.4/src/Makefile
  
  default: $(PLAT)
  
-@@ -47,14 +49,23 @@
+@@ -47,14 +49,23 @@ o:	$(ALL_O)
  
  a:	$(ALL_A)
  
@@ -143,7 +129,7 @@ Index: lua-5.1.4/src/Makefile
  	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
  
  clean:
-@@ -96,7 +107,7 @@
+@@ -96,7 +107,7 @@ generic:
  	$(MAKE) all MYCFLAGS=
  
  linux:

package/lua/patches/030-archindependent-bytecode.patch

@@ -1,8 +1,6 @@
-Index: lua-5.1.4/src/ldump.c
+--- a/src/ldump.c
-===================================================================
++++ b/src/ldump.c
---- lua-5.1.4.orig/src/ldump.c	2008-08-24 16:48:20.000000000 +0200
+@@ -67,12 +67,12 @@ static void DumpString(const TString* s,
-+++ lua-5.1.4/src/ldump.c	2008-08-24 16:48:52.000000000 +0200
-@@ -67,12 +67,12 @@
  {
   if (s==NULL || getstr(s)==NULL)
   {
@@ -17,11 +15,9 @@ Index: lua-5.1.4/src/ldump.c
    DumpVar(size,D);
    DumpBlock(getstr(s),size,D);
   }
-Index: lua-5.1.4/src/lundump.c
+--- a/src/lundump.c
-===================================================================
++++ b/src/lundump.c
---- lua-5.1.4.orig/src/lundump.c	2008-08-24 16:48:20.000000000 +0200
+@@ -25,6 +25,7 @@ typedef struct {
-+++ lua-5.1.4/src/lundump.c	2008-08-24 16:48:52.000000000 +0200
-@@ -25,6 +25,7 @@
   ZIO* Z;
   Mbuffer* b;
   const char* name;
@@ -29,7 +25,7 @@ Index: lua-5.1.4/src/lundump.c
  } LoadState;
  
  #ifdef LUAC_TRUST_BINARIES
-@@ -40,7 +41,6 @@
+@@ -40,7 +41,6 @@ static void error(LoadState* S, const ch
  }
  #endif
  
@@ -37,7 +33,7 @@ Index: lua-5.1.4/src/lundump.c
  #define	LoadByte(S)		(lu_byte)LoadChar(S)
  #define LoadVar(S,x)		LoadMem(S,&x,1,sizeof(x))
  #define LoadVector(S,b,n,size)	LoadMem(S,b,n,size)
-@@ -51,6 +51,49 @@
+@@ -51,6 +51,49 @@ static void LoadBlock(LoadState* S, void
   IF (r!=0, "unexpected end");
  }
  
@@ -87,7 +83,7 @@ Index: lua-5.1.4/src/lundump.c
  static int LoadChar(LoadState* S)
  {
   char x;
-@@ -82,7 +125,7 @@
+@@ -82,7 +125,7 @@ static lua_Integer LoadInteger(LoadState
  
  static TString* LoadString(LoadState* S)
  {
@@ -96,7 +92,7 @@ Index: lua-5.1.4/src/lundump.c
   LoadVar(S,size);
   if (size==0)
    return NULL;
-@@ -196,6 +239,7 @@
+@@ -196,6 +239,7 @@ static void LoadHeader(LoadState* S)
   char s[LUAC_HEADERSIZE];
   luaU_header(h);
   LoadBlock(S,s,LUAC_HEADERSIZE);
@@ -104,7 +100,7 @@ Index: lua-5.1.4/src/lundump.c
   IF (memcmp(h,s,LUAC_HEADERSIZE)!=0, "bad header");
  }
  
-@@ -230,7 +274,7 @@
+@@ -230,7 +274,7 @@ void luaU_header (char* h)
   *h++=(char)LUAC_FORMAT;
   *h++=(char)*(char*)&x;				/* endianness */
   *h++=(char)sizeof(int);

package/lua/patches/100-no_readline.patch

@@ -1,6 +1,5 @@
-diff -ur lua-luci-5.1.3/src/luaconf.h lua-luci-5.1.3-new/src/luaconf.h
+--- a/src/luaconf.h
---- lua-luci-5.1.3/src/luaconf.h	2008-04-14 13:19:54.000000000 +0200
++++ b/src/luaconf.h
-+++ lua-luci-5.1.3-new/src/luaconf.h	2008-04-14 13:19:17.000000000 +0200
 @@ -38,7 +38,6 @@
  #if defined(LUA_USE_LINUX)
  #define LUA_USE_POSIX
@@ -9,11 +8,9 @@ diff -ur lua-luci-5.1.3/src/luaconf.h lua-luci-5.1.3-new/src/luaconf.h
  #endif
  
  #if defined(LUA_USE_MACOSX)
-Nur in lua-luci-5.1.3-new/src: luaconf.h.orig.
+--- a/src/Makefile
-diff -ur lua-luci-5.1.3/src/Makefile lua-luci-5.1.3-new/src/Makefile
++++ b/src/Makefile
---- lua-luci-5.1.3/src/Makefile	2008-04-14 13:19:57.000000000 +0200
+@@ -17,6 +17,7 @@ LIBS= -lm $(MYLIBS)
-+++ lua-luci-5.1.3-new/src/Makefile	2008-04-14 13:19:17.000000000 +0200
-@@ -17,6 +17,7 @@
  MYCFLAGS=
  MYLDFLAGS=
  MYLIBS=
@@ -21,7 +18,7 @@ diff -ur lua-luci-5.1.3/src/Makefile lua-luci-5.1.3-new/src/Makefile
  
  # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
  
-@@ -86,7 +87,7 @@
+@@ -86,7 +87,7 @@ echo:
  	@echo "MYLIBS = $(MYLIBS)"
  
  # convenience targets for popular platforms
@@ -30,7 +27,7 @@ diff -ur lua-luci-5.1.3/src/Makefile lua-luci-5.1.3-new/src/Makefile
  none:
  	@echo "Please choose a platform:"
  	@echo "   $(PLATS)"
-@@ -101,16 +102,16 @@
+@@ -101,16 +102,16 @@ bsd:
  	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
  
  freebsd:
@@ -50,4 +47,3 @@ diff -ur lua-luci-5.1.3/src/Makefile lua-luci-5.1.3-new/src/Makefile
  # use this on Mac OS X 10.3-
  #	$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
  
-Nur in lua-luci-5.1.3-new/src: Makefile.orig.

package/lua/patches/200-lua-path.patch

@@ -1,5 +1,5 @@
---- b/src/luaconf.h	2008-05-06 20:10:46.000000000 +0200
+--- a/src/luaconf.h
-+++ a/src/luaconf.h	2008-05-06 20:10:27.000000000 +0200
++++ b/src/luaconf.h
 @@ -95,9 +95,9 @@
  	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
  

package/lua/patches/400-luaposix_5.1.4-embedded.patch

@@ -1,8 +1,6 @@
-Index: lua-5.1.4/src/Makefile
+--- a/src/Makefile
-===================================================================
++++ b/src/Makefile
---- lua-5.1.4.orig/src/Makefile	2008-09-25 12:19:44.000000000 +0200
+@@ -12,7 +12,7 @@ CFLAGS= -O2 -Wall $(MYCFLAGS)
-+++ lua-5.1.4/src/Makefile	2008-09-25 12:20:03.000000000 +0200
-@@ -12,7 +12,7 @@
  AR= ar rcu
  RANLIB= ranlib
  RM= rm -f
@@ -11,7 +9,7 @@ Index: lua-5.1.4/src/Makefile
  
  MYCFLAGS=
  MYLDFLAGS=
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ld
  	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
  	lundump.o lvm.o lzio.o lnum.o
  LIB_O=	lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
@@ -20,11 +18,9 @@ Index: lua-5.1.4/src/Makefile
  
  LUA_T=	lua
  LUA_O=	lua.o
-Index: lua-5.1.4/src/linit.c
+--- a/src/linit.c
-===================================================================
++++ b/src/linit.c
---- lua-5.1.4.orig/src/linit.c	2008-09-25 12:19:02.000000000 +0200
+@@ -23,6 +23,7 @@ static const luaL_Reg lualibs[] = {
-+++ lua-5.1.4/src/linit.c	2008-09-25 12:19:32.000000000 +0200
-@@ -23,6 +23,7 @@
    {LUA_STRLIBNAME, luaopen_string},
    {LUA_MATHLIBNAME, luaopen_math},
    {LUA_DBLIBNAME, luaopen_debug},
@@ -32,10 +28,8 @@ Index: lua-5.1.4/src/linit.c
    {NULL, NULL}
  };
  
-Index: lua-5.1.4/src/lposix.c
+--- /dev/null
-===================================================================
++++ b/src/lposix.c
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ lua-5.1.4/src/lposix.c	2008-09-25 12:16:29.000000000 +0200
 @@ -0,0 +1,1139 @@
 +/*
 +* lposix.c
@@ -1176,11 +1170,9 @@ Index: lua-5.1.4/src/lposix.c
 +}
 +
 +/*EOF*/
-Index: lua-5.1.4/src/lualib.h
+--- a/src/lualib.h
-===================================================================
++++ b/src/lualib.h
---- lua-5.1.4.orig/src/lualib.h	2008-09-25 12:18:14.000000000 +0200
+@@ -39,6 +39,9 @@ LUALIB_API int (luaopen_debug) (lua_Stat
-+++ lua-5.1.4/src/lualib.h	2008-09-25 12:18:53.000000000 +0200
-@@ -39,6 +39,9 @@
  #define LUA_LOADLIBNAME	"package"
  LUALIB_API int (luaopen_package) (lua_State *L);
  
@@ -1190,10 +1182,8 @@ Index: lua-5.1.4/src/lualib.h
  
  /* open all previous libraries */
  LUALIB_API void (luaL_openlibs) (lua_State *L); 
-Index: lua-5.1.4/src/modemuncher.c
+--- /dev/null
-===================================================================
++++ b/src/modemuncher.c
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ lua-5.1.4/src/modemuncher.c	2008-09-25 12:16:29.000000000 +0200
 @@ -0,0 +1,261 @@
 +/* 
 +	Mode Muncher -- modemuncher.c

package/lua/patches/600-refcounting.patch

@@ -205,7 +205,7 @@
    lua_unlock(L);
    return res;
  }
-@@ -1040,20 +1046,21 @@ LUA_API int lua_next (lua_State *L, int 
+@@ -1040,8 +1046,9 @@ LUA_API int lua_next (lua_State *L, int 
    if (more) {
      api_incr_top(L);
    }
@@ -217,11 +217,7 @@
    lua_unlock(L);
    return more;
  }
- 
+@@ -1053,7 +1060,7 @@ LUA_API void lua_concat (lua_State *L, i
- 
- LUA_API void lua_concat (lua_State *L, int n) {
-   lua_lock(L);
-   api_checknelems(L, n);
    if (n >= 2) {
      luaC_checkGC(L);
      luaV_concat(L, n, cast_int(L->top - L->base) - 1);
@@ -230,7 +226,7 @@
    }
    else if (n == 0) {  /* push empty string */
      setsvalue2s(L, L->top, luaS_newlstr(L, "", 0));
-@@ -1139,6 +1147,7 @@ LUA_API const char *lua_setupvalue (lua_
+@@ -1139,6 +1146,7 @@ LUA_API const char *lua_setupvalue (lua_
    if (name) {
      L->top--;
      setobj(L, val, L->top);
@@ -238,7 +234,7 @@
      luaC_barrier(L, clvalue(fi), L->top);
    }
    lua_unlock(L);
-@@ -1160,7 +1169,7 @@ LUA_API const char *lua_setupvalue (lua_
+@@ -1160,7 +1168,7 @@ LUA_API const char *lua_setupvalue (lua_
  int lua_pushvalue_as_number (lua_State *L, int idx)
  {
    const TValue *o = index2adr(L, idx);
@@ -518,7 +514,7 @@
      }
    }
    return p;
-@@ -543,7 +551,7 @@ static void atomic (lua_State *L) {
+@@ -543,7 +546,7 @@ static void atomic (lua_State *L) {
    udsize = luaC_separateudata(L, 0);  /* separate userdata to be finalized */
    marktmu(g);  /* mark `preserved' userdata */
    udsize += propagateall(g);  /* remark, to propagate `preserveness' */
@@ -527,7 +523,7 @@
    /* flip current white */
    g->currentwhite = cast_byte(otherwhite(g));
    g->sweepstrgc = 0;
-@@ -685,8 +693,11 @@ void luaC_barrierback (lua_State *L, Tab
+@@ -685,8 +688,11 @@ void luaC_barrierback (lua_State *L, Tab
  
  void luaC_link (lua_State *L, GCObject *o, lu_byte tt) {
    global_State *g = G(L);
@@ -977,7 +973,7 @@
    lua_Number d;
    lua_Integer i;
    
-@@ -384,6 +386,7 @@ void luaV_concat (lua_State *L, int tota
+@@ -384,6 +385,7 @@ void luaV_concat (lua_State *L, int tota
          size_t l = tsvalue(top-i)->len;
          memcpy(buffer+tl, svalue(top-i), l);
          tl += l;
@@ -985,7 +981,7 @@
        }
        setsvalue2s(L, top-n, luaS_newlstr(L, buffer, tl));
      }
-@@ -420,7 +423,7 @@ void luaV_concat (lua_State *L, int tota
+@@ -420,7 +422,7 @@ void luaV_concat (lua_State *L, int tota
   */
  static void Arith (lua_State *L, StkId ra, const TValue *rb,
                     const TValue *rc, TMS op) {
@@ -994,7 +990,7 @@
    const TValue *b, *c;
    lua_Number nb,nc;
  
-@@ -663,7 +666,7 @@ void luaV_execute (lua_State *L, int nex
+@@ -663,7 +665,7 @@ void luaV_execute (lua_State *L, int nex
        OPCODE_TARGET(LOADNIL) {
          TValue *rb = RB(i);
          do {
@@ -1003,7 +999,7 @@
          } while (rb >= ra);
          continue;
        }
-@@ -673,7 +676,7 @@ void luaV_execute (lua_State *L, int nex
+@@ -673,7 +675,7 @@ void luaV_execute (lua_State *L, int nex
          continue;
        }
        OPCODE_TARGET(GETGLOBAL) {
@@ -1012,7 +1008,7 @@
          TValue *rb = KBx(i);
          sethvalue(L, &g, cl->env);
          lua_assert(ttisstring(rb));
-@@ -685,7 +688,7 @@ void luaV_execute (lua_State *L, int nex
+@@ -685,7 +687,7 @@ void luaV_execute (lua_State *L, int nex
          continue;
        }
        OPCODE_TARGET(SETGLOBAL) {
@@ -1021,7 +1017,7 @@
          sethvalue(L, &g, cl->env);
          lua_assert(ttisstring(KBx(i)));
          Protect(luaV_settable(L, &g, KBx(i), ra));
-@@ -895,7 +900,7 @@ void luaV_execute (lua_State *L, int nex
+@@ -895,7 +897,7 @@ void luaV_execute (lua_State *L, int nex
          if (--nexeccalls == 0)  /* was previous function running `here'? */
            return;  /* no: return */
          else {  /* yes: continue its execution */
@@ -1030,7 +1026,7 @@
            lua_assert(isLua(L->ci));
            lua_assert(GET_OPCODE(*((L->ci)->savedpc - 1)) == OP_CALL);
            goto reentry;
-@@ -986,6 +991,7 @@ void luaV_execute (lua_State *L, int nex
+@@ -986,6 +988,7 @@ void luaV_execute (lua_State *L, int nex
          for (; n > 0; n--) {
            TValue *val = ra+n;
            setobj2t(L, luaH_setint(L, h, last--), val);
@@ -1038,7 +1034,7 @@
            luaC_barriert(L, h, val);
          }
          continue;
-@@ -1030,7 +1036,7 @@ void luaV_execute (lua_State *L, int nex
+@@ -1030,7 +1033,7 @@ void luaV_execute (lua_State *L, int nex
              setobjs2s(L, ra + j, ci->base - n + j);
            }
            else {

package/mac80211/Makefile

@@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mac80211
 
-PKG_VERSION:=2010-03-03
+PKG_VERSION:=2010-03-24
 PKG_RELEASE:=3
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 #	http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/11 \
 #	http://wireless.kernel.org/download/compat-wireless-2.6
-PKG_MD5SUM:=af8da65ca4c25b1b69e3d2896d2bbb2f
+PKG_MD5SUM:=73357c52b5d6888ea3228b2ca8aa5eca
 
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
@@ -676,9 +676,11 @@ MAKE_OPTS:= \
 	CONFIG_AT76C50X_USB= \
 	CONFIG_WL12XX= \
 	CONFIG_EEPROM_93CX6= \
+	CONFIG_HERMES= \
 	CONFIG_AR9170_USB=$(if $(CONFIG_PACKAGE_kmod-ar9170),m) \
 	CONFIG_AR9170_LEDS=$(CONFIG_LEDS_TRIGGERS) \
 	CONFIG_IWM= \
+	CONFIG_ATH9K_HTC= \
 	MADWIFI= \
 	OLD_IWL= \
 	KLIB_BUILD="$(LINUX_DIR)" \

package/mac80211/patches/001-disable_b44.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -271,8 +271,8 @@ endif
+@@ -269,8 +269,8 @@ endif
  
  CONFIG_P54_PCI=m
  

package/mac80211/patches/002-disable_rfkill.patch

@@ -9,7 +9,7 @@
  
  ifeq ($(CONFIG_MAC80211),y)
  $(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular")
-@@ -461,8 +461,8 @@ endif
+@@ -492,8 +492,8 @@ endif
  # We need the backported rfkill module on kernel < 2.6.31.
  # In more recent kernel versions use the in kernel rfkill module.
  ifdef CONFIG_COMPAT_KERNEL_31

package/mac80211/patches/007-remove_misc_drivers.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -296,10 +296,10 @@ endif
+@@ -299,10 +299,10 @@ endif
  CONFIG_MWL8K=m
  
  # Ethernet drivers go here
@@ -13,9 +13,9 @@
 +# CONFIG_ATL1E=m
 +# CONFIG_ATL1C=m
  
- endif
+ CONFIG_HERMES=m
- ## end of PCI
+ CONFIG_HERMES_CACHE_FW_ON_INIT=y
-@@ -338,10 +338,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
+@@ -355,10 +355,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
  CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
  CONFIG_USB_NET_COMPAT_CDCETHER=n
  else

package/mac80211/patches/010-no_pcmcia.patch

@@ -9,7 +9,7 @@
   CONFIG_SSB=m
  else
  include $(KLIB_BUILD)/.config
-@@ -197,7 +197,7 @@ CONFIG_B43=m
+@@ -194,7 +194,7 @@ CONFIG_B43=m
  CONFIG_B43_HWRNG=y
  CONFIG_B43_PCI_AUTOSELECT=y
  ifneq ($(CONFIG_PCMCIA),)
@@ -18,7 +18,7 @@
  endif
  CONFIG_B43_LEDS=y
  CONFIG_B43_PHY_LP=y
-@@ -248,7 +248,7 @@ CONFIG_SSB_BLOCKIO=y
+@@ -246,7 +246,7 @@ CONFIG_SSB_BLOCKIO=y
  CONFIG_SSB_PCIHOST=y
  CONFIG_SSB_B43_PCI_BRIDGE=y
  ifneq ($(CONFIG_PCMCIA),)

package/mac80211/patches/011-no_sdio.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -382,8 +382,8 @@ endif # end of SPI driver list
+@@ -407,8 +407,8 @@ endif # end of SPI driver list
  
  ifneq ($(CONFIG_MMC),)
  
@@ -10,4 +10,4 @@
 +# CONFIG_B43_SDIO=y
  CONFIG_WL1251_SDIO=m
  
- ifdef CONFIG_COMPAT_KERNEL_27
+ ifneq ($(CONFIG_ARM),)