diff --git a/net/wpa_supplicant/Makefile b/net/wpa_supplicant/Makefile index 45837aa22eda1..626056c92887e 100644 --- a/net/wpa_supplicant/Makefile +++ b/net/wpa_supplicant/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2016/08/17 04:57:47 maya Exp $ +# $NetBSD: Makefile,v 1.17 2016/11/16 15:07:34 maya Exp $ # -DISTNAME= wpa_supplicant-2.5 +DISTNAME= wpa_supplicant-2.6 CATEGORIES= net MASTER_SITES= http://hostap.epitest.fi/releases/ diff --git a/net/wpa_supplicant/distinfo b/net/wpa_supplicant/distinfo index 03ca3890582c0..e3d6fbedaac7a 100644 --- a/net/wpa_supplicant/distinfo +++ b/net/wpa_supplicant/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.8 2016/08/17 04:57:47 maya Exp $ +$NetBSD: distinfo,v 1.9 2016/11/16 15:07:34 maya Exp $ -SHA1 (wpa_supplicant-2.5.tar.gz) = f82281c719d2536ec4783d9442c42ff956aa39ed -RMD160 (wpa_supplicant-2.5.tar.gz) = 07bf2b9646b0d7dec3e3507e9ef04e71784c359f -SHA512 (wpa_supplicant-2.5.tar.gz) = e3ca36ed10b4dae8f663e98ad230c8c059c952316c21a6b0638ecb1b40a5ef1b9083138ab45207cb764a17e870b4bd0625dd6efdb65856cb4dca13ccc0559e81 -Size (wpa_supplicant-2.5.tar.gz) = 2607336 bytes +SHA1 (wpa_supplicant-2.6.tar.gz) = 8189704e257c3e9f8300c49dc6e49a381b1d6299 +RMD160 (wpa_supplicant-2.6.tar.gz) = 2fb26394d22ac3acde2d9d7c6543af8eaac9c55a +SHA512 (wpa_supplicant-2.6.tar.gz) = 46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6 +Size (wpa_supplicant-2.6.tar.gz) = 2753524 bytes SHA1 (patch-aa) = 998ba9cc4ef9ebd0b629a6368957da0f1159dda0 -SHA1 (patch-src_utils_common.h) = 3bf10d911822e4de657e12ee88e31d215a868fa0 diff --git a/net/wpa_supplicant/patches/patch-src_utils_common.h b/net/wpa_supplicant/patches/patch-src_utils_common.h deleted file mode 100644 index 553831c4d59f9..0000000000000 --- a/net/wpa_supplicant/patches/patch-src_utils_common.h +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-src_utils_common.h,v 1.1 2016/08/17 04:57:47 maya Exp $ - ---- src/utils/common.h.orig 2015-09-27 19:02:05.000000000 +0000 -+++ src/utils/common.h -@@ -11,6 +11,14 @@ - - #include "os.h" - -+/* -+ * NetBSD net/if.h defines if_type as a macro, -+ * which conflicts with the use of it in the code. -+ */ -+#if defined(__NetBSD__) -+#undef if_type -+#endif -+ - #if defined(__linux__) || defined(__GLIBC__) - #include - #include