From nobody Fri Jul 22 14:44:08 2022 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 4LqByw4dr9z4XN7n; Fri, 22 Jul 2022 14:44:08 +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 4LqByw41TPz3KlX; Fri, 22 Jul 2022 14:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658501048; 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=He/Z0sLdej9qpA4P9mlE/s5jcCJi4KTHskthKDI7J24=; b=GNCvopRdhLJWELuJENQJ7B392/BZatW3ymuiMrzcvz7M/YRg64XN1asc+5/FIKQdcazZ/M 8UBwdk53Ci4PxqJ2e7+voCcFFITy852wZwgtBU+BWJaGqZFnv9sQ2EmarGmI419f2Xmr04 Ig+YcGc10ZIFyjv3lirPn0eWV5bcbSvh0GNt0ZnfUstTk8ZEvK//r4lIisHKqNYpP/QFIS NToM0BDelRo6bM+tTUWb4vvrtaOzbckP4R7EIZ7/eSLKdwhbTwt4iWyasQyXsr/hpp+NxD wWgKOY8DQbAV3m+EX+ju4tB2lX3dxgcJJp/IsDU6vIglmVZyc3j8H3X+flGFkA== 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 4LqByw34jKz14Y8; Fri, 22 Jul 2022 14:44:08 +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 26MEi84X039985; Fri, 22 Jul 2022 14:44:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26MEi8BR039984; Fri, 22 Jul 2022 14:44:08 GMT (envelope-from git) Date: Fri, 22 Jul 2022 14:44:08 GMT Message-Id: <202207221444.26MEi8BR039984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: 2317f1554165 - main - security/amavisd-new: Fix installing from official pkg repo 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: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2317f15541650a6cd93007c1431f9b9b54f8d129 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658501048; 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=He/Z0sLdej9qpA4P9mlE/s5jcCJi4KTHskthKDI7J24=; b=qareAyVASIBS24Ma9IkGdVr6uKBHfAJEuVcKOou+C9aej28atyDdiqKKmA6Cz0BZXwQvjA /6waLQoul8Gu6Kg1V368mCZ8K5CLA5YFe5Gb9yjW+grDJK9cKIt8c6c+VAGtZvjZPN8heP Hsdr76GW2da/9DGuvV91WPSlnk8opIId1BdYTwwtn4Bns3xwJkKY18+Z+pSHqFamFqftG+ kBIW3Cl0bsoS+N53cnDs+Sy5O5WhnqE25fwfLgxvf+T2ok058371ZV+UKrbmBu4MnMprxb nJ2WsMqApkqBkDQvXkjozz488t7HtRGTAPRntgFYIWy5fYLCzWR5zBMcXdus7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658501048; a=rsa-sha256; cv=none; b=gbN8LrzxArZ+f7iNeYNK8P0wPrQO6HFtrAa+sgolbQDgXN6RdByRdLXYgHnjHnAiGEkAfb N2WQXV2QE1MuEEwRIwS2LvUo2n+UZQc6/SZqRBInKFv2aZ2rGzsepw2fmNU1ok06i9bVGN wcmJoz6D1JKXJD3lVRvGRStsz4cDQfAwtW5nwyfPg7idaalKSLwIQ4wC48SGqnC700TgJa /EgXOEYeq9RpjJm77RcoNS8nQp9P0CDHBZ6FD2qTPkageG2WAXpONZdiuzy5l9WnTRlTK5 ZEVVjG7NMwj0puq/t40YS0pzQ0xux+iTEhuVRC66H/5TvIHnDti9s6WJS2ntgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=2317f15541650a6cd93007c1431f9b9b54f8d129 commit 2317f15541650a6cd93007c1431f9b9b54f8d129 Author: Florian Smeets AuthorDate: 2022-07-22 14:19:12 +0000 Commit: Florian Smeets CommitDate: 2022-07-22 14:43:19 +0000 security/amavisd-new: Fix installing from official pkg repo Remove LHA from from the default options. This change makes it possible to use amavis-new from the official packages repo again. This hasn't been possible since archivers/lha packages may not be distributed, thus trying to install amavisd-new failed with the following error message pkg: amavisd-new has a missing dependency: lha PR: 265240 Reported by: James B. Byrne --- security/amavisd-new/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 91af2abb887e..e0c98bbf22bf 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,5 +1,6 @@ PORTNAME= amavisd-new PORTVERSION= 2.12.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://gitlab.com/amavis/amavis/-/archive/v${PORTVERSION}/ @@ -43,7 +44,7 @@ DAEMON?= /usr/sbin/daemon -p OPTIONS_DEFINE= IPV6 BDB SNMP SQLITE MYSQL PGSQL LDAP SASL SPAMASSASSIN P0F \ FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB RPM ZOO UNZOO LZOP \ 7ZIP MSWORD TNEF DOCS -OPTIONS_DEFAULT= BDB SPAMASSASSIN FILE UNRAR ARJ LHA ARC CAB RPM ZOO LZOP \ +OPTIONS_DEFAULT= BDB SPAMASSASSIN FILE UNRAR ARJ ARC CAB RPM ZOO LZOP \ 7ZIP MSWORD BDB_DESC= Use BerkeleyDB for nanny/cache/snmp SNMP_DESC= Install amavisd snmp subagent