commit madwifi

29 May 2006

Hello community,

here is the log from the commit of package madwifi
checked in at Mon May 29 18:24:36 CEST 2006.

--------

--- arch/i386/madwifi/madwifi.changes	2006-05-25 00:01:02.000000000 +0200
+++ madwifi/madwifi.changes	2006-05-29 10:50:34.000000000 +0200
@@ -1,0 +2,5 @@
+Sat May 27 13:56:15 CEST 2006 - jg@suse.de
+
+- fixed net80211/Makefile
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ madwifi.spec ++++++
--- /var/tmp/diff_new_pack.SAdlRI/_old	2006-05-29 18:23:58.000000000 +0200
+++ /var/tmp/diff_new_pack.SAdlRI/_new	2006-05-29 18:23:58.000000000 +0200
@@ -15,7 +15,7 @@
 %define madwifi_version 0.9.0
 Summary:        Tools for configuring atheros cards
 Version:        0.9.0
-Release:        1
+Release:        2
 Group:          Hardware/Other
 License:        BSD
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -118,6 +118,8 @@
 %{_includedir}/%{name}-%{version}
 
 %changelog -n madwifi
+* Sat May 27 2006 - jg@suse.de
+- fixed net80211/Makefile
 * Wed May 24 2006 - jg@suse.de
 - disabled scanning when associated (bug 153733)
 - update to version 0.9.0, changes (shortened):

++++++ madwifi.dif ++++++
--- /var/tmp/diff_new_pack.SAdlRI/_old	2006-05-29 18:23:59.000000000 +0200
+++ /var/tmp/diff_new_pack.SAdlRI/_new	2006-05-29 18:23:59.000000000 +0200
@@ -1,8 +1,8 @@
-Index: madwifi-ng-0.9.0/net80211/Makefile
+Index: madwifi-0.9.0/net80211/Makefile
 ===================================================================
---- madwifi-ng-0.9.0.orig/net80211/Makefile
-+++ madwifi-ng-0.9.0/net80211/Makefile
-@@ -1,71 +1,6 @@
+--- madwifi-0.9.0.orig/net80211/Makefile
++++ madwifi-0.9.0/net80211/Makefile
+@@ -1,71 +1,9 @@
 -#
 -# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
 -# All rights reserved.
@@ -48,7 +48,8 @@
 -ifeq ($(obj),)
 -obj=	.
 -endif
--
++-include $(ROOT)/Makefile.inc
+ 
 -DEPTH=	..
 -#
 -# There are two authenticator mechanisms: an in-kernel implementation
@@ -72,11 +73,12 @@
 -		   $(MOD_AUTH) $(MOD_SCAN)
 -
 -obj-m		+= $(MOD_INSTALL)
-+-include $(ROOT)/Makefile.inc
++obj-m := wlan_xauth.o wlan_scan_sta.o wlan_scan_ap.o wlan.o \
++	wlan_wep.o wlan_tkip.o wlan_ccmp.o wlan_acl.o
  
  wlan-objs	:= if_media.o \
  		   ieee80211.o ieee80211_beacon.o ieee80211_crypto.o \
-@@ -80,45 +15,3 @@ wlan_acl-objs	:= ieee80211_acl.o
+@@ -80,45 +18,3 @@ wlan_acl-objs	:= ieee80211_acl.o
  wlan_xauth-objs	:= ieee80211_xauth.o
  wlan_scan_sta-objs :=ieee80211_scan_sta.o
  wlan_scan_ap-objs := ieee80211_scan_ap.o
@@ -122,10 +124,10 @@
 -	-rm -f *~ *.o *.ko *.mod.c
 -	-rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
 -	-rm -rf .tmp_versions
-Index: madwifi-ng-0.9.0/ath_rate/onoe/Makefile
+Index: madwifi-0.9.0/ath_rate/onoe/Makefile
 ===================================================================
---- madwifi-ng-0.9.0.orig/ath_rate/onoe/Makefile
-+++ madwifi-ng-0.9.0/ath_rate/onoe/Makefile
+--- madwifi-0.9.0.orig/ath_rate/onoe/Makefile
++++ madwifi-0.9.0/ath_rate/onoe/Makefile
 @@ -1,75 +1,6 @@
 -#
 -# Copyright (c) 2004 Sam Leffler, Errno Consulting
@@ -204,10 +206,10 @@
 -
 -ath_rate_onoe.o: ${ath_rate_onoe-objs}
 -	$(LD) $(LDOPTS) -o ath_rate_onoe.$(KMODSUF) -r $(ath_rate_onoe-objs)
-Index: madwifi-ng-0.9.0/ath_rate/amrr/Makefile
+Index: madwifi-0.9.0/ath_rate/amrr/Makefile
 ===================================================================
---- madwifi-ng-0.9.0.orig/ath_rate/amrr/Makefile
-+++ madwifi-ng-0.9.0/ath_rate/amrr/Makefile
+--- madwifi-0.9.0.orig/ath_rate/amrr/Makefile
++++ madwifi-0.9.0/ath_rate/amrr/Makefile
 @@ -1,75 +1,6 @@
 -#
 -# Copyright (c) 2004 Sam Leffler, Errno Consulting
@@ -286,10 +288,10 @@
 -
 -ath_rate_amrr.o: ${ath_rate_amrr-objs}
 -	$(LD) $(LDOPTS) -o ath_rate_amrr.$(KMODSUF) -r $(ath_rate_amrr-objs)
-Index: madwifi-ng-0.9.0/ath_hal/Makefile
+Index: madwifi-0.9.0/ath_hal/Makefile
 ===================================================================
