diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/grep/PKGBUILD | 10 | ||||
| -rw-r--r-- | testing/grep/grep.install | 10 | ||||
| -rw-r--r-- | testing/modemmanager/PKGBUILD | 6 | ||||
| -rw-r--r-- | testing/modemmanager/modem-manager.service | 4 | ||||
| -rw-r--r-- | testing/wireless_tools/PKGBUILD | 32 | ||||
| -rw-r--r-- | testing/wireless_tools/dense.patch | 49 |
6 files changed, 96 insertions, 15 deletions
diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD index 0b6547630..1bcec6a13 100644 --- a/testing/grep/PKGBUILD +++ b/testing/grep/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163569 2012-07-16 02:50:23Z dreisner $ +# $Id: PKGBUILD 165463 2012-08-20 11:35:50Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep -pkgver=2.13 -pkgrel=2 +pkgver=2.14 +pkgrel=1 pkgdesc="A string search utility" arch=('i686' 'x86_64') license=('GPL3') @@ -14,8 +14,8 @@ depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('5894d484e6c02249f9702d0d8a472115' - '99acaa4d45ab931be2ecba49a1766df7') +md5sums=('d4a3f03849d1e17ce56ab76aa5a24cab' + 'b94fdcaa058b47a9a25099c26cd2e4c3') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/testing/grep/grep.install b/testing/grep/grep.install index 7cd31301f..885238ac3 100644 --- a/testing/grep/grep.install +++ b/testing/grep/grep.install @@ -1,11 +1,9 @@ infodir=usr/share/info -filelist=(grep.info) +file=grep.info post_install() { [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + install-info $infodir/$file.gz $infodir/dir 2> /dev/null } post_upgrade() { @@ -14,8 +12,6 @@ post_upgrade() { pre_remove() { [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null } diff --git a/testing/modemmanager/PKGBUILD b/testing/modemmanager/PKGBUILD index 403673c39..d48648e45 100644 --- a/testing/modemmanager/PKGBUILD +++ b/testing/modemmanager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165395 2012-08-17 23:24:24Z heftig $ +# $Id: PKGBUILD 165461 2012-08-20 10:57:16Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=modemmanager _realname=ModemManager pkgver=0.5.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64') url="http://cgit.freedesktop.org/ModemManager/ModemManager/" @@ -15,7 +15,7 @@ options=('!libtool') source=(http://download.gnome.org/sources/$_realname/0.5/$_realname-$pkgver.tar.xz modem-manager.service) sha256sums=('7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8' - '66c9947972066dd5494c3a18b0e833f236e0866b455675368b5994900cbaf384') + '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe') build() { cd "$_realname-$pkgver" diff --git a/testing/modemmanager/modem-manager.service b/testing/modemmanager/modem-manager.service index 4e0c43c8c..bad666be8 100644 --- a/testing/modemmanager/modem-manager.service +++ b/testing/modemmanager/modem-manager.service @@ -5,6 +5,10 @@ Description=Modem Manager Type=dbus BusName=org.freedesktop.ModemManager ExecStart=/usr/sbin/modem-manager +# Suppress stderr to eliminate duplicated messages in syslog. MM calls openlog() +# with LOG_PERROR. But systemd redirects stderr to syslog by default, which +# results in logging each message twice. +StandardError=null [Install] WantedBy=multi-user.target diff --git a/testing/wireless_tools/PKGBUILD b/testing/wireless_tools/PKGBUILD new file mode 100644 index 000000000..3ec9cd7d1 --- /dev/null +++ b/testing/wireless_tools/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 165481 2012-08-20 14:54:59Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Jason Chu <jchu@xentac.net> + +pkgname=wireless_tools +pkgver=29 +pkgrel=7 +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') + +build() { + cd "${srcdir}/${pkgname}.${pkgver}" + patch -p1 -i ../dense.patch # FS#15363 + make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}.${pkgver}" + make \ + INSTALL_DIR="${pkgdir}/usr/sbin" \ + INSTALL_LIB="${pkgdir}/usr/lib" \ + INSTALL_INC="${pkgdir}/usr/include" \ + INSTALL_MAN="${pkgdir}/usr/share/man" \ + install +} diff --git a/testing/wireless_tools/dense.patch b/testing/wireless_tools/dense.patch new file mode 100644 index 000000000..85182cd82 --- /dev/null +++ b/testing/wireless_tools/dense.patch @@ -0,0 +1,49 @@ +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@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; + } + |