From 0d84226850d8b8fe12e30a8f6b350d695fc11f2b Mon Sep 17 00:00:00 2001
From: John W. Linville <linville@tuxdriver.com>
Date: Nov 21 2014 19:40:26 +0000
Subject: Further simplify hostapd.conf installation


- Rebase "EAP-TLS server" patch to 2.3

---

diff --git a/hostapd-EAP-TLS-server-Fix-TLS-Message-Length-validation.patch b/hostapd-EAP-TLS-server-Fix-TLS-Message-Length-validation.patch
index f550d7a..dee044e 100644
--- a/hostapd-EAP-TLS-server-Fix-TLS-Message-Length-validation.patch
+++ b/hostapd-EAP-TLS-server-Fix-TLS-Message-Length-validation.patch
@@ -28,7 +28,7 @@ diff --git a/src/eap_server/eap_server_tls_common.c b/src/eap_server/eap_server_
 index 31be2ec..46f282b 100644
 --- a/src/eap_server/eap_server_tls_common.c
 +++ b/src/eap_server/eap_server_tls_common.c
-@@ -228,6 +228,14 @@ static int eap_server_tls_process_fragment(struct eap_ssl_data *data,
+@@ -261,6 +261,14 @@
  			return -1;
  		}
  
diff --git a/hostapd.spec b/hostapd.spec
index 4ce4595..d0316cf 100644
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -2,7 +2,7 @@
 
 Name:           hostapd
 Version:        2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 License:        BSD
 URL:            http://w1.fi/hostapd
@@ -59,9 +59,6 @@ Logwatch scripts for hostapd.
 # 	commit 586c446e0ff42ae00315b014924ec669023bd8de
 %patch1 -p1 -b .message_length
 
-# Prepare default config file
-cp %{SOURCE2} %{name}.conf
-
 %build
 cd hostapd
 cat defconfig | sed \
@@ -100,7 +97,7 @@ install -pm 0755 %{name}/logwatch/%{name} \
 
 # config files
 install -d %{buildroot}/%{_sysconfdir}/%{name}
-install -pm 0600 %{name}.conf %{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf
+install -pm 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}
 
 install -d %{buildroot}/%{_sysconfdir}/sysconfig
 install -pm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
@@ -176,6 +173,10 @@ fi
 %{_sysconfdir}/logwatch/scripts/services/%{name}
 
 %changelog
+* Sun Nov 02 2014 poma <poma@gmail.com> - 2.3-3
+- Further simplify hostapd.conf installation
+- Rebase "EAP-TLS server" patch to 2.3
+
 * Tue Oct 28 2014 John W. Linville <linville@redhat.com> - 2.3-2
 - Remove version info from /usr/share/doc/hostapd/hostapd.conf