- up to 1.2-rc4

diff --git a/aircrack-ng.spec b/aircrack-ng.spec
index ceda14641a3b30d56d62a3fee9a42d7e9d84f593..7616f484f416bf68d7d399d2badce1363bbbab21 100644 (file)
--- a/aircrack-ng.spec
+++ b/aircrack-ng.spec
@@ -15,8 +15,8 @@
 %bcond_without experimental
 %bcond_with    ext_scripts             # build with extra scripts (NFY)
 
-%define        subver  rc2
-%define        rel     0.2
+%define        subver  rc4
+%define        rel     1
 Summary:       Reliable 802.11 (wireless) sniffer and WEP/WPA-PSK key cracker
 Summary(pl.UTF-8):     Pewny sniffer 802.11 (sieci bezprzewodowe) i łamacz kluczy WEP/WPA-PSK
 Name:          aircrack-ng
@@ -25,12 +25,11 @@ Release:    %{subver}.%{rel}
 License:       GPL
 Group:         Applications/Networking
 Source0:       http://download.aircrack-ng.org/%{name}-%{version}-%{subver}.tar.gz
-# Source0-md5: ebe9d537f06f4d6956213af09c4476da
+# Source0-md5: 3bbc7d5035a98ec01e78774d05c3fcce
 URL:           http://www.aircrack-ng.org/
 Patch0:                install.patch
 Patch1:                pldflags.patch
 Patch2:                install_besside_manual.patch
-Patch3:                use_standard_sleep.patch
 BuildRequires: libnl-devel
 BuildRequires: openssl-devel
 %{?with_pcre:BuildRequires:    pcre-devel}
@@ -65,7 +64,6 @@ convert, etc.).
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__make} -j1 \
@@ -74,7 +72,7 @@ convert, etc.).
        %{?with_pcre: pcre=true} \
        %{?with_sqlite: sqlite=true} \
        CC="%{__cc}" \
-       PLDFLAGS="%{rpmcppflags} %{rpmcflags}"
+       PLDFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -129,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/airtun-ng.8*
 
 %if %{with experimental}
+%attr(755,root,root) %{_bindir}/besside-ng-crawler
 %attr(755,root,root) %{_bindir}/buddy-ng
 %attr(755,root,root) %{_sbindir}/besside-ng
 %attr(755,root,root) %{_sbindir}/easside-ng

diff --git a/install.patch b/install.patch
index 6ec62389e9a87caed9b7b5a4a49690e5de014ba6..60bd84bc32d0fd992486914c07a7b5590efcdba7 100644 (file)
--- a/install.patch
+++ b/install.patch
@@ -11,7 +11,7 @@
        $(MAKE) -C doc install 
 --- aircrack-ng-1.2-rc2/scripts/airgraph-ng/Makefile.orig      2015-11-15 19:19:13.576610550 +0100
 +++ aircrack-ng-1.2-rc2/scripts/airgraph-ng/Makefile   2015-11-15 19:40:45.567167477 +0100
-@@ -8,12 +8,12 @@ all:
+@@ -8,13 +8,12 @@ all:
        @echo "Nothing to do. Run make install"
  
  install: doc
@@ -22,7 +22,7 @@
        $(MAKE) -C man install 
 -      install -d $(prefix)$(docdir)
 -      install -d $(prefix)/share/airgraph-ng
-+      install -d $(DESTDIR)$(docdir)
+       install -d $(DESTDIR)$(docdir)
 +      install -d $(DESTDIR)$(prefix)/share/airgraph-ng
        install -m 644 $(DOCFILES) $(DESTDIR)$(docdir)
  

diff --git a/pldflags.patch b/pldflags.patch
index 600f6671a3ff88e7a58a82ffe84ff85d4ea71148..74c7b9d3d25e4b00b79ac04360096e77cbd147e3 100644 (file)
--- a/pldflags.patch
+++ b/pldflags.patch
@@ -3,9 +3,9 @@
 @@ -118,7 +118,7 @@ REVISION   = $(shell $(AC_ROOT)/evalrev $(
  REVFLAGS      ?= -D_REVISION=$(REVISION)
  
- OPTFLAGS        = -D_FILE_OFFSET_BITS=64
--CFLAGS          ?= -g -W -Wall -O3
-+CFLAGS          ?= -g -W -Wall $(PLDFLAGS)
- CFLAGS          += $(OPTFLAGS) $(REVFLAGS) $(COMMON_CFLAGS)
+ OPTFLAGS      = -D_FILE_OFFSET_BITS=64
+-CFLAGS                ?= -g -W -Wall -O3 
++CFLAGS                ?= -g -W -Wall $(PLDFLAGS)
  
- prefix          = /usr/local
+ ifeq ($(subst TRUE,true,$(filter TRUE true,$(icc) $(ICC))),true)
+       ICCMODE = Y

diff --git a/use_standard_sleep.patch b/use_standard_sleep.patch
deleted file mode 100644 (file)
index 46a6692..0000000
--- a/use_standard_sleep.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- aircrack-ng-1.2-rc2/scripts/airmon-ng.orig 2015-11-24 12:54:48.642540223 +0100
-+++ aircrack-ng-1.2-rc2/scripts/airmon-ng      2015-11-24 12:57:14.755185878 +0100
-@@ -236,7 +236,7 @@ startMac80211Iface() {
-       IW_ERROR=$(iw phy ${PHYDEV} interface add ${1}mon type monitor 2>&1 | grep "nl80211 not found")
-       if [ x${IW_ERROR} = "x" ]
-       then
--              sleep 1s
-+              sleep 1
-               setChannelMac80211 ${1}mon
-               printf "\n\t\t(mac80211 monitor mode vif enabled for [${PHYDEV}]${1} on [${PHYDEV}]${1}mon)\n"
-       else
-@@ -1095,7 +1095,7 @@ do
- 
-               #why, dear god why is there a random newline here?
-               printf "\n"
--              sleep 1s
-+              sleep 1
-               continue
-       fi
- done