[arch-commits] Commit in wireless_tools/trunk (PKGBUILD dense.patch)

Gaetan Bisson bisson at nymeria.archlinux.org
Thu Jan 30 17:14:31 UTC 2014


    Date: Thursday, January 30, 2014 @ 18:14:31
  Author: bisson
Revision: 204882

upgrade to the four-year-old upstream beta

Modified:
  wireless_tools/trunk/PKGBUILD
Deleted:
  wireless_tools/trunk/dense.patch

-------------+
 PKGBUILD    |   19 +++++++++----------
 dense.patch |   49 -------------------------------------------------
 2 files changed, 9 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-30 08:57:40 UTC (rev 204881)
+++ PKGBUILD	2014-01-30 17:14:31 UTC (rev 204882)
@@ -4,29 +4,28 @@
 # Contributor: Jason Chu <jchu at xentac.net>
 
 pkgname=wireless_tools
-pkgver=29
-pkgrel=8
+pkgver=30.pre9
+_pkgver=${pkgver%.pre*}
+pkgrel=1
 pkgdesc='Tools allowing to manipulate the Wireless Extensions'
 url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
 license=('GPL')
 arch=('i686' 'x86_64')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz"
-        'dense.patch')
-sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710'
-          '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72')
+source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
+sha1sums=('41db5ced9ed3d8d3cc104ce43c19af1d72f07eec')
 
 prepare() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
-	patch -p1 -i ../dense.patch # FS#15363
+	cd "${srcdir}/${pkgname}.${_pkgver}"
+	sed '/BUILD_STATIC =/d' -i Makefile
 }
 
 build() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
+	cd "${srcdir}/${pkgname}.${_pkgver}"
 	make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}"
 }
 
 package() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
+	cd "${srcdir}/${pkgname}.${_pkgver}"
 	make \
 		INSTALL_DIR="${pkgdir}/usr/bin" \
 		INSTALL_LIB="${pkgdir}/usr/lib" \

Deleted: dense.patch
===================================================================
--- dense.patch	2014-01-30 08:57:40 UTC (rev 204881)
+++ dense.patch	2014-01-30 17:14:31 UTC (rev 204882)
@@ -1,49 +0,0 @@
-The length field of wext data (iw_point.data) is 16 bits. The largest
-value is thus 65535. During the attempts to increase buffer size the
-buffer starts at 4096 and is doubled after each failure to fill. From the
-time this length reaches 65536 it is effectively zero. We thus loose all
-potential space from 32768 to 65535.
-
-This problem is clear when scanning in a RF dense environment.
-
-Without this patch:
-~$ iwlist wlan0 scan
-print_scanning_info: Allocation failed
-
-With this patch:
-~$ iwlist wlan0 scan | grep Cell | wc -l
-86
-
-Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
-
----
-A similar patch was recently created to fix wpa_supplicant.
-
-I could not find a source code repo for this code and created this patch
-against version 30-pre7 downloaded from 
-http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-
-diff -uprN wireless_tools_org/wireless_tools.30/iwlist.c wireless_tools.30/iwlist.c
---- wireless_tools_org/wireless_tools.30/iwlist.c	2008-01-16 17:45:41.000000000 -0800
-+++ wireless_tools.30/iwlist.c	2009-02-12 14:16:48.000000000 -0800
-@@ -800,7 +800,7 @@ print_scanning_info(int		skfd,
- 	  if(iw_get_ext(skfd, ifname, SIOCGIWSCAN, &wrq) < 0)
- 	    {
- 	      /* Check if buffer was too small (WE-17 only) */
--	      if((errno == E2BIG) && (range.we_version_compiled > 16))
-+	      if((errno == E2BIG) && (range.we_version_compiled > 16) && (buflen < 65535))
- 		{
- 		  /* Some driver may return very large scan results, either
- 		   * because there are many cells, or because they have many
-@@ -816,6 +816,10 @@ print_scanning_info(int		skfd,
- 		  else
- 		    buflen *= 2;
- 
-+		  /* wrq.u.data.length is 16 bits so max size is 65535 */
-+		  if(buflen > 65535)
-+		    buflen = 65535;
-+
- 		  /* Try again */
- 		  goto realloc;
- 		}
-




More information about the arch-commits mailing list