---- madwifi-ng-0.9.0.orig/ath_hal/Makefile
-+++ madwifi-ng-0.9.0/ath_hal/Makefile
+--- madwifi-0.9.0.orig/ath_hal/Makefile
++++ madwifi-0.9.0/ath_hal/Makefile
 @@ -1,87 +1,17 @@
 -# $Id: //depot/sw/linuxsrc/src/802_11/madwifi/madwifi/ath_hal/Makefile#9 $
 -#
@@ -386,10 +388,10 @@
  
 -ath_hal.o: ${ath_hal-objs}
 -	$(LD) $(LDOPTS) -o ath_hal.$(KMODSUF) -r $(ath_hal-objs)
-Index: madwifi-ng-0.9.0/tools/Makefile
+Index: madwifi-0.9.0/tools/Makefile
 ===================================================================
---- madwifi-ng-0.9.0.orig/tools/Makefile
-+++ madwifi-ng-0.9.0/tools/Makefile
+--- madwifi-0.9.0.orig/tools/Makefile
++++ madwifi-0.9.0/tools/Makefile
 @@ -32,19 +32,7 @@ DEPTH=	..
  # it's a more traditional name.
  TOOLPREFIX ?= $(CROSS_COMPILE)
@@ -430,10 +432,10 @@
  	done
  	install -d ${DESTDIR}${MANDIR}/man8
  	install -m 0644 man/*.8 ${DESTDIR}${MANDIR}/man8
-Index: madwifi-ng-0.9.0/ath/Makefile
+Index: madwifi-0.9.0/ath/Makefile
 ===================================================================
---- madwifi-ng-0.9.0.orig/ath/Makefile
-+++ madwifi-ng-0.9.0/ath/Makefile
+--- madwifi-0.9.0.orig/ath/Makefile
++++ madwifi-0.9.0/ath/Makefile
 @@ -1,83 +1,7 @@
 -#
 -# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -522,10 +524,10 @@
 -
 -ath_${BUSNAME}.o: ${ath_${BUSNAME}-objs}
 -	$(LD) $(LDOPTS) -o ath_${BUSNAME}.$(KMODSUF) -r $(ath_${BUSNAME}-objs)
-Index: madwifi-ng-0.9.0/Makefile
+Index: madwifi-0.9.0/Makefile
 ===================================================================
---- madwifi-ng-0.9.0.orig/Makefile
-+++ madwifi-ng-0.9.0/Makefile
+--- madwifi-0.9.0.orig/Makefile
++++ madwifi-0.9.0/Makefile
 @@ -1,175 +1,7 @@
 -#
 -# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -706,10 +708,10 @@
 -	fi
 -	
 -	@echo "ok."
-Index: madwifi-ng-0.9.0/Makefile.inc
+Index: madwifi-0.9.0/Makefile.inc
 ===================================================================
---- madwifi-ng-0.9.0.orig/Makefile.inc
-+++ madwifi-ng-0.9.0/Makefile.inc
+--- madwifi-0.9.0.orig/Makefile.inc
++++ madwifi-0.9.0/Makefile.inc
 @@ -1,217 +1,14 @@
 -#
 -# Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -936,10 +938,10 @@
  
  
  # The following variables will affect developers only, and are used in the
-Index: madwifi-ng-0.9.0/ath_rate/sample/Makefile
+Index: madwifi-0.9.0/ath_rate/sample/Makefile
 ===================================================================
---- madwifi-ng-0.9.0.orig/ath_rate/sample/Makefile
-+++ madwifi-ng-0.9.0/ath_rate/sample/Makefile
+--- madwifi-0.9.0.orig/ath_rate/sample/Makefile
++++ madwifi-0.9.0/ath_rate/sample/Makefile
 @@ -1,73 +1,6 @@
 -#
 -# Copyright (c) 2004 Sam Leffler, Errno Consulting
@@ -1016,10 +1018,10 @@
 -
 -ath_rate_sample.o: ${ath_rate_sample-objs}
 -	$(LD) $(LDOPTS) -o ath_rate_sample.$(KMODSUF) -r $(ath_rate_sample-objs)
-Index: madwifi-ng-0.9.0/hal/public/x86_64-elf.inc
+Index: madwifi-0.9.0/hal/public/x86_64-elf.inc
 ===================================================================
---- madwifi-ng-0.9.0.orig/hal/public/x86_64-elf.inc
-+++ madwifi-ng-0.9.0/hal/public/x86_64-elf.inc
+--- madwifi-0.9.0.orig/hal/public/x86_64-elf.inc
++++ madwifi-0.9.0/hal/public/x86_64-elf.inc
 @@ -41,10 +41,6 @@
  #
  
@@ -1031,10 +1033,10 @@
  CC=	${TOOLPREFIX}gcc
  LD=	${TOOLPREFIX}ld
  STRIP=	${TOOLPREFIX}strip
-Index: madwifi-ng-0.9.0/hal/public/powerpc-be-elf.inc
+Index: madwifi-0.9.0/hal/public/powerpc-be-elf.inc
 ===================================================================
---- madwifi-ng-0.9.0.orig/hal/public/powerpc-be-elf.inc
-+++ madwifi-ng-0.9.0/hal/public/powerpc-be-elf.inc
+--- madwifi-0.9.0.orig/hal/public/powerpc-be-elf.inc
++++ madwifi-0.9.0/hal/public/powerpc-be-elf.inc
 @@ -51,10 +51,6 @@
  #	--enable-languages=c   --with-gnu-as --with-gnu-ld \
  #	--with-newlib   --with-gxx-include-dir=${PREFIX}/$target/include


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

commit madwifi

root＠suse.de