Skip to content

Commit

Permalink
net-p2p/amule: Adopt/Fix segmentation fault
Browse files Browse the repository at this point in the history
 - 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 <francesco@magno.cc>
MFH:		2023Q2
  • Loading branch information
nunotexbsd committed Apr 20, 2023
1 parent f80db8d commit 4baf754
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions 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

Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -96,6 +94,12 @@ XAS_USE= PERL5+=run

.include <bsd.port.options.mk>

# 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
Expand Down

0 comments on commit 4baf754

Please sign in to comment.