[pkg-wpa-devel] r925 - in /wpasupplicant/trunk/debian: changelog control patches/01_defconfig.patch patches/31_pcsc_funcs_printf_warnings.patch patches/series
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Tue Dec 25 16:10:02 UTC 2007
Author: kelmo-guest
Date: Tue Dec 25 16:10:02 2007
New Revision: 925
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=925
Log:
* Activate support for PC/SC interface for smartcards along with SIM and AKA
EAP methods. Build-depend on libpcsclite-dev.
* Add debian/patches/31_pcsc_funcs_printf_warnings.patch to fix compilation
warnings in src/utils/pcsc_funcs.c.
Added:
wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/control
wpasupplicant/trunk/debian/patches/01_defconfig.patch
wpasupplicant/trunk/debian/patches/series
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=925&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Tue Dec 25 16:10:02 2007
@@ -25,8 +25,12 @@
* /var/lock/wpa_action.*.lock was not used in a version of wpasupplicant
package in a stable release, no longer need to handle its removal in
postrm anymore.
-
- -- Kel Modderman <kel at otaku42.de> Wed, 26 Dec 2007 01:31:24 +1000
+ * Activate support for PC/SC interface for smartcards along with SIM and AKA
+ EAP methods. Build-depend on libpcsclite-dev.
+ * Add debian/patches/31_pcsc_funcs_printf_warnings.patch to fix compilation
+ warnings in src/utils/pcsc_funcs.c.
+
+ -- Kel Modderman <kel at otaku42.de> Wed, 26 Dec 2007 02:07:13 +1000
wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=925&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Tue Dec 25 16:10:02 2007
@@ -4,7 +4,7 @@
Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
Uploaders: Kyle McMartin <kyle at debian.org>, Reinhard Tartler <siretart at tauware.de>, Kel Modderman <kel at otaku42.de>
Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5), quilt, libssl-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev, docbook, docbook-utils
+Build-Depends: debhelper (>= 5), quilt, libssl-dev, libpcsclite-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev, docbook, docbook-utils
Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/
Homepage: http://w1.fi/wpa_supplicant/
Modified: wpasupplicant/trunk/debian/patches/01_defconfig.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/01_defconfig.patch?rev=925&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/01_defconfig.patch (original)
+++ wpasupplicant/trunk/debian/patches/01_defconfig.patch Tue Dec 25 16:10:02 2007
@@ -105,7 +105,7 @@
+CONFIG_EAP_OTP=y
+
+# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-+#CONFIG_EAP_SIM=y
++CONFIG_EAP_SIM=y
+
+# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
+CONFIG_EAP_PSK=y
@@ -117,7 +117,7 @@
+CONFIG_EAP_LEAP=y
+
+# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-+#CONFIG_EAP_AKA=y
++CONFIG_EAP_AKA=y
+
+# EAP-SAKE
+#CONFIG_EAP_SAKE=y
@@ -143,7 +143,7 @@
+
+# PC/SC interface for smartcards (USIM, GSM SIM)
+# Enable this if EAP-SIM or EAP-AKA is included
-+#CONFIG_PCSC=y
++CONFIG_PCSC=y
+
+# Development testing
+#CONFIG_EAPOL_TEST=y
Added: wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch?rev=925&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch (added)
+++ wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch Tue Dec 25 16:10:02 2007
@@ -1,0 +1,81 @@
+--- a/src/utils/pcsc_funcs.c
++++ b/src/utils/pcsc_funcs.c
+@@ -848,7 +848,7 @@
+ }
+ if (blen != len + 2) {
+ wpa_printf(MSG_DEBUG, "SCARD: record read returned unexpected "
+- "length %d (expected %d)", blen, len + 2);
++ "length %zd (expected %zd)", blen, len + 2);
+ os_free(buf);
+ return -3;
+ }
+@@ -891,7 +891,7 @@
+ }
+ if (blen != len + 2) {
+ wpa_printf(MSG_DEBUG, "SCARD: file read returned unexpected "
+- "length %d (expected %d)", blen, len + 2);
++ "length %zd (expected %zd)", blen, len + 2);
+ os_free(buf);
+ return -3;
+ }
+@@ -969,7 +969,7 @@
+ return -1;
+ if (blen < 4) {
+ wpa_printf(MSG_WARNING, "SCARD: too short (GSM) EF-IMSI "
+- "header (len=%d)", blen);
++ "header (len=%zd)", blen);
+ return -2;
+ }
+
+@@ -982,13 +982,13 @@
+ blen = file_size;
+ }
+ if (blen < 2 || blen > sizeof(buf)) {
+- wpa_printf(MSG_DEBUG, "SCARD: invalid IMSI file length=%d",
++ wpa_printf(MSG_DEBUG, "SCARD: invalid IMSI file length=%zd",
+ blen);
+ return -3;
+ }
+
+ imsilen = (blen - 2) * 2 + 1;
+- wpa_printf(MSG_DEBUG, "SCARD: IMSI file length=%d imsilen=%d",
++ wpa_printf(MSG_DEBUG, "SCARD: IMSI file length=%zd imsilen=%zd",
+ blen, imsilen);
+ if (blen < 2 || imsilen > *len) {
+ *len = imsilen;
+@@ -1071,7 +1071,7 @@
+ (scard->sim_type == SCARD_USIM &&
+ (len != 2 || resp[0] != 0x61 || resp[1] != 0x0e))) {
+ wpa_printf(MSG_WARNING, "SCARD: unexpected response for GSM "
+- "auth request (len=%d resp=%02x %02x)",
++ "auth request (len=%zd resp=%02x %02x)",
+ len, resp[0], resp[1]);
+ return -3;
+ }
+@@ -1085,7 +1085,7 @@
+ if (scard->sim_type == SCARD_GSM_SIM) {
+ if (len != 4 + 8 + 2) {
+ wpa_printf(MSG_WARNING, "SCARD: unexpected data "
+- "length for GSM auth (len=%d, expected 14)",
++ "length for GSM auth (len=%zd, expected 14)",
+ len);
+ return -5;
+ }
+@@ -1094,7 +1094,7 @@
+ } else {
+ if (len != 1 + 4 + 1 + 8 + 2) {
+ wpa_printf(MSG_WARNING, "SCARD: unexpected data "
+- "length for USIM auth (len=%d, "
++ "length for USIM auth (len=%zd, "
+ "expected 16)", len);
+ return -5;
+ }
+@@ -1176,7 +1176,7 @@
+ return -1;
+ } else if (len != 2 || resp[0] != 0x61) {
+ wpa_printf(MSG_WARNING, "SCARD: unexpected response for UMTS "
+- "auth request (len=%d resp=%02x %02x)",
++ "auth request (len=%zd resp=%02x %02x)",
+ len, resp[0], resp[1]);
+ return -1;
+ }
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=925&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Tue Dec 25 16:10:02 2007
@@ -3,3 +3,4 @@
20_madwifi_headers.patch
21_config_driver_madwifi.patch
30_wpa_gui_const_char_warnings.patch
+31_pcsc_funcs_printf_warnings.patch
More information about the Pkg-wpa-devel
mailing list