From nobody Thu Apr 20 19:28:11 2023 X-Original-To: dev-commits-ports-branches@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 4Q2SP80z3Kz46Tjh; Thu, 20 Apr 2023 19:28:12 +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 4Q2SP809r8z4H41; Thu, 20 Apr 2023 19:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682018892; 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=zgFSrLsAiHBrA/ezFnSNldFR2JNZUaGUrV+84OAQbNo=; b=CFACMdECFhW4uk3xPVYv8Xd/kq1HbJdcs6Lzp+v/aULIatZOBdQk3QxyaVcNDKuihog6R5 Esc9cJlXtj49DX1b6T8tJBGkycx1nvDJXVf76QZOicuU8Yg/SnycUXYT5RTZ1vuNwvGYG6 nR8Cmvfpz5O3JnHymlj5rZPm9FMY3WB3aSMrk5NjItsusatArcErvV6RYs67S0fkKlFWG6 Hr0cNfDJ2HsT5lTWrGAcsV392nQgxOqfq22K4G9n9GPHRPBi2IaKNU4JNLfslO7KiB/p7r M+miiW8cPw8WH2OKfr47KtYI7B+Oe08U29UrCi3tkLy5CWQf3Cyqe/bBV37z6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682018892; 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=zgFSrLsAiHBrA/ezFnSNldFR2JNZUaGUrV+84OAQbNo=; b=JUMlBXndJ3YGl+PoiZySP3cF3ZdMN1v34Z9USEDudM41FB75//t8gUcpmqVVJgvQauZNgJ quGaXMK1CZAbFUWQCYRhvjmIY255cjXFrfJ1NuQLjXJp0M7SOzoFJciIh7qQ75RUV2NkMv qowdnhibyDYbDGCUb4SFWIZpdjFSVIiC7joZxXLUd0f5dDtRjq/T9CZUZ8ZjTpOMa4kjTb ZVBjFj7M0vHAmE2bxgF4uANgI9P4LCTbpP9Qoft5vt8bfhC0nMWHnDrTf54GmnRW7qQIr8 hQ2yR+4MpAmSz4HxmOoXIIMzfQUCMzAbfWv13+HF+q/z7QnDK9ERF/ly7c+ZVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682018892; a=rsa-sha256; cv=none; b=r9KKncOpWmba5vab+eqbBGFj+5lgQhRPbBC2niSKWsEffXgFAG87uj9X1IEDfs6j7ya+fq 66Ia/cYa3shCl61df3mrHMRffaqL3iaofxNeFDgsM0Dxu7g1eK6gr0O6xGo1uFksa0nB22 4xN0ola5gbxXEJzEEM5JoHknwNtjkB370G2Fij2xr2vxbwPTXVpLRCQs/hRCppBN00dCLm a3pzW9w/tNkPYOZJ1wBc0wdvI8wmUXkKA5MloQQs9STRZBe2yxbXo09X8VyCVqzpbAJZ3W KPlxhJTgL4O6FiydIjZ1Qvg3VCJ8v5/kGEf5qNcGYQx/8RwKZU4ZcUcczp+sxQ== 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 4Q2SP76Np1zqYd; Thu, 20 Apr 2023 19:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33KJSBLZ061202; Thu, 20 Apr 2023 19:28:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KJSBm7061201; Thu, 20 Apr 2023 19:28:11 GMT (envelope-from git) Date: Thu, 20 Apr 2023 19:28:11 GMT Message-Id: <202304201928.33KJSBm7061201@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 2892e80c9a6b - 2023Q2 - net-p2p/amule: Adopt/Fix segmentation fault List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 2892e80c9a6b4714648c9a2ff5087e67992886bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=2892e80c9a6b4714648c9a2ff5087e67992886bf commit 2892e80c9a6b4714648c9a2ff5087e67992886bf Author: Nuno Teixeira AuthorDate: 2023-04-20 09:44:49 +0000 Commit: Nuno Teixeira CommitDate: 2023-04-20 19:27:59 +0000 net-p2p/amule: Adopt/Fix segmentation fault - Add -DCRYPTOPP_DISABLE_ASM to CXXFLAGS on i386 and amd64, as cryptopp-8.7.0 build with this option by default on i386 and amd64. (5a19c08: security/cryptopp: Update to 8.7.0) While I'm here: - Makefile cleanup: license file, formatting and remove conflicts install on expired net-p2p/amule-devel port. PR: 266866 Reported by: Francesco MFH: 2023Q2 (cherry picked from commit 4baf754027807e1ad7966055d40a4c4eb75a5717) --- net-p2p/amule/Makefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index c9f2896e8e56..2689353f4092 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -1,16 +1,16 @@ PORTNAME= amule PORTVERSION= 2.3.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION} DISTNAME= aMule-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= eduardo@FreeBSD.org COMMENT= All-platform eMule p2p client WWW= https://www.amule.org/ LICENSE= GPLv2+ -LICENSE_FILE_GPLv2+ = ${WRKSRC}/docs/COPYING +LICENSE_FILE= ${WRKSRC}/docs/COPYING LIB_DEPENDS= libcryptopp.so:security/cryptopp @@ -29,10 +29,9 @@ LDFLAGS+= -lpthread SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl -CONFLICTS_INSTALL= amule-devel - OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI BOOST CAS DEBUG \ - DOCS ED2K FILEVIEW MMAP MONOLITHIC NLS UPNP WEBSERVER WXCAS XAS + DOCS ED2K FILEVIEW MMAP MONOLITHIC NLS UPNP WEBSERVER \ + WXCAS XAS ALC_DESC= Compile aMule Link Creator for GUI ALCC_DESC= Compile aMule Link Creator for console AMULECMD_DESC= Compile aMule command line client @@ -45,9 +44,8 @@ MMAP_DESC= Use mapped memory MONOLITHIC_DESC= Compile monolithic aMule WXCAS_DESC= Compile aMule Statistics for GUI XAS_DESC= Install XChat2 plugin -OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ - FILEVIEW MONOLITHIC WEBSERVER WXCAS XAS - +OPTIONS_DEFAULT= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ + FILEVIEW MONOLITHIC WEBSERVER WXCAS XAS OPTIONS_SUB= yes DEBUG_CONFIGURE_OFF= --disable-debug @@ -96,6 +94,12 @@ XAS_USE= PERL5+=run .include +# Fix segmentation fault, PR 266866 +# see also 5a19c08: security/cryptopp: Update to 8.7.0 +.if ${ARCH} == i386 || ${ARCH} == amd64 +CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM +.endif + .if ${PORT_OPTIONS:MAMULEGUI} || ${PORT_OPTIONS:MMONOLITHIC} PLIST_SUB+= AMULESKIN="" .else