From owner-svn-ports-head@freebsd.org Thu May 16 02:54:57 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33CD015AA3C2; Thu, 16 May 2019 02:54:57 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CBF9485002; Thu, 16 May 2019 02:54:56 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4F701AC50; Thu, 16 May 2019 02:54:56 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4G2suxc038372; Thu, 16 May 2019 02:54:56 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4G2sul2038370; Thu, 16 May 2019 02:54:56 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201905160254.x4G2sul2038370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 16 May 2019 02:54:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501765 - head/security/wpa_supplicant/files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/security/wpa_supplicant/files X-SVN-Commit-Revision: 501765 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CBF9485002 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2019 02:54:57 -0000 Author: cy Date: Thu May 16 02:54:56 2019 New Revision: 501765 URL: https://svnweb.freebsd.org/changeset/ports/501765 Log: Completely remove a "nullfied" ifdef rather than making the code unreachable. Though this is only a cosmetic change it syncs the port with base commit r347642, making it easier to compare the two when diagnosing problems in one or the other. This was discovered tonight while reviewing some code following my discussion regarding an issue lwhsu@ was having earlier today. Modified: head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c (contents, props changed) Modified: head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c ============================================================================== --- head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c Thu May 16 02:41:29 2019 (r501764) +++ head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c Thu May 16 02:54:56 2019 (r501765) @@ -1,11 +1,16 @@ ---- wpa_supplicant/wpa_supplicant.c.orig 2015-03-15 17:30:39 UTC -+++ wpa_supplicant/wpa_supplicant.c -@@ -4506,7 +4506,7 @@ struct wpa_global * wpa_supplicant_init( +--- wpa_supplicant/wpa_supplicant.c.orig 2019-04-21 03:10:22.000000000 -0400 ++++ wpa_supplicant/wpa_supplicant.c 2019-05-15 22:44:44.919859000 -0400 +@@ -6357,13 +6357,6 @@ if (params == NULL) return NULL; -#ifdef CONFIG_DRIVER_NDIS -+#ifdef XXXCONFIG_DRIVER_NDIS - { - void driver_ndis_init_ops(void); - driver_ndis_init_ops(); +- { +- void driver_ndis_init_ops(void); +- driver_ndis_init_ops(); +- } +-#endif /* CONFIG_DRIVER_NDIS */ +- + #ifndef CONFIG_NO_WPA_MSG + wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); + #endif /* CONFIG_NO_WPA_MSG */