From owner-svn-ports-head@freebsd.org Thu Aug 27 13:14:35 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 56B593B135D; Thu, 27 Aug 2020 13:14:35 +0000 (UTC) (envelope-from eugen@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bcjqs72XKz4bPL; Thu, 27 Aug 2020 13:14:32 +0000 (UTC) (envelope-from eugen@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 3233523F77; Thu, 27 Aug 2020 13:14:32 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07RDEWbD009526; Thu, 27 Aug 2020 13:14:32 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07RDEVr2009524; Thu, 27 Aug 2020 13:14:31 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <202008271314.07RDEVr2009524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Thu, 27 Aug 2020 13:14:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546343 - in head/net/mpd5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in head/net/mpd5: . files X-SVN-Commit-Revision: 546343 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.33 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, 27 Aug 2020 13:14:35 -0000 Author: eugen Date: Thu Aug 27 13:14:31 2020 New Revision: 546343 URL: https://svnweb.freebsd.org/changeset/ports/546343 Log: net/mpd5: improve logging in rare case of libpdel failure. Import upstream r2329 and r2373 to direct assertion message to the log. See also: https://sourceforge.net/p/mpd/bugs/68/ Added: head/net/mpd5/files/patch-write-abortmsg (contents, props changed) Modified: head/net/mpd5/Makefile Modified: head/net/mpd5/Makefile ============================================================================== --- head/net/mpd5/Makefile Thu Aug 27 13:14:22 2020 (r546342) +++ head/net/mpd5/Makefile Thu Aug 27 13:14:31 2020 (r546343) @@ -3,7 +3,7 @@ PORTNAME= mpd DISTVERSION= 5.8 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION} PKGNAMESUFFIX= 5 Added: head/net/mpd5/files/patch-write-abortmsg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/mpd5/files/patch-write-abortmsg Thu Aug 27 13:14:31 2020 (r546343) @@ -0,0 +1,51 @@ +Index: src/log.h +=================================================================== +--- src/log.h (revision 2328) ++++ src/log.h (revision 2329) +@@ -14,6 +14,10 @@ + #ifndef _LG_H_ + #define _LG_H_ + ++#include "mbuf.h" ++ ++#include ++ + /* + * DEFINITIONS + */ +Index: src/contrib/libpdel/util/gtree.c +=================================================================== +--- src/contrib/libpdel/util/gtree.c (revision 2372) ++++ src/contrib/libpdel/util/gtree.c (revision 2373) +@@ -58,6 +58,9 @@ + #include "util/gtree.h" + #include "util/typed_mem.h" + ++#include "defs.h" ++#include "log.h" ++ + /* Enabled debug tracing: only use this when keys are strings */ + #define GTREE_TRACE 0 + +@@ -1091,7 +1094,7 @@ gtree_assert(int pred, const char *s, co + { + if (pred) + return; +- printf("FAILURE: %s:%u: %s\n", func, line, s); ++ Perror("FAILURE: %s:%u: %s\n", func, line, s); + gtree_print(g, stdout); + kill(getpid(), SIGABRT); + } +Index: src/Makefile +=================================================================== +--- src/Makefile (revision 2372) ++++ src/Makefile (revision 2373) +@@ -162,7 +162,7 @@ STDSRCS+= web.c + LDADD+= -lssl + .endif + +-CFLAGS+= -DNOLIBPDEL -I./contrib/libpdel ++CFLAGS+= -DNOLIBPDEL -I. -I./contrib/libpdel + PDPATH1= contrib/libpdel/util:contrib/libpdel/structs + PDPATH2= contrib/libpdel/structs/type + .if defined ( NOWEB )