rpms/aircrack-ng/devel aircrack-ng-1.0-oui-path.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 aircrack-ng.spec, 1.30, 1.31 sources, 1.17, 1.18

[Till Maas]

Author: till

Update of /cvs/pkgs/rpms/aircrack-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3266

Modified Files:
	.cvsignore aircrack-ng.spec sources 
Added Files:
	aircrack-ng-1.0-oui-path.patch 
Log Message:
* Wed Sep 16 2009 Till Maas <opensource at till.name> - 1.0-1
- Update to stable release
- Include airodump-ng-oui-update
- prepare shipping of oui database
- fix paths for oui database in airodump-ng-oui-update and airodump-ng


aircrack-ng-1.0-oui-path.patch:
 scripts/airodump-ng-oui-update |    2 +-
 src/airodump-ng.h              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE aircrack-ng-1.0-oui-path.patch ---
diff -up aircrack-ng-1.0/src/airodump-ng.h.oui-path aircrack-ng-1.0/src/airodump-ng.h
--- aircrack-ng-1.0/src/airodump-ng.h.oui-path	2009-09-16 16:57:26.000000000 +0200
+++ aircrack-ng-1.0/src/airodump-ng.h	2009-09-16 16:57:53.000000000 +0200
@@ -70,7 +70,7 @@ static uchar ZERO[32] =
 "\x00\x00\x00\x00\x00\x00\x00\x00"
 "\x00\x00\x00\x00\x00\x00\x00\x00";
 
-#define OUI_PATH "/usr/local/etc/aircrack-ng/airodump-ng-oui.txt"
+#define OUI_PATH "/etc/aircrack-ng/airodump-ng-oui.txt"
 #define MIN_RAM_SIZE_LOAD_OUI_RAM 32768
 
 int read_pkts=0;
diff -up aircrack-ng-1.0/scripts/airodump-ng-oui-update.oui-path aircrack-ng-1.0/scripts/airodump-ng-oui-update
--- aircrack-ng-1.0/scripts/airodump-ng-oui-update.oui-path	2009-09-16 16:55:43.000000000 +0200
+++ aircrack-ng-1.0/scripts/airodump-ng-oui-update	2009-09-16 16:56:29.000000000 +0200
@@ -4,7 +4,7 @@ CURL=`which curl 2>/dev/null`
 WGET=`which wget 2>/dev/null`
 OUI_DOWNLOAD_URL="http://standards.ieee.org/regauth/oui/oui.txt"
 
-OUI_PATH="/usr/local/etc/aircrack-ng"
+OUI_PATH="/etc/aircrack-ng"
 AIRODUMP_NG_OUI="${OUI_PATH}/airodump-ng-oui.txt"
 OUI_IEEE="${OUI_PATH}/oui.txt"
 USERID=""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	13 Apr 2009 20:07:11 -0000	1.17
+++ .cvsignore	16 Sep 2009 17:32:04 -0000	1.18
@@ -1,3 +1 @@
-aircrack-ng-ptw.cap
-aircrack-ng-test.ivs
-aircrack-ng-1.0-rc3.tar.gz
+aircrack-ng-1.0.tar.gz


Index: aircrack-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/aircrack-ng.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- aircrack-ng.spec	21 Aug 2009 12:20:43 -0000	1.30
+++ aircrack-ng.spec	16 Sep 2009 17:32:05 -0000	1.31
@@ -1,25 +1,27 @@
-%define alphatag rc3
+#%global alphatag rc3
 
 Name:           aircrack-ng
 Version:        1.0
-Release:        0.10.%{alphatag}%{?dist}
+#Release:        0.10.%{alphatag}%{?dist}
 #Release:        0.7.%{alphatag}svn%{?dist}
-#Release:        1%{?dist}
+Release:        1%{?dist}
 Summary:        802.11 (wireless) sniffer and WEP/WPA-PSK key cracker
 
 Group:          Applications/System
 
 License:        GPLv2+
 URL:            http://www.aircrack-ng.org/
-#Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}.tar.gz
-Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}-%{alphatag}.tar.gz
+Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}.tar.gz
+#Source0:        http://download.aircrack-ng.org/aircrack-ng-%{version}-%{alphatag}.tar.gz
 #Source0:        aircrack-ng-%{version}-%{alphatag}.tar.gz
-Source1:        %{name}-tarball
+#Source1:        %{name}-tarball
 #Source2:        aircrack-ng-ptw.cap
 #Source2:        http://dl.aircrack-ng.org/ptw.cap
 #Source3:        aircrack-ng-test.ivs
 #Source3:       http://download.aircrack-ng.org/wiki-files/other/test.ivs
-# 2009-04-13: will be sent to upstream if upstream bugtracker is reachable again
+# License unclear:
+#Source4:        http://standards.ieee.org/regauth/oui/oui.txt
+# 2009-09-16: submitted upstream: 
 Patch0:         aircrack-ng-parallel_make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  sqlite-devel openssl-devel
@@ -34,11 +36,16 @@ capture files), and some tools to handle
 
 
 %prep
-%setup -q -n aircrack-ng-%{version}-%{alphatag}
-#%setup -q -n aircrack-ng-%{version}
+#%setup -q -n aircrack-ng-%{version}-%{alphatag}
+%setup -q -n aircrack-ng-%{version}
 %patch0 -p1 -b .parallel_make
 
 %build
+#grep '(hex') %{SOURCE4} > airodump-ng-oui.txt
+# License unclear
+touch airodump-ng-oui.txt
+#touch --reference %{SOURCE4} airodump-ng-oui.txt
+
 export CFLAGS=$RPM_OPT_FLAGS
 # unstable=true needed for wesside-ng, easside-ng, buddy-ng and tkiptun-ng
 # (also needed in make install)
@@ -49,6 +56,7 @@ make %{?_smp_mflags} sqlite=true unstabl
 rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir}/man1 sqlite=true unstable=true
+install -p -m 644 -D airodump-ng-oui.txt  $RPM_BUILD_ROOT%{_sysconfdir}/aircrack-ng/airodump-ng-oui.txt
 
 
 #%check
@@ -83,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/aireplay-ng
 %{_sbindir}/airmon-ng
 %{_sbindir}/airodump-ng
+%{_sbindir}/airodump-ng-oui-update
 %{_sbindir}/airserv-ng
 %{_sbindir}/airtun-ng
 %{_sbindir}/easside-ng
@@ -107,9 +116,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/packetforge-ng.1*
 %{_mandir}/man1/tkiptun-ng.1*
 %{_mandir}/man1/wesside-ng.1*
+%dir %{_sysconfdir}/aircrack-ng
+%config(noreplace) %{_sysconfdir}/aircrack-ng/airodump-ng-oui.txt
 
 
 %changelog
+* Wed Sep 16 2009 Till Maas <opensource at till.name> - 1.0-1
+- Update to stable release
+- Include airodump-ng-oui-update
+- prepare shipping of oui database
+- fix paths for oui database in airodump-ng-oui-update and airodump-ng
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-0.10.rc3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aircrack-ng/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	13 Apr 2009 20:07:11 -0000	1.17
+++ sources	16 Sep 2009 17:32:05 -0000	1.18
@@ -1,3 +1 @@
-cad87df60f251eb73d2dbc9216cef4e3  aircrack-ng-ptw.cap
-f9f430b935e82c69ffecf0be95d7348b  aircrack-ng-test.ivs
-37884de939af82eab60d3e7d165b40ad  aircrack-ng-1.0-rc3.tar.gz
+dafbfaf944ca9d523fde4bae86f0c067  aircrack-ng-1.0.tar.gz