From nobody Mon Feb 07 17:22:40 2022 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 035BA19A8026; Mon, 7 Feb 2022 17:22:41 +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 4JstJ06VYWz3qDp; Mon, 7 Feb 2022 17:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644254560; 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=JT/LVb3cl7dPVJFH+RFVV/3AM8lwT1mpXPG5b7kLTEI=; b=e7064H/eBKwRxQCcIO3/22qxJNaRFJdgw7b2E0wPCKPzvtVgES/f7cFPZt4lX2WY1cipPg 04UrlPwmn4TbgDEMiJCdlSE/3QoEvm5r1Zm9v605hmJMlHiMJPjGt1Q+Jc+E01E+l3HZb4 jr1Qdf/Z2N/q0l1A0/XCKsP8EtlGATedHxRC0FQh8UlcAE+Bf53At8id/4SjAamdpp/gT0 ksJcqHVG1e4TcnnI0gVYdgb4BgpQmH5kb5aWLBTQiHETzJK3Lk1i1YxvVSkcl0Dh5PNBkx 1H1kJ8iITbNpCqYCEcK1miz6tjA//voMtjzK5ISXJT/+3Pno4Mrn6mWcM2uqiw== 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 BF78518B6; Mon, 7 Feb 2022 17:22:40 +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 217HMeIq068698; Mon, 7 Feb 2022 17:22:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217HMeY5068697; Mon, 7 Feb 2022 17:22:40 GMT (envelope-from git) Date: Mon, 7 Feb 2022 17:22:40 GMT Message-Id: <202202071722.217HMeY5068697@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: 9d682678bc0e - main - security/amavisd-new: Update 2.12.2, add 7-Zip.org support 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: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d682678bc0e34139b0e09d3d19f0cf0fed67ace Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644254560; 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=JT/LVb3cl7dPVJFH+RFVV/3AM8lwT1mpXPG5b7kLTEI=; b=fsCHUUxt11CtMurJIq9ZUFGKYcM8FYd91I09O369XpoQUnsUZipmMrfuThYtLNS6CU8DOC Lwvb4MxplDK9qJrEpDJ2yq64CjI2++vPd5gObPbNeuHFcR2WnVA8/2QO2FBqckp6WcvErL 5Qbbl76VMnqFuIehYAHcUzsWtbCh4N54Fqkv1/J/B5vVzz4FRT8iI07xvUBSGrYreGHvt7 kvneq/Xx7Mkz8aZOYPT0ngT6EctY8rVjD/KoTpSx+vv/9gmushVCnAB4MkRAXaj3/YAD6O esL8Rrc1qcTkPfVWdPkWca9WgyqAh2GmUPDXvEUQFc30bVqkAqual8kIBi0zdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644254560; a=rsa-sha256; cv=none; b=Ef89BvqTNSXdXUdo9Jp+uisXs/QQAoZxv+xq7sHDU4JZR+HvqR/MP8VplqpboEQCKlyoRr OMctfYu9cYIdjLcP3mINVTSt9npTOMl57qIIndNcAkMyy0ovTNBwCJJRQxZpDiZQRjEIpm jtPAxMNFD+qo29Y53z5/hVsYw7vR6a2a8nks3YrNY/vGu0mH8A5jw1wPwwDiMfoEVuF5kG FuqR0X4rPSAwKxTWS5uO63MQJqVLwg+JAvlRLY2JSowIZZ+NPDExn5EM4iglrWPJx2TEwY I9n4QYnO5XCXlY2SzzY6r2b/EKlbrsvt0IRxKiH/DCgWyMmYNh6CokHCivDaWQ== 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=9d682678bc0e34139b0e09d3d19f0cf0fed67ace commit 9d682678bc0e34139b0e09d3d19f0cf0fed67ace Author: Florian Smeets AuthorDate: 2022-02-07 17:07:54 +0000 Commit: Florian Smeets CommitDate: 2022-02-07 17:22:29 +0000 security/amavisd-new: Update 2.12.2, add 7-Zip.org support - update to 2.12.2 - switch to archivers/7-zip for extracting 7-Zip archives. Patch has been discussed with upstream and is waiting to be committed. https://gitlab.com/amavis/amavis/-/merge_requests/90 PR: 260866 --- UPDATING | 7 +++++++ security/amavisd-new/Makefile | 13 ++++++------- security/amavisd-new/distinfo | 6 +++--- security/amavisd-new/files/patch-amavisd | 20 ++++++++++++++++++++ security/amavisd-new/files/patch-amavisd.conf | 20 ++++++++++++++++++++ 5 files changed, 56 insertions(+), 10 deletions(-) diff --git a/UPDATING b/UPDATING index 47caba938264..a0dd960a30ab 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,13 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20220207: + AFFECTS: users of security/amavisd-new + AUTHOR: flo@FreeBSD.org + + Amavis does now depend on archivers/7-zip (7zz) you might need to update + your amavisd.conf and replace all ocurances of p7zip (7zr) accordingly. + 20220129: AFFECTS: users of editors/neovim AUTHOR: adamw@FreeBSD.org diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 255c083e7516..f70cd29a14a1 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,6 +1,5 @@ PORTNAME= amavisd-new -PORTVERSION= 2.12.0 -PORTREVISION= 1 +PORTVERSION= 2.12.2 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://gitlab.com/amavis/amavis/-/archive/v${PORTVERSION}/ @@ -42,9 +41,9 @@ 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 \ - P7ZIP MSWORD TNEF DOCS + 7ZIP MSWORD TNEF DOCS OPTIONS_DEFAULT= BDB SPAMASSASSIN FILE UNRAR ARJ LHA ARC CAB RPM ZOO LZOP \ - P7ZIP MSWORD + 7ZIP MSWORD BDB_DESC= Use BerkeleyDB for nanny/cache/snmp SNMP_DESC= Install amavisd snmp subagent SQLITE_DESC= Use SQLite for lookups @@ -67,7 +66,7 @@ RPM_DESC= RPM support with archivers/rpm2cpio ZOO_DESC= ZOO support with archivers/zoo UNZOO_DESC= ZOO support with archivers/unzoo LZOP_DESC= LZOP support with archivers/lzop -P7ZIP_DESC= P7ZIP support with archivers/p7zip +7ZIP_DESC= 7ZIP support with archivers/7-zip MSWORD_DESC= Ms Word support with textproc/ripole TNEF_DESC= Add external tnef decoder converters/tnef @@ -195,8 +194,8 @@ RUN_DEPENDS+= unzoo>=4.4_1:archivers/unzoo RUN_DEPENDS+= ${LOCALBASE}/bin/lzop:archivers/lzop .endif -.if ${PORT_OPTIONS:MP7ZIP} -RUN_DEPENDS+= ${LOCALBASE}/bin/7zr:archivers/p7zip +.if ${PORT_OPTIONS:M7ZIP} +RUN_DEPENDS+= ${LOCALBASE}/bin/7zz:archivers/7-zip .endif .if ${PORT_OPTIONS:MMSWORD} diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo index 4250eaad3504..383228758e3b 100644 --- a/security/amavisd-new/distinfo +++ b/security/amavisd-new/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566144032 -SHA256 (amavis-v2.12.0.tar.bz2) = 0ea5d3ace8388c0b92d867f096f4b4015cc8f6cc34c5c15b7be0b1ecd65b5292 -SIZE (amavis-v2.12.0.tar.bz2) = 873702 +TIMESTAMP = 1639651917 +SHA256 (amavis-v2.12.2.tar.bz2) = 9db619010a310351c57ff18385cf06dd6e06160412d3e530f3fe9b1ba219e457 +SIZE (amavis-v2.12.2.tar.bz2) = 874946 diff --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd new file mode 100644 index 000000000000..a3d157a8b453 --- /dev/null +++ b/security/amavisd-new/files/patch-amavisd @@ -0,0 +1,20 @@ +--- amavisd.orig 2022-02-07 16:26:10 UTC ++++ amavisd +@@ -1740,13 +1740,13 @@ BEGIN { + ['tnef', \&Amavis::Unpackers::do_tnef], + # ['lha', \&Amavis::Unpackers::do_lha, \$lha], # not safe, use 7z instead + # ['sit', \&Amavis::Unpackers::do_unstuff, \$unstuff], # not safe +- [['zip','kmz'], \&Amavis::Unpackers::do_7zip, ['7za', '7z'] ], ++ [['zip','kmz'], \&Amavis::Unpackers::do_7zip, ['7za', '7zz', '7z'] ], + [['zip','kmz'], \&Amavis::Unpackers::do_unzip], +- ['7z', \&Amavis::Unpackers::do_7zip, ['7zr', '7za', '7z'] ], ++ ['7z', \&Amavis::Unpackers::do_7zip, ['7zr', '7za', '7zz', '7z'] ], + [[qw(gz bz2 Z tar)], +- \&Amavis::Unpackers::do_7zip, ['7za', '7z'] ], ++ \&Amavis::Unpackers::do_7zip, ['7za', '7zz', '7z'] ], + [[qw(xz lzma jar cpio arj rar swf lha iso cab deb rpm)], +- \&Amavis::Unpackers::do_7zip, '7z' ], ++ \&Amavis::Unpackers::do_7zip, ['7zz', '7z'] ], + ['exe', \&Amavis::Unpackers::do_executable, \$unrar, \$lha, \$unarj], + ); + diff --git a/security/amavisd-new/files/patch-amavisd.conf b/security/amavisd-new/files/patch-amavisd.conf new file mode 100644 index 000000000000..394c65fea6e8 --- /dev/null +++ b/security/amavisd-new/files/patch-amavisd.conf @@ -0,0 +1,20 @@ +--- amavisd.conf.orig 2021-10-13 08:10:54 UTC ++++ amavisd.conf +@@ -348,13 +348,13 @@ $banned_filename_re = new_RE( + ['tnef', \&do_tnef], + # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead + # ['sit', \&do_unstuff, 'unstuff'], # not safe +- [['zip','kmz'], \&do_7zip, ['7za', '7z'] ], ++ [['zip','kmz'], \&do_7zip, ['7za', '7zz', '7z'] ], + [['zip','kmz'], \&do_unzip], +- ['7z', \&do_7zip, ['7zr', '7za', '7z'] ], ++ ['7z', \&do_7zip, ['7zr', '7za', '7zz', '7z'] ], + [[qw(gz bz2 Z tar)], +- \&do_7zip, ['7za', '7z'] ], ++ \&do_7zip, ['7za', '7zz', '7z'] ], + [[qw(xz lzma jar cpio arj rar swf lha iso cab deb rpm)], +- \&do_7zip, '7z' ], ++ \&do_7zip, ['7zz', '7z'] ], + ['exe', \&do_executable, ['unrar','rar'], 'lha', ['unarj','arj'] ], + ); +