From owner-svn-ports-all@freebsd.org Tue Mar 21 08:58:02 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22A80D0AA48; Tue, 21 Mar 2017 08:58:02 +0000 (UTC) (envelope-from glebius@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 mx1.freebsd.org (Postfix) with ESMTPS id D4F831083; Tue, 21 Mar 2017 08:58:01 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2L8w0Fi014872; Tue, 21 Mar 2017 08:58:00 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2L8w0Zr014870; Tue, 21 Mar 2017 08:58:00 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201703210858.v2L8w0Zr014870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 21 Mar 2017 08:58:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436576 - in head/emulators/wine-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2017 08:58:02 -0000 Author: glebius (src committer) Date: Tue Mar 21 08:58:00 2017 New Revision: 436576 URL: https://svnweb.freebsd.org/changeset/ports/436576 Log: Make it compilable on FreeBSD 12 after struct inpcb and struct tcpcb were stopped being exported. Added: head/emulators/wine-devel/files/patch-dlls_iphlpapi_ipstats.c (contents, props changed) Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Tue Mar 21 08:42:58 2017 (r436575) +++ head/emulators/wine-devel/Makefile Tue Mar 21 08:58:00 2017 (r436576) @@ -3,6 +3,7 @@ PORTNAME= wine DISTVERSION= 2.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ Added: head/emulators/wine-devel/files/patch-dlls_iphlpapi_ipstats.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/wine-devel/files/patch-dlls_iphlpapi_ipstats.c Tue Mar 21 08:58:00 2017 (r436576) @@ -0,0 +1,46 @@ +--- dlls/iphlpapi/ipstats.c.orig 2017-03-03 12:18:32.000000000 -0800 ++++ dlls/iphlpapi/ipstats.c 2017-03-21 00:43:27.101175000 -0700 +@@ -2235,6 +2235,15 @@ + pXIG->xig_len > sizeof (struct xinpgen); + pXIG = (struct xinpgen *)((char *)pXIG + pXIG->xig_len)) + { ++#if __FreeBSD_version >= 1200026 ++ struct xtcpcb *pTCPData; ++ struct xinpcb *pINData; ++ struct xsocket *pSockData; ++ ++ pTCPData = (struct xtcpcb *)pXIG; ++ pINData = &pTCPData->xt_inp; ++ pSockData = &pINData->xi_socket; ++#else + struct tcpcb *pTCPData = NULL; + struct inpcb *pINData; + struct xsocket *pSockData; +@@ -2242,6 +2251,7 @@ + pTCPData = &((struct xtcpcb *)pXIG)->xt_tp; + pINData = &((struct xtcpcb *)pXIG)->xt_inp; + pSockData = &((struct xtcpcb *)pXIG)->xt_socket; ++#endif + + /* Ignore sockets for other protocols */ + if (pSockData->xso_protocol != IPPROTO_TCP) +@@ -2511,11 +2521,19 @@ + pXIG->xig_len > sizeof (struct xinpgen); + pXIG = (struct xinpgen *)((char *)pXIG + pXIG->xig_len)) + { ++#if __FreeBSD_version >= 1200026 ++ struct xinpcb *pINData; ++ struct xsocket *pSockData; ++ ++ pINData = (struct xinpcb *)pXIG; ++ pSockData = &pINData->xi_socket; ++#else + struct inpcb *pINData; + struct xsocket *pSockData; + + pINData = &((struct xinpcb *)pXIG)->xi_inp; + pSockData = &((struct xinpcb *)pXIG)->xi_socket; ++#endif + + /* Ignore sockets for other protocols */ + if (pSockData->xso_protocol != IPPROTO_UDP)