From nobody Wed Sep 13 10:21:38 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlxM6306Yz4tLNn; Wed, 13 Sep 2023 10:21:38 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlxM62TFZz4bL5; Wed, 13 Sep 2023 10:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694600498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TUXxtU5Qzp8SJZ26q2DRgizyhhB+2zAPeKkm7knchx8=; b=Obj3XJu8XQQVopMnyrJh1gRAxnVjd/oGl2vmnVqhXkwW1O72x6qlHDB8l7piAGXOFWV/I/ FlkhUm4Uk51U4MLc+//iS91GUl8Tl0PsbxuLUmfG/grLtipGXD01NfLA/8MKL/x0eT7ljV HgYBn/kTH3b3sDsbPQSlzdtnBisDKoyE4PdgsoEt5wb7F49ISi7Wqs5z9eK1kiV0TxjWtG mqkzutPBXZAMkbNV7H3L0zAWl1VlS9pi38GzB6wUnaHNCM/GLnNqlSA2O+hIsS0RKB7lX2 dbBtovkZZG+H8rK6DqmTMx4hKbdeHqJVSQnvSYGRL69yoQRS3ZKuaHCPfo6/yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694600498; a=rsa-sha256; cv=none; b=ksNfRqPTNflMLzH3tEUoE+8ptywcyHMSnxt7Z2/pk9tk2yAd5yPBxCvdzp2JKFFBa2qGwT Xps4EgwliNsYGmCL7UpJZ5qZ4/b7Rct4uIyAc94I+10+F3AQycioAiOsxOxJQao6Yczcmd ntpmyKfvzO64bkfly/2pQLgkE4vPQ97dDC9Kp7wkrNRAU5iZWMUohjDdUH0XMWaNeDHmih YmAzw3130lkpMjIde9ZWTwy5Fyw9gnLGct+gGHjgpXK44V+Fs0fK4reAF2jPxkXnnVTgcW G0bnjuaHvOYB+VNu5mWqPhDXBKtWoDwzsUSerLQGRyH9FHrIAW9y0WjWxXxuvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694600498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TUXxtU5Qzp8SJZ26q2DRgizyhhB+2zAPeKkm7knchx8=; b=KckCJCrJup8unAKOysT/Id4Xmn8JjNf/cJ/dnkLSAG6XXXAOv+YSw44ggRYYbjft048mEX qPmprZ/H82KkOST/OhO8TUFReF/KET+DjE6zhOujlYQKQu8AwmVfIj4PZlRIzQjlVFMNcG Zws4hhvZ7W3Q2xxSdbzbdA/yF5zDLHa49nua3jm/4wdCCR2EbAkikbWoEN9EIzDS27//G8 CCnl8fJFp3CLxvbYS2QkEzjg5k6iWSnPZtYsEoYBxNyw0IU4ip9Eg2W3uuMmu6Dh+xVAEz 1cULbSljOoGtGN/I3RvVq/Qu57AP8tjNMB5QlVi3n5MFtky905ZqQex+BEKAjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlxM61Xy5z191t; Wed, 13 Sep 2023 10:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DALckn030887; Wed, 13 Sep 2023 10:21:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DALcLd030884; Wed, 13 Sep 2023 10:21:38 GMT (envelope-from git) Date: Wed, 13 Sep 2023 10:21:38 GMT Message-Id: <202309131021.38DALcLd030884@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Fukang Chen Subject: git: 42abff3b5076 - 2023Q3 - misc/mbuffer: Fix build if www/libwww installed List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: loader X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 42abff3b5076e7805cf85565a90520a872425d23 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by loader: URL: https://cgit.FreeBSD.org/ports/commit/?id=42abff3b5076e7805cf85565a90520a872425d23 commit 42abff3b5076e7805cf85565a90520a872425d23 Author: Fukang Chen AuthorDate: 2023-09-13 01:01:25 +0000 Commit: Fukang Chen CommitDate: 2023-09-13 10:19:08 +0000 misc/mbuffer: Fix build if www/libwww installed Remove libmd5 from AC_SEARCH_LIBS and only searches for libmd, avoid linking with libmd5 installed by www/libwww. PR: 273735 Reported by: meta MFH: 2023Q3 (build fix) (cherry picked from commit d3f22d319918c1dda4dbfbc5d85678c91ed13590) --- misc/mbuffer/files/patch-configure.in | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/misc/mbuffer/files/patch-configure.in b/misc/mbuffer/files/patch-configure.in index f2104f9de554..9f8ba6fff9ee 100644 --- a/misc/mbuffer/files/patch-configure.in +++ b/misc/mbuffer/files/patch-configure.in @@ -8,9 +8,14 @@ https://cgit.freebsd.org/src/commit/?id=0ad202f312f6da4f2774ecb7a3f3c2a05b3dde5f add llvm-objdump to the list for ${OBJDUMP}. ---- configure.in.orig 2021-01-16 05:20:02 UTC +- AC_SEARCH_LIBS(MD5Init,md,AC_DEFINE([HAVE_LIBMD5], [1], [Define to 1 if you have the md5 library]),) + PR 273735: fails to build if www/libwww installed + Remove md5 and only searches for md here to avoid linking with lib/libmd5.* + installed by www/libwww. + +--- configure.in.orig 2023-02-27 19:18:52 UTC +++ configure.in -@@ -104,7 +104,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], +@@ -104,7 +104,7 @@ AC_PROG_INSTALL AC_SUBST(CFLAGS) AC_PROG_INSTALL @@ -19,7 +24,7 @@ AC_PATH_PROG(RM,rm) AC_PATH_PROG(CP,cp) AC_PATH_PROG(MT,mt,AC_MSG_WARN(could not find the program mt - you might need this if you want autoloader support)) -@@ -113,7 +113,7 @@ AC_PATH_PROG(AWK,awk) +@@ -113,7 +113,7 @@ AC_STRUCT_ST_BLKSIZE AC_SYS_LARGEFILE AC_STRUCT_ST_BLKSIZE @@ -28,3 +33,12 @@ AC_HEADER_ASSERT AC_CHECK_LIB(pthread, pthread_mutex_init) +@@ -145,7 +145,7 @@ if test x$enable_md5 != xno ; then + ,enable_md5=auto + ) + if test x$enable_md5 != xno ; then +- AC_SEARCH_LIBS(MD5Init,md5 md,AC_DEFINE([HAVE_LIBMD5], [1], [Define to 1 if you have the md5 library]),) ++ AC_SEARCH_LIBS(MD5Init,md,AC_DEFINE([HAVE_LIBMD5], [1], [Define to 1 if you have the md5 library]),) + AC_CHECK_HEADER(md5.h,AC_DEFINE([HAVE_MD5_H],[1],[found md5.h]),) + AC_SEARCH_LIBS(MD5_Init,crypto,AC_DEFINE([HAVE_LIBCRYPTO], [1], [Define to 1 if you have the OpenSSL crypto library]),) + fi