- up to 1.3

diff --git a/aircrack-ng.spec b/aircrack-ng.spec
index dca826a2439a270bc41c6daf554b77e92dc6c37e..35f016820fd2ddcbd4947b2288377295410a3a5f 100644 (file)
--- a/aircrack-ng.spec
+++ b/aircrack-ng.spec
@@ -11,28 +11,25 @@
 #
 # Conditional build:
 %bcond_without sqlite                  # build without sqlite support
-%bcond_without pcre                    # build without pcre support
 %bcond_without experimental
 %bcond_with    ext_scripts             # build with extra scripts (NFY)
 
-%define        subver  rc4
-%define        rel     2
 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
-Version:       1.2
-Release:       0.%{subver}.%{rel}
+Version:       1.3
+Release:       1
 License:       GPL
 Group:         Applications/Networking
-Source0:       http://download.aircrack-ng.org/%{name}-%{version}-%{subver}.tar.gz
-# Source0-md5: 3bbc7d5035a98ec01e78774d05c3fcce
+Source0:       http://download.aircrack-ng.org/%{name}-%{version}.tar.gz
+# Source0-md5: c7c5b076dee0c25ee580b0f56f455623
 URL:           http://www.aircrack-ng.org/
-Patch0:                install.patch
-Patch1:                pldflags.patch
-Patch2:                install_besside_manual.patch
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: libnl-devel
+BuildRequires: libtool
 BuildRequires: openssl-devel
-%{?with_pcre:BuildRequires:    pcre-devel}
+BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 %{?with_sqlite:BuildRequires:  sqlite3-devel}
 BuildRequires: zlib-devel
@@ -60,35 +57,35 @@ WEP/WPA) i paru narzędzi do obsługi plików przechwytów (merge,
 convert, etc.).
 
 %prep
-%setup -q -n %{name}-%{version}-%{subver}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q
 
 %build
-%{__make} -j1 \
-       %{?with_experimental: experimental=true} \
-       %{?with_ext_scripts: ext_scripts=true} \
-       %{?with_pcre: pcre=true} \
-       %{?with_sqlite: sqlite=true} \
-       CC="%{__cc}" \
-       PLDFLAGS="%{rpmcflags}"
+%{__libtoolize}
+%{__aclocal} -I build/m4/stubs -I build/m4
+%{__autoconf}
+%{__automake}
+%configure \
+       ETHTOOL=/sbin/ethtool \
+       --with-openssl \
+       --with%{!?with_experimental:out}-experimental \
+       --with%{!?with_ext_scripts:out}-ext-scripts \
+       --with-%{!?with_sqlite:out}-sqlite3 \
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
 %{__make} install \
-       %{?with_experimental: experimental=true} \
-       %{?with_ext_scripts: ext_scripts=true} \
-       %{?with_pcre: pcre=true} \
-       %{?with_sqlite: sqlite=true} \
-        prefix=%{_prefix} \
-        DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README test patches
@@ -106,8 +103,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/airmon-ng
 %attr(755,root,root) %{_sbindir}/airodump-ng
 %attr(755,root,root) %{_sbindir}/airodump-ng-oui-update
+%attr(755,root,root) %{_sbindir}/airventriloquist-ng
 %attr(755,root,root) %{_sbindir}/airserv-ng
 %attr(755,root,root) %{_sbindir}/airtun-ng
+%attr(755,root,root) %ghost %{_libdir}/libaircrack-crypto-x86-avx.so.0
+%attr(755,root,root) %{_libdir}/libaircrack-crypto-x86-avx.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libaircrack-crypto-x86-avx2.so.0
+%attr(755,root,root) %{_libdir}/libaircrack-crypto-x86-avx2.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libaircrack-crypto-x86-sse2.so.0
+%attr(755,root,root) %{_libdir}/libaircrack-crypto-x86-sse2.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libaircrack-crypto.so.0
+%attr(755,root,root) %{_libdir}/libaircrack-crypto.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libaircrack-osdep.so.0
+%attr(755,root,root) %{_libdir}/libaircrack-osdep.so.*.*
+
 %{_mandir}/man1/aircrack-ng.1*
 %{_mandir}/man1/airdecap-ng.1*
 %{_mandir}/man1/airdecloak-ng.1*
@@ -120,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/wpaclean.1*
 %{_mandir}/man8/airbase-ng.8*
 %{_mandir}/man8/aireplay-ng.8*
+%{_mandir}/man8/airventriloquist-ng.8*
 %{_mandir}/man8/airmon-ng.8*
 %{_mandir}/man8/airodump-ng-oui-update.8*
 %{_mandir}/man8/airodump-ng.8*

