cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove archivers/{freeze,unarj,unrar} from run-dependencies and use p7zip instead.

Browse Source 
Users should tweak their config files before removing the old dependencies.

ok sthen@, msf@, aja@
This commit is contained in:
giovanni 2009-11-16 10:37:31 +00:00
parent 9075daa679
commit 3bb32e925d
3 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/amavisd-new/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2009/10/13 13:29:18 giovanni Exp $ # $OpenBSD: Makefile,v 1.12 2009/11/16 10:37:31 giovanni Exp $
COMMENT= interface between mailer MTA and content checkers COMMENT= interface between mailer MTA and content checkers
DISTNAME= amavisd-new-2.6.4 DISTNAME= amavisd-new-2.6.4
PKGNAME= ${DISTNAME}p0
CATEGORIES= mail security CATEGORIES= mail security
HOMEPAGE= http://www.ijs.si/software/amavisd/ HOMEPAGE= http://www.ijs.si/software/amavisd/
@ -23,14 +24,11 @@ MASTER_SITES= ${HOMEPAGE} \
RUN_DEPENDS= ::archivers/arc \ RUN_DEPENDS= ::archivers/arc \
::archivers/bzip2 \ ::archivers/bzip2 \
::archivers/cabextract \ ::archivers/cabextract \
::archivers/freeze \
::archivers/lha \ ::archivers/lha \
::archivers/lzop \ ::archivers/lzop \
:p5-Archive-Zip->=1.14:archivers/p5-Archive-Zip \ :p5-Archive-Zip->=1.14:archivers/p5-Archive-Zip \
::archivers/p7zip \ ::archivers/p7zip,-rar \
::archivers/ripole \ ::archivers/ripole \
::archivers/unarj \
::archivers/unrar \
::archivers/unzip \ ::archivers/unzip \
::archivers/zoo \ ::archivers/zoo \
::converters/p5-Convert-TNEF \ ::converters/p5-Convert-TNEF \

28
mail/amavisd-new/patches/patch-amavisd_conf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-amavisd_conf,v 1.4 2008/09/23 21:39:21 kili Exp $ $OpenBSD: patch-amavisd_conf,v 1.5 2009/11/16 10:37:31 giovanni Exp $
--- amavisd.conf.orig Wed Apr 23 20:49:58 2008 --- amavisd.conf.orig Thu Jun 25 14:38:47 2009
+++ amavisd.conf Thu May 8 20:19:02 2008 +++ amavisd.conf Thu Nov 12 17:08:56 2009
@@ -15,12 +15,12 @@ use strict; @@ -15,12 +15,12 @@ use strict;
# $bypass_decode_parts = 1; # controls running of decoders&dearchivers # $bypass_decode_parts = 1; # controls running of decoders&dearchivers
@ -26,3 +26,25 @@ $OpenBSD: patch-amavisd_conf,v 1.4 2008/09/23 21:39:21 kili Exp $
$enable_global_cache = 1; # enable use of libdb-based cache if $enable_db=1 $enable_global_cache = 1; # enable use of libdb-based cache if $enable_db=1
$nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed $nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed
$enable_dkim_verification = 1; # enable DKIM signatures verification $enable_dkim_verification = 1; # enable DKIM signatures verification
@@ -321,7 +321,7 @@ $banned_filename_re = new_RE(
['uue', \&do_ascii],
['hqx', \&do_ascii],
['ync', \&do_ascii],
- ['F', \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ],
+# ['F', \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ],
['Z', \&do_uncompress, ['uncompress','gzip -d','zcat'] ],
['gz', \&do_uncompress, 'gzip -d'],
['gz', \&do_gunzip],
@@ -334,8 +334,10 @@ $banned_filename_re = new_RE(
# ['a', \&do_ar, 'ar'], # unpacking .a seems an overkill
['zip', \&do_unzip],
['7z', \&do_7zip, ['7zr','7za','7z'] ],
- ['rar', \&do_unrar, ['rar','unrar'] ],
- ['arj', \&do_unarj, ['arj','unarj'] ],
+# ['rar', \&do_unrar, ['rar','unrar'] ],
+ ['rar', \&do_7zip, '7z'],
+# ['arj', \&do_unarj, ['arj','unarj'] ],
+ ['arj', \&do_7zip, '7z'],
['arc', \&do_arc, ['nomarch','arc'] ],
['zoo', \&do_zoo, ['zoo','unzoo'] ],
['lha', \&do_lha, 'lha'],

28
mail/amavisd-new/patches/patch-amavisd_conf-sample
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-amavisd_conf-sample,v 1.3 2008/09/23 21:39:21 kili Exp $ $OpenBSD: patch-amavisd_conf-sample,v 1.4 2009/11/16 10:37:31 giovanni Exp $
--- amavisd.conf-sample.orig Wed Apr 23 20:49:52 2008 --- amavisd.conf-sample.orig Thu Jun 25 14:38:38 2009
+++ amavisd.conf-sample Thu May 8 20:19:02 2008 +++ amavisd.conf-sample Thu Nov 12 17:13:28 2009
@@ -74,8 +74,8 @@ $mydomain = 'example.com'; # (no useful default) @@ -74,8 +74,8 @@ $mydomain = 'example.com'; # (no useful default)
# Set the user and group to which the daemon will change if started as root # Set the user and group to which the daemon will change if started as root
@ -21,3 +21,25 @@ $OpenBSD: patch-amavisd_conf-sample,v 1.3 2008/09/23 21:39:21 kili Exp $
$enable_global_cache = 1; # enable use of libdb-based cache if $enable_db=1 $enable_global_cache = 1; # enable use of libdb-based cache if $enable_db=1
$enable_dkim_verification = 1; # enable DKIM signatures verification $enable_dkim_verification = 1; # enable DKIM signatures verification
@@ -1711,7 +1711,7 @@ $dspam = 'dspam';
['uue', \&do_ascii],
['hqx', \&do_ascii],
['ync', \&do_ascii],
- ['F', \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ],
+# ['F', \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ],
['Z', \&do_uncompress, ['uncompress','gzip -d','zcat'] ],
['gz', \&do_uncompress, 'gzip -d'],
['gz', \&do_gunzip],
@@ -1724,8 +1724,10 @@ $dspam = 'dspam';
# ['a', \&do_ar, 'ar'], # unpacking .a seems an overkill
['zip', \&do_unzip],
['7z', \&do_7zip, ['7zr','7za','7z'] ],
- ['rar', \&do_unrar, ['rar','unrar'] ],
- ['arj', \&do_unarj, ['arj','unarj'] ],
+# ['rar', \&do_unrar, ['rar','unrar'] ],
+ ['rar', \&do_7zip, '7z'],
+# ['arj', \&do_unarj, ['arj','unarj'] ],
+ ['arj', \&do_7zip, '7z'],
['arc', \&do_arc, ['nomarch','arc'] ],
['zoo', \&do_zoo, ['zoo','unzoo'] ],
['lha', \&do_lha, 'lha'],