From nobody Tue Apr 11 23:04:28 2023 X-Original-To: dev-commits-ports-main@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 4Px1cs0tRvz44lpq; Tue, 11 Apr 2023 23:04:29 +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 4Px1cr66S7z4J09; Tue, 11 Apr 2023 23:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681254268; 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=0taqPLjjek3I0e7RItLjHgz3QerEHeLE2koC3M8MmOs=; b=ID9G68g+jxqjiJGCelwdX5YItyFJ343l3NyUnk6wzgWnLyMUwSrblDFfnIeOPMyIg7en9c 9eECSBzaoJpFwqk7GWt4kvL9qb3DKpnRRMeNCNKHWmCeR/Ocvl4oxtvnAqkmftH0EYt+2y krAi0ZYa/GzTf69ar2memfPmZFr8+k15PWE50L8XiGXe+4LwD+m8hpQWzenkRZJsDKJgwq DpJV2PS7Q+Kq8OybacRfnBZNmgdojPeH8nhWHbSEEX51dYvw5pEUxGbkDbBMNhDOA/8UO1 tJrljFTpr5K4ZMoAypgFNYOuv7BDBxk01bRweeXFrT376HL2WFpRQKecHeqJTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681254268; 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=0taqPLjjek3I0e7RItLjHgz3QerEHeLE2koC3M8MmOs=; b=A1KgHp4+goqwTQzzfweT/IDNEtKUY2dL4X402LtqjOnT/F7mkkvqSBo031FpUtjaYp9hgn CMIIfEUVvJejHEGE7ye/Rd6qeZa8nHh0OxWpuPN+WtOyXmj9vg3Iu7m6jqQy2LRyRJlHiR BeP01BFAIVn0AgkM36LtVhhD/JxaF+ZAUGnhGdl/IzroVQrKMtCvHc9TP+KBLNSbzBPcYK XuLb0AEwkyyaN7kxFaR4Nn/TfTPJTVDOCy7XxyPqWAwrSwtBszITDMxq/yygNW5P2b2B+p t6V8mS0ZiExwVP/Sgb1kmdA84yn9QnIme1Ag0CDOSocHEsQ16FX3XTwKi05aWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681254268; a=rsa-sha256; cv=none; b=jND10xoJzm1qCdJ/q31HATCV8vloJhL5bfRhc9hdI4C85M6PK2UQUlw6Dgg5I/9MEKMbFl ABBRMMXD+6K7pbORtK1Ht9WUOnszIUVnjgt7avHkCv4kAefkdAp6GaOABXajdTaOVIg0GF TdRN2sOMhEmXUyxbRKqzpBrt/eS1+Upb7jRUTukj9q/+dPvZKWtTJ8q7L9XnHvxsyZMq+n SGm3l7rZgudFz4C8QO6eUsPeWOBpuV3pP/K84lWirgO3drqjGZGVG7Dh8NqpzaAFKMm34z NZWi3Nm/FKsDS7hEyVPFb8x5NhYl0N1V0QHPAdECT8KZ/BwZB5yhL5l38gUC2Q== 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 4Px1cr598Kzc7V; Tue, 11 Apr 2023 23:04:28 +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 33BN4SLq072049; Tue, 11 Apr 2023 23:04:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BN4SXW072048; Tue, 11 Apr 2023 23:04:28 GMT (envelope-from git) Date: Tue, 11 Apr 2023 23:04:28 GMT Message-Id: <202304112304.33BN4SXW072048@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 4f6949193ddb - main - net/ss5: unbreak on FreeBSD 13+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f6949193ddb253c217ee7be55194fd8693223f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f6949193ddb253c217ee7be55194fd8693223f2 commit 4f6949193ddb253c217ee7be55194fd8693223f2 Author: Robert Clausecker AuthorDate: 2023-04-11 01:25:14 +0000 Commit: Robert Clausecker CommitDate: 2023-04-11 23:02:44 +0000 net/ss5: unbreak on FreeBSD 13+ Build with -fcommon to avoid a duplicate symbol error. Approved by: portmgr (build fix blanket) --- net/ss5/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/ss5/Makefile b/net/ss5/Makefile index a5a5a223a4b4..42083975e752 100644 --- a/net/ss5/Makefile +++ b/net/ss5/Makefile @@ -1,6 +1,6 @@ PORTNAME= ss5 DISTVERSION= 3.8.9-8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} @@ -11,9 +11,6 @@ WWW= http://ss5.sourceforge.net/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/License -BROKEN_FreeBSD_13= ld: error: duplicate symbol: ACMutex -BROKEN_FreeBSD_14= ld: error: duplicate symbol: ACMutex - WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-[0-9]+//} USES= ldap ssl @@ -27,6 +24,7 @@ CONFIGURE_ARGS= --with-binpathbase=${PREFIX}/sbin \ MAKE_ENV= DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR} MAKE_ARGS+= CC="${CC}" +CFLAGS+= -fcommon OPTIONS_DEFINE= DOCS EXAMPLES