diff --git a/install.patch b/install.patch
deleted file mode 100644 (file)
index 60bd84b..0000000
--- a/install.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- aircrack-ng-1.2-rc2/scripts/airdrop-ng/Makefile.orig       2015-11-15 19:30:24.697474528 +0100
-+++ aircrack-ng-1.2-rc2/scripts/airdrop-ng/Makefile    2015-11-15 19:30:45.967673386 +0100
-@@ -8,7 +8,7 @@ all:
-       @echo "Nothing to do. Run make install"
- 
- install: doc
--      python setup.py install --prefix="$(prefix)" --record files.txt
-+      python setup.py install --prefix="$(prefix)" --record files.txt --root=$(DESTDIR)
- 
- doc:
-       $(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,13 +8,12 @@ all:
-       @echo "Nothing to do. Run make install"
- 
- install: doc
--      python setup.py install --prefix="$(prefix)" --record files.txt
-+      python setup.py install --prefix="$(prefix)" --record files.txt --root=$(DESTDIR)
- 
- doc:
-       $(MAKE) -C man install 
--      install -d $(prefix)$(docdir)
--      install -d $(prefix)/share/airgraph-ng
-       install -d $(DESTDIR)$(docdir)
-+      install -d $(DESTDIR)$(prefix)/share/airgraph-ng
-       install -m 644 $(DOCFILES) $(DESTDIR)$(docdir)
- 
- uninstall: clean
---- aircrack-ng-1.2-rc2/scripts/airoscript-ng/Makefile.orig    2015-11-15 20:01:54.558201732 +0100
-+++ aircrack-ng-1.2-rc2/scripts/airoscript-ng/Makefile 2015-11-15 20:22:37.877751547 +0100
-@@ -8,8 +8,8 @@ INSTALL = install -c
- INSTALLDATA = install -c -m 644
- INSTALLBIN = install -c -m 755
- 
--data=$(prefix)/share
--bindir=$(prefix)/sbin/
-+data=$(DESTDIR)$(prefix)/share
-+bindir=$(DESTDIR)$(prefix)/sbin/
- picdir=$(data)/pixmaps/
- appdir=$(data)/applications/
- locale=$(data)/locale
-@@ -75,9 +75,9 @@ install-desktop:
-       @xdg-desktop-menu install $(appdir)/airoscript-ng_gtk.desktop
- 
- generate-locale:
--      @for i in $(srcdir)/locale/* ; do \
-+      for i in $(srcdir)/locale/* ; do \
-               if [ -d $$i ] && [ $$i != "." ] && [ $$i != ".." ]; then \
--                      make -s -C $$i &> /dev/null ; \
-+                      make -s -C $$i localedir=$(locale); \
-               fi ; \
-       done
- 

diff --git a/install_besside_manual.patch b/install_besside_manual.patch
deleted file mode 100644 (file)
index c385d89..0000000
--- a/install_besside_manual.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- aircrack-ng-1.2-rc2/manpages/Makefile.orig 2015-11-17 15:50:00.786182478 +0100
-+++ aircrack-ng-1.2-rc2/manpages/Makefile      2015-11-17 15:50:44.776320924 +0100
-@@ -4,7 +4,7 @@ include                $(AC_ROOT)/common.mak
- MP_FILES      = aircrack-ng.1 airdecap-ng.1 ivstools.1 kstats.1 makeivs-ng.1 \
-                 packetforge-ng.1 airdecloak-ng.1 wpaclean.1 besside-ng-crawler.1
- 
--SMP_FILES     = aireplay-ng.8 airmon-ng.8 airodump-ng.8 besside-ng.8 \
-+SMP_FILES     = aireplay-ng.8 airmon-ng.8 airodump-ng.8 \
-                 airserv-ng.8 airtun-ng.8 airbase-ng.8 airodump-ng-oui-update.8 \
- 
- ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true)
-@@ -13,7 +13,7 @@ endif
- 
- ifeq ($(subst TRUE,true,$(filter TRUE true,$(experimental) $(EXPERIMENTAL))),true)
-       MP_FILES  += buddy-ng.1
--      SMP_FILES += tkiptun-ng.8 easside-ng.8 wesside-ng.8
-+      SMP_FILES += besside-ng.8 tkiptun-ng.8 easside-ng.8 wesside-ng.8
- endif
- 
- 

diff --git a/pldflags.patch b/pldflags.patch
deleted file mode 100644 (file)
index 74c7b9d..0000000
--- a/pldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- aircrack-ng-1.2-rc2/common.mak.orig        2015-11-17 13:23:14.717899992 +0100
-+++ aircrack-ng-1.2-rc2/common.mak     2015-11-17 13:24:33.161433664 +0100
-@@ -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)
- 
- ifeq ($(subst TRUE,true,$(filter TRUE true,$(icc) $(ICC))),true)
-       ICCMODE = Y