sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-24 23:16:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

security/amavisd-new: Update 2.12.2, add 7-Zip.org support

Browse source 
- 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
This commit is contained in:
Florian Smeets 2022-02-07 18:07:54 +01:00
parent f78f7b60ae
commit 9d682678bc
5 changed files with 56 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
UPDATING
View file

@ -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

13
security/amavisd-new/Makefile
View file

@ -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}

6
security/amavisd-new/distinfo
View file

@ -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

20
security/amavisd-new/files/patch-amavisd Normal file
View file

@ -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],
);

20
security/amavisd-new/files/patch-amavisd.conf Normal file
View file

@ -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'] ],
);