Date: Fri, 24 Jul 2020 20:21:33 +0000 (UTC) From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543378 - in head/net/frr7: . files Message-ID: <202007242021.06OKLXBR098104@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Fri Jul 24 20:21:32 2020 New Revision: 543378 URL: https://svnweb.freebsd.org/changeset/ports/543378 Log: Fix crash on config read PR: 248249 Submitted by: pi Reported by: Raul Munos <raul.munoz@custos.es>, Juraj Lutter <juraj@lutter.sk> Added: head/net/frr7/files/patch-lib_zlog.c (contents, props changed) Modified: head/net/frr7/Makefile Modified: head/net/frr7/Makefile ============================================================================== --- head/net/frr7/Makefile Fri Jul 24 20:17:12 2020 (r543377) +++ head/net/frr7/Makefile Fri Jul 24 20:21:32 2020 (r543378) @@ -3,6 +3,7 @@ PORTNAME= frr PORTVERSION= 7.4 DISTVERSIONPREFIX= frr- +PORTREVISION= 1 CATEGORIES= net .if defined(PYTHONTOOLS) PKGNAMESUFFIX= 7-pythontool Added: head/net/frr7/files/patch-lib_zlog.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/frr7/files/patch-lib_zlog.c Fri Jul 24 20:21:32 2020 (r543378) @@ -0,0 +1,16 @@ +--- lib/zlog.c.orig 2020-06-30 11:08:57 UTC ++++ lib/zlog.c +@@ -246,10 +246,10 @@ void zlog_tls_buffer_init(void) + fchown(mmfd, zlog_uid, zlog_gid); + + #ifdef HAVE_POSIX_FALLOCATE +- if (posix_fallocate(mmfd, 0, TLS_LOG_BUF_SIZE) < 0) { +-#else +- if (ftruncate(mmfd, TLS_LOG_BUF_SIZE) < 0) { ++ if (posix_fallocate(mmfd, 0, TLS_LOG_BUF_SIZE) != 0) ++ /* note next statement is under above if() */ + #endif ++ if (ftruncate(mmfd, TLS_LOG_BUF_SIZE) < 0) { + zlog_err("failed to allocate thread log buffer \"%s\": %s", + mmpath, strerror(errno)); + goto out_anon_unlink;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007242021.06OKLXBR098104>