- up to 30pre9 (this package is obsolete, so likely 30 final will never exist)

diff --git a/wireless-tools-debian.patch b/wireless-tools-debian.patch
new file mode 100644 (file)
index 0000000..95407e9
--- /dev/null
+++ b/wireless-tools-debian.patch
@@ -0,0 +1,65 @@
+Description: add type to IMPORT keyword in ifrename's udev rules file
+Author: Guus Sliepen <guus@debian.org>
+Bug-Debian: http://bugs.debian.org/650606
+
+--- wireless-tools-30~pre9.orig/19-udev-ifrename.rules
++++ wireless-tools-30~pre9/19-udev-ifrename.rules
+@@ -5,9 +5,9 @@
+ # when udev runs (i.e. on boot partition).
+ 
+ # Enable this rule to test with udevtest.
+-#ENV{UDEV_LOG}=="6", SUBSYSTEM=="net", ACTION=="add", IMPORT="/sbin/ifrename -D -V -u -i %k", NAME:="$env{INTERFACE}"
++#ENV{UDEV_LOG}=="6", SUBSYSTEM=="net", ACTION=="add", IMPORT{program}="/sbin/ifrename -D -V -u -i %k", NAME:="$env{INTERFACE}"
+ 
+ # Main ifrename rule.
+ # If interface is found in /etc/iftab, subsequent rename rules are bypassed.
+ # If interface is not found in /etc/iftab, subsequent rename rules applies.
+-SUBSYSTEM=="net", ACTION=="add", IMPORT="/sbin/ifrename -u -i %k", NAME:="$env{INTERFACE}"
++SUBSYSTEM=="net", ACTION=="add", IMPORT{program}="/sbin/ifrename -u -i %k", NAME:="$env{INTERFACE}"
+--- wireless-tools-30~pre8.orig/Makefile
++++ wireless-tools-30~pre8/Makefile
+@@ -19,7 +19,7 @@
+ ## a local version (non-root).
+ ## Standard distros should comment that option to save space and to
+ ## build libiw.so used by third parties...
+-BUILD_STATIC = y
++# BUILD_STATIC = y
+ 
+ ## Uncomment this to build without using libm (less efficient).
+ ## This is mostly useful for embedded platforms without maths.
+@@ -75,8 +75,8 @@
+ # Install directories
+ INSTALL_DIR= $(PREFIX)/sbin
+ INSTALL_LIB= $(PREFIX)/lib
+-INSTALL_INC= $(PREFIX)/include
+-INSTALL_MAN= $(PREFIX)/man
++INSTALL_INC= $(PREFIX)/usr/include
++INSTALL_MAN= $(PREFIX)/usr/share/man
+ 
+ # Various commands
+ RM = rm -f
+--- wireless-tools-29.orig/iftab.5
++++ wireless-tools-29/iftab.5
+@@ -50,11 +50,7 @@
+ (logical or), specify two different mappings with the same interface
+ name (one on each line).
+ .B Ifrename
+-always use the first matching mapping starting from the
+-.I end
+-of
+-.BR iftab ,
+-therefore more restrictive mapping should be specified last.
++always uses the last matching mapping in iftab.
+ .\"
+ .\" INTERFACE NAME part
+ .\"
+--- wireless-tools-30~pre8.orig/iwlib.c
++++ wireless-tools-30~pre8/iwlib.c
+@@ -676,6 +676,7 @@
+ {
+   struct iwreq                wrq;
+ 
++  memset((char *) &wrq, 0, sizeof(struct iwreq));
+   memset((char *) info, 0, sizeof(struct wireless_config));
+ 
+   /* Get wireless name */

diff --git a/wireless-tools-llh.patch b/wireless-tools-llh.patch
deleted file mode 100644 (file)
index 6010fd6..0000000
--- a/wireless-tools-llh.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- wireless_tools.28/iwlib.h.orig     2005-12-06 02:18:06.000000000 +0100
-+++ wireless_tools.28/iwlib.h  2006-03-20 00:03:54.000000000 +0100
-@@ -32,12 +32,6 @@
- #include <sys/socket.h>               /* For AF_INET & struct sockaddr */
- #include <netinet/in.h>         /* For struct sockaddr_in */
- #include <netinet/if_ether.h>
--
--/* Fixup to be able to include kernel includes in userspace.
-- * Basically, kill the sparse annotations... Jean II */
--#ifndef __user
--#define __user
--#endif
- 
- #include <linux/types.h>              /* for "caddr_t" et al          */
- 
---- wireless_tools.28/wireless.19.h.orig       2006-03-20 00:02:13.000000000 +0100
-+++ wireless_tools.28/wireless.19.h    2006-03-20 00:04:46.000000000 +0100
-@@ -641,7 +641,7 @@
-  */
- struct        iw_point
- {
--  void __user *pointer;       /* Pointer to the data  (in user space) */
-+  void                *pointer;       /* Pointer to the data  (in user space) */
-   __u16               length;         /* number of fields or size in bytes */
-   __u16               flags;          /* Optional params */
- };
---- wireless_tools.28/wireless.20.h.orig       2006-05-27 18:51:20.000000000 +0200
-+++ wireless_tools.28/wireless.20.h    2006-05-27 18:51:29.000000000 +0200
-@@ -645,7 +645,7 @@
-  */
- struct        iw_point
- {
--  void __user *pointer;       /* Pointer to the data  (in user space) */
-+  void                *pointer;       /* Pointer to the data  (in user space) */
-   __u16               length;         /* number of fields or size in bytes */
-   __u16               flags;          /* Optional params */
- };
---- wireless_tools.28/wireless.18.h.orig       2006-05-27 18:50:55.000000000 +0200
-+++ wireless_tools.28/wireless.18.h    2006-05-27 18:51:08.000000000 +0200
-@@ -626,7 +626,7 @@
-  */
- struct        iw_point
- {
--  void __user *pointer;       /* Pointer to the data  (in user space) */
-+  void                *pointer;       /* Pointer to the data  (in user space) */
-   __u16               length;         /* number of fields or size in bytes */
-   __u16               flags;          /* Optional params */
- };
---- wireless_tools.29/wireless.21.h.orig       2006-03-25 01:26:36.000000000 +0100
-+++ wireless_tools.29/wireless.21.h    2006-10-02 16:37:49.583457000 +0200
-@@ -680,7 +680,7 @@
-  */
- struct        iw_point
- {
--  void __user *pointer;       /* Pointer to the data  (in user space) */
-+  void                *pointer;       /* Pointer to the data  (in user space) */
-   __u16               length;         /* number of fields or size in bytes */
-   __u16               flags;          /* Optional params */
- };

diff --git a/wireless-tools.spec b/wireless-tools.spec
index 663220404cd2d383d11b85b80109bab3354de9eb..42685b83af2b6c2a6fee34a667e11c1b46f69de3 100644 (file)
--- a/wireless-tools.spec
+++ b/wireless-tools.spec
@@ -1,16 +1,17 @@
+%define        pre     pre9
 Summary:       Wireless ethernet configuration tools
 Summary(pl.UTF-8):     Narzędzia do konfiguracji sieci bezprzewodowej
 Summary(pt_BR.UTF-8):  Ferramentas para redes sem fio
 Name:          wireless-tools
-Version:       29
-Release:       4
+Version:       30
+Release:       0.%{pre}.1
 Epoch:         1
 License:       GPL v2
 Group:         Networking/Admin
-Source0:       http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}.tar.gz
-# Source0-md5: e06c222e186f7cc013fd272d023710cb
-Patch0:                %{name}-llh.patch
-Patch1:                %{name}-optflags.patch
+Source0:       http://www.labs.hpe.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}.%{pre}.tar.gz
+# Source0-md5: ca91ba7c7eff9bfff6926b1a34a4697d
+Patch0:                %{name}-optflags.patch
+Patch1:                %{name}-debian.patch
 URL:           http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,16 +76,14 @@ Biblioteka rozszerzeń bezprzewodowych (biblioteka statyczna).
 %patch0 -p1
 %patch1 -p1
 
