adjust install/dist/tpl/gentoo/amavisd-ispconfig.conf.master

small adjustments in "install/dist/tpl/gentoo/amavisd-ispconfig.conf.master" to match "install/tpl/amavisd_user_config.master"

new file attached

SEARCH

' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k))' .

REPLACE

' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k)) AND (spamfilter_wblist.active="y")' .

next one no code change:

SEARCH

$signed_header_fields{'received'} = 0; # turn off signing of Received
$enable_dkim_verification = 1;
$enable_dkim_signing = 1;

REPLACE

# DKIM
$enable_dkim_verification = 1;
$enable_dkim_signing = 1; # load DKIM signing code
$signed_header_fields{'received'} = 0;  # turn off signing of Received

amavisd-ispconfig.conf.master