Removed OpenDMARC integration due to internal bug which caused incorrect

email rejection. Bug reported to upstream:
trusteddomainproject/OpenDMARC#50

iRedMail/ChangeLog

@@ -1,4 +1,8 @@
 iRedMail-1.0-beta2:
+    * Removed OpenDMARC integration due to internal bug which caused incorrect
+      email rejection. Bug reported to upstream:
+      https://github.com/trusteddomainproject/OpenDMARC/issues/50
+
     * Fixed issues:
         - Improper postrotate command for log files on Linux.
 
@@ -16,12 +20,6 @@ iRedMail-1.0-beta1:
 
     * Drop support for OpenBSD ldapd backend.
     * Improvements:
-        + OpenDMARC integration on Linux and FreeBSD.
-
-            Unfortunately the latest OpenBSD release (6.5) doesn't offer
-            binary package for opendmarc, but 6.6 does. We have to wait for
-            OpenBSD 6.6 to enable OpenDMARC integration.
-
         + Dovecot:
             - Enable quota-status service. Postfix can query this service and
               reject email immediately if user's mailbox is over quota.

iRedMail/conf/global

@@ -111,9 +111,6 @@ export MLMMJADMIN_BIND_HOST="${LOCAL_ADDRESS}"
 export MLMMJADMIN_SERVER_ADDRESS="${MLMMJADMIN_SERVER_ADDRESS:=${MLMMJADMIN_BIND_HOST}}"
 # For managesieve service and software.
 export USE_MANAGESIEVE='YES'
-# OpenDMARC
-export OPENDMARC_BIND_HOST="${LOCAL_ADDRESS}"
-export OPENDMARC_PORT="${OPENDMARC_PORT:=8893}"
 
 # vmail user/group name, uid and gid.
 export SYS_USER_VMAIL='vmail'
@@ -123,10 +120,6 @@ export SYS_GROUP_VMAIL='vmail'
 export SYS_USER_NETDATA='netdata'
 export SYS_GROUP_NETDATA='netdata'
 
-# dmarc
-export SYS_USER_DMARC='opendmarc'
-export SYS_GROUP_DMARC='opendmarc'
-
 # Specify UID/GID for system accounts. Required if you have multiple LDA/LMTP
 # servers access same mailbox storage. e.g. cluster environment.
 # vmail

iRedMail/dialog/optional_components.sh

@@ -28,17 +28,6 @@
 # Note: item_descrition must be concatenated by '_'.
 export LIST_OF_OPTIONAL_COMPONENTS=''
 
-# OpenDMARC
-export DIALOG_SELECTABLE_OPENDMARC='YES'
-if [ X"${DISTRO}" == X'OPENBSD' ]; then
-    # OpenBSD 6.5 doesn't have binary package for opendmarc, but 6.6 does.
-    export DIALOG_SELECTABLE_OPENDMARC='NO'
-fi
-
-if [ X"${DIALOG_SELECTABLE_OPENDMARC}" == X'YES' ]; then
-    LIST_OF_OPTIONAL_COMPONENTS="${LIST_OF_OPTIONAL_COMPONENTS} DMARC Domain-based_Message_Authentication,_Reporting_and_Conformance on"
-fi
-
 # Fail2ban
 export DIALOG_SELECTABLE_FAIL2BAN='YES'
 if [ X"${DISTRO}" == X'FREEBSD' -o X"${DISTRO}" == X'OPENBSD' ]; then

iRedMail/functions/optional_components.sh

@@ -10,10 +10,6 @@ optional_components()
     # iRedAPD.
     check_status_before_run iredapd_setup
 
-    # DMARC
-    [ X"${USE_DMARC}" == X'YES' -a X"${DISTRO}" != X'OPENBSD' ] && \
-        check_status_before_run opendmarc_config
-
     # iRedAdmin.
     [ X"${USE_IREDADMIN}" == X'YES' ] && check_status_before_run iredadmin_setup
 

iRedMail/functions/packages.sh

@@ -241,13 +241,6 @@ install_all()
         PKG_SCRIPTS="${PKG_SCRIPTS} ${CLAMAV_CLAMD_SERVICE_NAME} ${CLAMAV_FRESHCLAMD_RC_SCRIPT_NAME} ${AMAVISD_RC_SCRIPT_NAME}"
     fi
 
-    # OpenDMARC
-    if [ X"${DISTRO}" != X'OPENBSD' ]; then
-        # OpenBSD 6.5 doesn't have opendmarc package yet, but 6.6 does.
-        ENABLED_SERVICES="${ENABLED_SERVICES} ${OPENDMARC_RC_SCRIPT_NAME}"
-        ALL_PKGS="${ALL_PKGS} opendmarc"
-    fi
-
     # mlmmj: mailing list manager
     ALL_PKGS="${ALL_PKGS} mlmmj"
     if [ X"${DISTRO}" == X'RHEL' ]; then

iRedMail/functions/packages_freebsd.sh

@@ -523,9 +523,6 @@ EOF
 
     ALL_PORTS="${ALL_PORTS} security/amavisd-new"
 
-    # OpenDMARC
-    ALL_PORTS="${ALL_PORTS} mail/opendmarc"
-
     # Postfix. REQUIRED.
     cat > /var/db/ports/mail_postfix/options <<EOF
 OPTIONS_FILE_SET+=BDB

iRedMail/iRedMail.sh

@@ -88,7 +88,6 @@ export DOMAIN_ADMIN_EMAIL="${DOMAIN_ADMIN_NAME}@${FIRST_DOMAIN}"
 . ${CONF_DIR}/postfix
 . ${CONF_DIR}/mlmmj
 . ${CONF_DIR}/amavisd
-. ${CONF_DIR}/opendmarc
 . ${CONF_DIR}/iredapd
 . ${CONF_DIR}/memcached
 . ${CONF_DIR}/sogo
@@ -120,7 +119,6 @@ fi
 . ${FUNCTIONS_DIR}/dovecot.sh
 . ${FUNCTIONS_DIR}/mlmmj.sh
 . ${FUNCTIONS_DIR}/amavisd.sh
-. ${FUNCTIONS_DIR}/opendmarc.sh
 . ${FUNCTIONS_DIR}/iredapd.sh
 . ${FUNCTIONS_DIR}/clamav.sh
 . ${FUNCTIONS_DIR}/spamassassin.sh