-sed -i -e 's#__user##g' iwlib.h wireless.22.h
-
 %build
 %{__make} \
        CC="%{__cc}" \
-       OPTFLAGS="%{rpmcflags}"
+       OPTFLAGS="%{rpmcflags} %{rpmcppflags}"
 
 %{__make} libiw.a \
        CC="%{__cc}" \
-       OPTFLAGS="%{rpmcflags}"
+       OPTFLAGS="%{rpmcflags} %{rpmcppflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -101,13 +100,8 @@ mv -f $RPM_BUILD_ROOT%{_libdir}/libiw.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libiw.so.*) \
        $RPM_BUILD_ROOT%{_libdir}/libiw.so
 
-install -d $RPM_BUILD_ROOT%{_mandir}/{cs,fr}/man{5,7,8}
-install cs/*.5 $RPM_BUILD_ROOT%{_mandir}/cs/man5
-install cs/*.7 $RPM_BUILD_ROOT%{_mandir}/cs/man7
-install cs/*.8 $RPM_BUILD_ROOT%{_mandir}/cs/man8
-install fr/*.5 $RPM_BUILD_ROOT%{_mandir}/fr/man5
-install fr/*.7 $RPM_BUILD_ROOT%{_mandir}/fr/man7
-install fr/*.8 $RPM_BUILD_ROOT%{_mandir}/fr/man8
+rm -r $RPM_BUILD_ROOT%{_mandir}/fr.ISO*
+mv $RPM_BUILD_ROOT%{_mandir}/fr{.UTF-8,}
 
 %clean
 rm -rf $RPM_BUILD_ROOT