From nobody Thu Apr 20 10:00:41 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 4Q2CpL3HsQz46bXG; Thu, 20 Apr 2023 10:00:42 +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 4Q2CpL1fz2z4PJk; Thu, 20 Apr 2023 10:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681984842; 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=O7VimOnmn9N0det0/dGTWTffY4qwBMhNhwxUIhGTXbs=; b=hRXS8gAxTg+i60hi79+crGvO33qTDyJle8x2Au9+zD6YVHWyew6JwMygqgfNOC5tM+74On zI2QIL8KY4EOInUxwnzXiN9bgH9nP7De7jSZ9MusMuxKpF34bN7+CwAUNKBpAGdww9iGtD YeOxo9vW9G/3jn6KGmlGUg6Eb2LwdgYzO8Io9nxSfW8lNtUf5vDX3fpx4WAgn8Mm3E+eFs G3BfMm+DGu/cea/qx9eLcGZGHw/pfo0+CGsJYs/CkU6vQ8alRg90/zaAjNWi94rovCkzeb jjfjofSiZmIdxPlFn1wzkBqVlCnlD6rTyTOiglNsXbEy+/wOqw40F2yzlrfcmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681984842; 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=O7VimOnmn9N0det0/dGTWTffY4qwBMhNhwxUIhGTXbs=; b=JRrHx1dRvQMe6bhR4tIOOUpRJoqyfAAoqpQjcsqhFhoy8IkfHwO997MNk5rkQ02zmolSiM X3jmOovskBggxYdCqzO4pmk1Q+JgALh+4DL9NVY7+A6rFt8Nag5Wdzxymtz/lzBoY/SrDi PTkDq7JSlZBxYTbCeX/uggVw//RH6qGGiuNwalyGhbge6/ijJQJsOa9hv4zQH6p9kdQSFK EV524TfgjHFcUOjMHsKnmZFsZspYAtaOfAs/XHGx32JKplIaMDXV650wlQSS0hkjXme3/P ccZzKk0Z5Pmnt4jLtoj++jGqlrAMoAhh5CoV2INyGaCGh1PEm5WZHluPOqIIEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681984842; a=rsa-sha256; cv=none; b=GJCihX9rgr4G0UBTWBs+D88laZH5x/rouZjKy6tQNY8vQmosYnkuP0z5gVdz5bZlws/oFX NlYDQcsPXc4CV0DXB9HgkQSt4nCNbp5v13x/kx65ncWdbuypXjBHfq7WP8JsY17+Ujj83T skKUtEDay19IwOg4zQDScjCCwroz+jALRgC2mrysGlk+ttIXqbkTCYdPUaKLKeSPGGvek/ emXURDPhCvqPd8qbFqd3rVMhUhfFiysoUjOjU0xgbMd9mi8IH5y30jZFJdjekr7fYAicqU aKmE1YqwP2DXWa/aMgfxnMlc/1lXjTt44b5FlCZ9Vju6D7CQiV7Y2I9Zp4PJlg== 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 4Q2CpL0jw3zY3d; Thu, 20 Apr 2023 10:00:42 +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 33KA0gAL031011; Thu, 20 Apr 2023 10:00:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KA0fQ9031010; Thu, 20 Apr 2023 10:00:41 GMT (envelope-from git) Date: Thu, 20 Apr 2023 10:00:41 GMT Message-Id: <202304201000.33KA0fQ9031010@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 4baf75402780 - main - net-p2p/amule: Adopt/Fix segmentation fault 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4baf754027807e1ad7966055d40a4c4eb75a5717 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4baf754027807e1ad7966055d40a4c4eb75a5717 commit 4baf754027807e1ad7966055d40a4c4eb75a5717 Author: Nuno Teixeira AuthorDate: 2023-04-20 09:44:49 +0000 Commit: Nuno Teixeira CommitDate: 2023-04-20 10:00:28 +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 --- 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