Control: reassign -1 wpa
Control: tags -1 + patch

Hi Stefan,

On Fri, Feb 21, 2014 at 02:26:30AM +0000, Stefan Lippers-Hollmann wrote:
> On Monday 18 February 2013, Matthew Newton wrote:
> > The wpa_supplicant package contains a really useful tool,
> > eapol_test. It is not currently packaged, and it would be great if
> > this could be. Use of this, for example, often comes up on the

> At the moment, as of wpa_supplicant 1.1, this causes too many build 
> problems, e.g. right now (after fixing the first one), I'm at:
...
> I will revisit this once we've switched to wpa 2.1 (very soon), but
> won't make any promises yet; an updated and slightly fixed variant of 
> your patch is attached.

I have updated the patch again for the latest source wpa package.

This builds cleanly with sbuild on jessie and unstable, and passes
lintian checks on both (aside from warnings not from this patch).

Is this able to be added now, please?

Many thanks!

Matthew


-- 
Matthew Newton, Ph.D. <m...@le.ac.uk>

Systems Specialist, Infrastructure Services,
I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom

For IT help contact helpdesk extn. 2253, <ith...@le.ac.uk>
diff --git a/debian/config/wpasupplicant/kfreebsd b/debian/config/wpasupplicant/kfreebsd
index 8179215..efd4d8a 100644
--- a/debian/config/wpasupplicant/kfreebsd
+++ b/debian/config/wpasupplicant/kfreebsd
@@ -185,7 +185,7 @@ CONFIG_HT_OVERRIDES=y
 CONFIG_VHT_OVERRIDES=y
 
 # Development testing
-#CONFIG_EAPOL_TEST=y
+CONFIG_EAPOL_TEST=y
 
 # Select control interface backend for external programs, e.g, wpa_cli:
 # unix = UNIX domain sockets (default for Linux/*BSD)
diff --git a/debian/config/wpasupplicant/linux b/debian/config/wpasupplicant/linux
index 2224fc3..9018eb5 100644
--- a/debian/config/wpasupplicant/linux
+++ b/debian/config/wpasupplicant/linux
@@ -185,7 +185,7 @@ CONFIG_HT_OVERRIDES=y
 CONFIG_VHT_OVERRIDES=y
 
 # Development testing
-#CONFIG_EAPOL_TEST=y
+CONFIG_EAPOL_TEST=y
 
 # Select control interface backend for external programs, e.g, wpa_cli:
 # unix = UNIX domain sockets (default for Linux/*BSD)
diff --git a/debian/control b/debian/control
index 0ade1ee..e109346 100644
--- a/debian/control
+++ b/debian/control
@@ -97,3 +97,13 @@ Description: Client support for WPA and WPA2 (IEEE 802.11i)
  association with IEEE 802.11i networks.
  .
  This is a udeb of wpasupplicant for use by the debian-installer.
+
+Package: eapoltest
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: EAPoL testing utility
+ eapol_test allows testing EAP authentication methods without using
+ a full 802.1X connection. It is frequently used to test the EAP
+ configuration of RADIUS systems. It is an administrator tool and not
+ required for standard 802.1X authentication.
diff --git a/debian/eapoltest.install b/debian/eapoltest.install
new file mode 100644
index 0000000..d3fe2c3
--- /dev/null
+++ b/debian/eapoltest.install
@@ -0,0 +1 @@
+wpa_supplicant/eapol_test usr/bin/
diff --git a/debian/eapoltest.lintian-overrides b/debian/eapoltest.lintian-overrides
new file mode 100644
index 0000000..45ffdbc
--- /dev/null
+++ b/debian/eapoltest.lintian-overrides
@@ -0,0 +1,6 @@
+# We distribute the package under the terms of the BSD license due to the
+# openssl issue, tell lintian to not complain:
+eapoltest: possible-gpl-code-linked-with-openssl
+
+# These are numerous and unlikely to be fixed anytime soon, filter them out.
+eapoltest: hyphen-used-as-minus-sign
diff --git a/debian/eapoltest.manpages b/debian/eapoltest.manpages
new file mode 100644
index 0000000..1c02297
--- /dev/null
+++ b/debian/eapoltest.manpages
@@ -0,0 +1 @@
+wpa_supplicant/doc/docbook/eapol_test.8
diff --git a/debian/rules b/debian/rules
index 478b47e..135ac62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,8 @@ override_dh_auto_build:
 	              --buildsystem=makefile \
 		      --parallel
 	dh_auto_clean --sourcedirectory=src --buildsystem=makefile
+	# build eapol_test
+	$(MAKE) -C wpa_supplicant/ eapol_test
 
 override_dh_auto_clean:
 	dh_auto_clean --sourcedirectory=wpa_supplicant/doc/docbook \
@@ -118,6 +120,7 @@ override_dh_installchangelogs:
 	dh_installchangelogs --package=hostapd hostapd/ChangeLog
 	dh_installchangelogs --package=wpasupplicant wpa_supplicant/ChangeLog
 	dh_installchangelogs --package=wpagui wpa_supplicant/ChangeLog
+	dh_installchangelogs --package=eapoltest wpa_supplicant/ChangeLog
 
 override_dh_gencontrol:
 	dh_gencontrol -phostapd -- '-v1:$(VERSION)'

Reply via email to