From dd501e42026dc20d0599466848f2f4fc26acae6a Mon Sep 17 00:00:00 2001
From: John W. Linville <linville@tuxdriver.com>
Date: Feb 14 2014 18:51:10 +0000
Subject: Update to version 2.1 from upstream


- Remove obsolete patch for libnl build documentation

---

diff --git a/.gitignore b/.gitignore
index 8765ec2..8cfbb39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/hostapd-2.0.tar.gz
+/hostapd-2.1.tar.gz
diff --git a/hostapd-RPM_OPT_FLAGS.patch b/hostapd-RPM_OPT_FLAGS.patch
index 962d9ab..cf52765 100644
--- a/hostapd-RPM_OPT_FLAGS.patch
+++ b/hostapd-RPM_OPT_FLAGS.patch
@@ -1,12 +1,12 @@
-diff -up hostapd-0.7.3/hostapd/Makefile.orig hostapd-0.7.3/hostapd/Makefile
---- hostapd-0.7.3/hostapd/Makefile.orig	2010-09-07 11:43:39.000000000 -0400
-+++ hostapd-0.7.3/hostapd/Makefile	2010-12-23 11:50:25.291553001 -0500
+diff -up hostapd-2.1/hostapd/Makefile.rpmopt hostapd-2.1/hostapd/Makefile
+--- hostapd-2.1/hostapd/Makefile.rpmopt	2014-02-14 13:25:29.935475165 -0500
++++ hostapd-2.1/hostapd/Makefile	2014-02-14 13:26:21.701915670 -0500
 @@ -6,6 +6,8 @@ ifndef CFLAGS
  CFLAGS = -MMD -O2 -Wall -g
  endif
  
 +CFLAGS += $(EXTRA_CFLAGS)
 +
- CFLAGS += -I../src
- CFLAGS += -I../src/utils
+ CFLAGS += -I$(abspath ../src)
+ CFLAGS += -I$(abspath ../src/utils)
  
diff --git a/hostapd-document-libnl-configuration.patch b/hostapd-document-libnl-configuration.patch
deleted file mode 100644
index 384d594..0000000
--- a/hostapd-document-libnl-configuration.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/hostapd/defconfig
-+++ b/hostapd/defconfig
-@@ -22,6 +22,19 @@ CONFIG_DRIVER_HOSTAP=y
- # Driver interface for drivers using the nl80211 kernel interface
- CONFIG_DRIVER_NL80211=y
- 
-+# driver_nl80211.c requires libnl. If you are compiling it yourself
-+# you may need to point hostapd to your version of libnl.
-+#
-+#CFLAGS += -I$<path to libnl include files>
-+#LIBS += -L$<path to libnl library files>
-+
-+# Use libnl v2.0 (or 3.0) libraries.
-+#CONFIG_LIBNL20=y
-+
-+# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
-+#CONFIG_LIBNL32=y
-+
-+
- # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
- #CONFIG_DRIVER_BSD=y
- #CFLAGS += -I/usr/local/include
diff --git a/hostapd.spec b/hostapd.spec
index 6d9e35d..c04a596 100644
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:           hostapd
-Version:        2.0
-Release:        6%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 License:        BSD
 URL:            http://w1.fi/hostapd
@@ -14,7 +14,6 @@ Source3:        %{name}.sysconfig
 Source4:        %{name}.init
 Patch0:         %{name}-RPM_OPT_FLAGS.patch
 Patch1:         %{name}-EAP-TLS-server-Fix-TLS-Message-Length-validation.patch
-Patch2:         %{name}-document-libnl-configuration.patch
 
 BuildRequires:  libnl3-devel
 BuildRequires:  openssl-devel
@@ -54,14 +53,11 @@ Logwatch scripts for hostapd.
 %setup -q
 
 # Hack Makefile to allow use of RPM_OPT_FLAGS
-%patch0 -p1
+%patch0 -p1 -b .rpmopt
 
 # git://w1.fi/srv/git/hostap.git
 # 	commit 586c446e0ff42ae00315b014924ec669023bd8de
-%patch1 -p1
-
-# http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff;h=3043b4f4550a71487bd9f0cc876d1baddbb7bb5d
-%patch2 -p1
+%patch1 -p1 -b .message_length
 
 # Prepare default config file
 cat %{SOURCE2} | sed -e 's/HOSTAPD_VERSION/'%{version}'/' > %{name}.conf
@@ -180,6 +176,10 @@ fi
 %{_sysconfdir}/logwatch/scripts/services/%{name}
 
 %changelog
+* Fri Feb 14 2014 John W. Linville <linville@redhat.com> - 2.1-1
+- Update to version 2.1 from upstream
+- Remove obsolete patch for libnl build documentation
+
 * Mon Feb 03 2014 Simone Caronni <negativo17@gmail.com> - 2.0-6
 - Add libnl build documentation and switch libnl-devel to libnl3-devel build
   dependency (#1041471).
diff --git a/sources b/sources
index 26ffcc0..a382f1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba22e639bc57aa4035d2ea8ffa9bbbee  hostapd-2.0.tar.gz
+bb9c50e87c5af6f89f387e63911effac  hostapd-2.1.tar.gz