projects / packages / wireless-tools.git / blame
| Commit | Line | Data |
|---|---|---|
| 2072864a AM |
1 | Description: add type to IMPORT keyword in ifrename's udev rules file |
| 2 | Author: Guus Sliepen <guus@debian.org> | |
| 3 | Bug-Debian: http://bugs.debian.org/650606 | |
| 4 | ||
| 5 | --- wireless-tools-30~pre9.orig/19-udev-ifrename.rules | |
| 6 | +++ wireless-tools-30~pre9/19-udev-ifrename.rules | |
| 7 | @@ -5,9 +5,9 @@ | |
| 8 | # when udev runs (i.e. on boot partition). | |
| 9 | ||
| 10 | # Enable this rule to test with udevtest. | |
| 11 | -#ENV{UDEV_LOG}=="6", SUBSYSTEM=="net", ACTION=="add", IMPORT="/sbin/ifrename -D -V -u -i %k", NAME:="$env{INTERFACE}" | |
| 12 | +#ENV{UDEV_LOG}=="6", SUBSYSTEM=="net", ACTION=="add", IMPORT{program}="/sbin/ifrename -D -V -u -i %k", NAME:="$env{INTERFACE}" | |
| 13 | ||
| 14 | # Main ifrename rule. | |
| 15 | # If interface is found in /etc/iftab, subsequent rename rules are bypassed. | |
| 16 | # If interface is not found in /etc/iftab, subsequent rename rules applies. | |
| 17 | -SUBSYSTEM=="net", ACTION=="add", IMPORT="/sbin/ifrename -u -i %k", NAME:="$env{INTERFACE}" | |
| 18 | +SUBSYSTEM=="net", ACTION=="add", IMPORT{program}="/sbin/ifrename -u -i %k", NAME:="$env{INTERFACE}" | |
| 19 | --- wireless-tools-30~pre8.orig/Makefile | |
| 20 | +++ wireless-tools-30~pre8/Makefile | |
| 21 | @@ -19,7 +19,7 @@ | |
| 22 | ## a local version (non-root). | |
| 23 | ## Standard distros should comment that option to save space and to | |
| 24 | ## build libiw.so used by third parties... | |
| 25 | -BUILD_STATIC = y | |
| 26 | +# BUILD_STATIC = y | |
| 27 | ||
| 28 | ## Uncomment this to build without using libm (less efficient). | |
| 29 | ## This is mostly useful for embedded platforms without maths. | |
| 30 | @@ -75,8 +75,8 @@ | |
| 31 | # Install directories | |
| 32 | INSTALL_DIR= $(PREFIX)/sbin | |
| 33 | INSTALL_LIB= $(PREFIX)/lib | |
| 34 | -INSTALL_INC= $(PREFIX)/include | |
| 35 | -INSTALL_MAN= $(PREFIX)/man | |
| 36 | +INSTALL_INC= $(PREFIX)/usr/include | |
| 37 | +INSTALL_MAN= $(PREFIX)/usr/share/man | |
| 38 | ||
| 39 | # Various commands | |
| 40 | RM = rm -f | |
| 41 | --- wireless-tools-29.orig/iftab.5 | |
| 42 | +++ wireless-tools-29/iftab.5 | |
| 43 | @@ -50,11 +50,7 @@ | |
| 44 | (logical or), specify two different mappings with the same interface | |
| 45 | name (one on each line). | |
| 46 | .B Ifrename | |
| 47 | -always use the first matching mapping starting from the | |
| 48 | -.I end | |
| 49 | -of | |
| 50 | -.BR iftab , | |
| 51 | -therefore more restrictive mapping should be specified last. | |
| 52 | +always uses the last matching mapping in iftab. | |
| 53 | .\" | |
| 54 | .\" INTERFACE NAME part | |
| 55 | .\" | |
| 56 | --- wireless-tools-30~pre8.orig/iwlib.c | |
| 57 | +++ wireless-tools-30~pre8/iwlib.c | |
| 58 | @@ -676,6 +676,7 @@ | |
| 59 | { | |
| 60 | struct iwreq wrq; | |
| 61 | ||
| 62 | + memset((char *) &wrq, 0, sizeof(struct iwreq)); | |
| 63 | memset((char *) info, 0, sizeof(struct wireless_config)); | |
| 64 | ||
| 65 | /* Get wireless name */ |