From owner-svn-ports-head@freebsd.org Wed Jan 15 11:04:12 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 557CF1F0696; Wed, 15 Jan 2020 11:04:12 +0000 (UTC) (envelope-from martymac@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 47yPbJ1LxTz4NN5; Wed, 15 Jan 2020 11:04:12 +0000 (UTC) (envelope-from martymac@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 29B3258C4; Wed, 15 Jan 2020 11:04:12 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00FB4CBo091244; Wed, 15 Jan 2020 11:04:12 GMT (envelope-from martymac@FreeBSD.org) Received: (from martymac@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00FB4Bnj091242; Wed, 15 Jan 2020 11:04:11 GMT (envelope-from martymac@FreeBSD.org) Message-Id: <202001151104.00FB4Bnj091242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: martymac set sender to martymac@FreeBSD.org using -f From: Ganael LAPLANCHE Date: Wed, 15 Jan 2020 11:04:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523101 - in head/ftp/lftp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: martymac X-SVN-Commit-Paths: in head/ftp/lftp: . files X-SVN-Commit-Revision: 523101 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Wed, 15 Jan 2020 11:04:12 -0000 Author: martymac Date: Wed Jan 15 11:04:11 2020 New Revision: 523101 URL: https://svnweb.freebsd.org/changeset/ports/523101 Log: Fix segmentation fault at startup when IPv6 is enabled Backport commit 5d34493 from upstream. PR: 243307 Submitted by: Victor Sudakov Obtained from: Github MFH: 2020Q1 Added: head/ftp/lftp/files/patch-5d34493.txt (contents, props changed) Modified: head/ftp/lftp/Makefile Modified: head/ftp/lftp/Makefile ============================================================================== --- head/ftp/lftp/Makefile Wed Jan 15 10:51:47 2020 (r523100) +++ head/ftp/lftp/Makefile Wed Jan 15 11:04:11 2020 (r523101) @@ -3,6 +3,7 @@ PORTNAME= lftp PORTVERSION= 4.9.0 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= http://lftp.tech/ftp/ \ http://lftp.tech/ftp/old/ \ Added: head/ftp/lftp/files/patch-5d34493.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/lftp/files/patch-5d34493.txt Wed Jan 15 11:04:11 2020 (r523101) @@ -0,0 +1,102 @@ +commit 5d344937d60380341c20409c11f135afb630d7ee +Author: Alexander V. Lukyanov +Date: Sat Jan 11 19:20:46 2020 +0300 + + check for ipv6 in resolver to avoid global init order problems (fix #557, fix #562) + +diff --git a/src/Resolver.cc b/src/Resolver.cc +index 0332d5be..4e119966 100644 +--- src/Resolver.cc ++++ src/Resolver.cc +@@ -355,6 +355,19 @@ int Resolver::FindAddressFamily(const char *name) + return -1; + } + ++bool Resolver::IsAddressFamilySupporded(int af) ++{ ++#if INET6 ++ // check if ipv6 is really supported ++ if(af==AF_INET6 && (!FindGlobalIPv6Address() || !CanCreateIpv6Socket())) ++ { ++ LogNote(4, "IPv6 is not supported or configured"); ++ return false; ++ } ++#endif // INET6 ++ return true; ++} ++ + void Resolver::ParseOrder(const char *s,int *o) + { + const char * const delim="\t "; +@@ -364,7 +377,7 @@ void Resolver::ParseOrder(const char *s,int *o) + for(s1=strtok(s1,delim); s1; s1=strtok(0,delim)) + { + int af=FindAddressFamily(s1); +- if(af!=-1 && idx<15) ++ if(af!=-1 && idx<15 && IsAddressFamilySupporded(af)) + { + if(o) o[idx]=af; + idx++; +diff --git a/src/Resolver.h b/src/Resolver.h +index 724714d9..18eeed42 100644 +--- src/Resolver.h ++++ src/Resolver.h +@@ -26,7 +26,7 @@ + #include "Cache.h" + #include "network.h" + +-class Resolver : public SMTask, protected ProtoLog ++class Resolver : public SMTask, protected ProtoLog, protected Networker + { + xstring hostname; + xstring portname; +@@ -53,6 +53,7 @@ class Resolver : public SMTask, protected ProtoLog + void DoGethostbyname(); + + static int FindAddressFamily(const char *name); ++ static bool IsAddressFamilySupporded(int af); + static void ParseOrder(const char *s,int *o); + + void LookupOne(const char *name); +diff --git a/src/network.cc b/src/network.cc +index e54076de..ea1b02eb 100644 +--- src/network.cc ++++ src/network.cc +@@ -454,7 +454,7 @@ const char *Networker::FindGlobalIPv6Address() + return 0; + } + +-static bool CanCreateIpv6Socket() ++bool Networker::CanCreateIpv6Socket() + { + #if INET6 + bool can=true; +@@ -472,16 +472,3 @@ static bool CanCreateIpv6Socket() + return false; + #endif + } +- +-static struct NetworkInit : private Networker { +- NetworkInit(); +-} NETWORK_INIT; +- +-NetworkInit::NetworkInit() +-{ +-#if INET6 +- // check if ipv6 is really supported +- if(!Networker::FindGlobalIPv6Address() || !CanCreateIpv6Socket()) +- ResMgr::Set("dns:order",0,"inet"); +-#endif // INET6 +-} +diff --git a/src/network.h b/src/network.h +index 3223ce82..e4ede6ef 100644 +--- src/network.h ++++ src/network.h +@@ -140,6 +140,7 @@ protected: + static int SocketCreateUnboundTCP(int af,const char *hostname); + static void SocketSinglePF(int sock,int pf); + static const char *FindGlobalIPv6Address(); ++ static bool CanCreateIpv6Socket(); + }; + + #endif //NETWORK_H