Commits

Zhang Huangbin committed 87ee385

Upgrade iRedAPD to 1.3.7.
Code cleanup.

Comments (0)

Files changed (9)

iRedMail/ChangeLog

         + Roundcube -> 0.7.2
         + MySQL -> 5.5 (FreeBSD)
         + Dovecot -> 2.0 (FreeBSD)
+        + iRedAPD -> 1.3.7
 
 iRedMail-0.8.0-beta2:
     * It now works perfectly on Gentoo.

iRedMail/conf/iredapd

 
 export USE_IREDAPD='YES'
 
-export IREDAPD_VERSION='1.3.6'
+export IREDAPD_VERSION='1.3.7'
 export IREDAPD_DAEMON_USER='iredapd'
 export IREDAPD_DAEMON_GROUP='iredapd'
 export IREDAPD_HOME_DIR='/home/iredapd'

iRedMail/conf/openldap

 
     # Module related.
     export OPENLDAP_MODULE_PATH='/usr/lib/openldap'
+    if [ X"${ARCH}" == X'x86_64' ]; then
+        export OPENLDAP_MODULE_PATH='/usr/lib64/openldap'
+    fi
 
 elif [ X"${DISTRO}" == X"SUSE" ]; then
     # OpenLDAP version.

iRedMail/functions/cleanup.sh

     check_status_before_run cleanup_backup_scripts
     [ X"${BACKEND}" == X'PGSQL' ] && check_status_before_run cleanup_pgsql_force_password
     [ X"${DISTRO}" != X'GENTOO' ] && check_status_before_run cleanup_start_postfix_now
-    [ X"${DISTRO}" == X"FREEBSD" -o X"${DISTRO}" == X'GENTOO' ] && check_status_before_run cleanup_amavisd_preconfig
 
     # Start Postfix to deliver emails.
     [ X"${DISTRO}" == X'GENTOO' ] && ${DIR_RC_SCRIPTS}/postfix restart >/dev/null
     cat ${DOC_FILE} >> /tmp/.links.eml
     sendmail -t ${tip_recipient} < /tmp/.links.eml &>/dev/null && rm -f /tmp/.links.eml &>/dev/null
 
+    # Don't execute 'cleanup_amavisd_preconfig' before sending emails.
+    [ X"${DISTRO}" == X"FREEBSD" -o X"${DISTRO}" == X'GENTOO' ] && check_status_before_run cleanup_amavisd_preconfig
+
     cat <<EOF
 ********************************************************************
 * URLs of your web applications:

iRedMail/functions/packages_freebsd.sh

 
 install_all()
 {
-    ALL_PKGS=''             # Binary package names. e.g. mysql-server, dovecot.
     ALL_PORTS=''            # Port name under /usr/ports/. e.g. mail/dovecot2.
     ENABLED_SERVICES=''     # Scripts under /usr/local/etc/rc.d/
     DISABLED_SERVICES=''    # Scripts under /usr/local/etc/rc.d/
 WITH_FETCH=true
 WITH_DYNACL=true
 WITH_ACI=true
+WITH_BDB=true
 WITH_DNSSRV=true
 WITH_PASSWD=true
 WITH_PERL=true
 WITH_SLP=true
 WITH_SLAPI=true
 WITH_TCP_WRAPPERS=true
-WITH_BDB=true
 WITH_ACCESSLOG=true
 WITH_AUDITLOG=true
 WITH_COLLECT=true
 WITH_DEREF=true
 WITH_DYNGROUP=true
 WITH_DYNLIST=true
-WITH_LASTMOD=true
 WITH_MEMBEROF=true
 WITH_PPOLICY=true
 WITH_PROXYCACHE=true
 WITH_RETCODE=true
 WITH_RWM=true
 WITH_SEQMOD=true
+WITH_SSSVLV=true
 WITH_SYNCPROV=true
 WITH_TRANSLUCENT=true
 WITH_UNIQUE=true
 WITH_DYNAMIC_BACKENDS=true
 EOF
 
-        ALL_PKGS="${ALL_PKGS} openldap-sasl-server openldap-sasl-client"
         ALL_PORTS="${ALL_PORTS} net/openldap${WANT_OPENLDAP_VER}-server"
         ENABLED_SERVICES="${ENABLED_SERVICES} slapd"
 
 WITHOUT_OSSP_UUID=true
 EOF
 
-        ALL_PKGS="${ALL_PKGS} postgresql${WANT_PGSQL_VER}-server postgresql${WANT_PGSQL_VER}-contrib"
         ALL_PORTS="${ALL_PORTS} databases/postgresql${WANT_PGSQL_VER}-server databases/postgresql${WANT_PGSQL_VER}-contrib"
         ENABLED_SERVICES="${ENABLED_SERVICES} ${PGSQL_RC_SCRIPT_NAME}"
     fi
 WITH_OPENSSL=true
 WITHOUT_FASTMTX=true
 EOF
-        ALL_PKGS="${ALL_PKGS} mysql-server mysql-client"
         ALL_PORTS="${ALL_PORTS} databases/mysql${WANT_MYSQL_VER}-server"
 
         ENABLED_SERVICES="${ENABLED_SERVICES} mysql-server"
 EOF
 
     # Note: dovecot-sieve will install dovecot first.
-    ALL_PKGS="${ALL_PKGS} dovecot-sieve dovecot-managesieve"
     ALL_PORTS="${ALL_PORTS} mail/dovecot2 mail/dovecot2-pigeonhole"
     ENABLED_SERVICES="${ENABLED_SERVICES} dovecot"
 
 WITH_RELAY_COUNTRY=true
 EOF
 
-    ALL_PKGS="${ALL_PKGS} pth gnupg p5-Net-DNS p5-Mail-SpamAssassin"
     ALL_PORTS="${ALL_PORTS} devel/pth security/gnupg dns/p5-Net-DNS mail/p5-Mail-SpamAssassin"
     DISABLED_SERVICES="${DISABLED_SERVICES} spamd"
 
 EOF
 
     # AlterMIME. REQUIRED.
-    ALL_PKGS="${ALL_PKGS} p5-Authen-SASL altermime"
     ALL_PORTS="${ALL_PORTS} security/p5-Authen-SASL mail/altermime"
 
     cat > /var/db/ports/p7zip/options <<EOF
 EOF
     fi
 
-    ALL_PKGS="${ALL_PKGS} amavisd-new"
     ALL_PORTS="${ALL_PORTS} security/amavisd-new"
     ENABLED_SERVICES="${ENABLED_SERVICES} amavisd"
 
 WITHOUT_INST_BASE=true
 EOF
 
-    ALL_PKGS="${ALL_PKGS} pcre postfix"
     ALL_PORTS="${ALL_PORTS} devel/pcre mail/postfix${WANT_POSTFIX_VER}"
     ENABLED_SERVICES="${ENABLED_SERVICES} postfix"
     DISABLED_SERVICES="${DISABLED_SERVICES} sendmail sendmail_submit sendmail_outbound sendmail_msq_queue"
 WITH_CGID=true
 EOF
 
-    ALL_PKGS="${ALL_PKGS} apache"
     ALL_PORTS="${ALL_PORTS} www/apache22"
     ENABLED_SERVICES="${ENABLED_SERVICES} ${HTTPD_RC_SCRIPT_NAME}"
 
 WITH_PATHINFO=true
 EOF
 
-    ALL_PKGS="${ALL_PKGS} php5"
     ALL_PORTS="${ALL_PORTS} lang/php5"
 
     # PHP extensions. REQUIRED.
 
     # PHP extensions
     if [ X"${REQUIRE_PHP}" == X"YES" -o X"${USE_WEBMAIL}" == X"YES" ]; then
-        ALL_PKGS="${ALL_PKGS} php5-gd php5-imap php5-zip php5-bz2 php5-zlib php5-gettext php5-mbstring php5-mcrypt php5-mysql php5-mysqli php5-openssl php5-session php5-ldap php5-ctype php5-hash php5-iconv php5-pspell php5-dom php5-xml php5-sqlite"
         ALL_PORTS="${ALL_PORTS} mail/php5-imap graphics/php5-gd archivers/php5-zip archivers/php5-bz2 archivers/php5-zlib devel/php5-gettext converters/php5-mbstring security/php5-mcrypt databases/php5-mysql security/php5-openssl www/php5-session net/php5-ldap textproc/php5-ctype security/php5-hash converters/php5-iconv textproc/php5-pspell textproc/php5-dom textproc/php5-xml databases/php5-sqlite databases/php5-mysqli"
     fi
 
     if [ X"${BACKEND}" == X'OPENLDAP' -o X"${BACKEND}" == X'MYSQL' ]; then
         # Policyd v1.8x
-        ALL_PKGS="${ALL_PKGS} postfix-policyd-sf"
         ALL_PORTS="${ALL_PORTS} mail/postfix-policyd-sf"
         ENABLED_SERVICES="${ENABLED_SERVICES} policyd"
     elif [ X"${BACKEND}" == X'PGSQL' ]; then
         # Policyd v2.x
-        ALL_PKGS="${ALL_PKGS} policyd2"
         ALL_PORTS="${ALL_PORTS} mail/policyd2"
         ENABLED_SERVICES="${ENABLED_SERVICES} policyd"
 
 WITHOUT_EXPERIMENTAL=true
 EOF
 
-    ALL_PKGS="${ALL_PKGS} clamav"
     ALL_PORTS="${ALL_PORTS} security/clamav"
     ENABLED_SERVICES="${ENABLED_SERVICES} clamav-clamd clamav-freshclam"
 
 
     # Roundcube webmail.
     if [ X"${USE_RCM}" == X"YES" ]; then
-        ALL_PKGS="${ALL_PKGS} roundcube"
         ALL_PORTS="${ALL_PORTS} mail/roundcube"
     fi
 
             ALL_PORTS="${ALL_PORTS} www/mod_auth_pgsql2"
         fi
 
-        ALL_PKGS="${ALL_PKGS} awstats"
         ALL_PORTS="${ALL_PORTS} www/awstats"
     fi
 
     # phpLDAPadmin.
     if [ X"${USE_PHPLDAPADMIN}" == X"YES" ]; then
-        ALL_PKGS="${ALL_PKGS} phpldapadmin"
         ALL_PORTS="${ALL_PORTS} net/phpldapadmin"
     fi
 
     # phpMyAdmin.
     if [ X"${USE_PHPMYADMIN}" == X"YES" ]; then
-        ALL_PKGS="${ALL_PKGS} phpMyAdmin"
         ALL_PORTS="${ALL_PORTS} databases/phpmyadmin"
     fi
 
     # phpPgAdmin
     if [ X"${USE_PHPPGADMIN}" == X"YES" ]; then
-        ALL_PKGS="${ALL_PKGS} phppgadmin"
         ALL_PORTS="${ALL_PORTS} databases/phppgadmin"
     fi
 
             fi
         fi
     done
+
+    echo 'export status_install_all="DONE"' >> ${STATUS_FILE}
 }

iRedMail/functions/policyd.sh

 
     elif [ X"${DISTRO}" == X"FREEBSD" ]; then
         # Template file will create database: policyd.
+        perl -pi -e 's#TYPE=#ENGINE=#g' /usr/local/share/doc/policyd/DATABASE.mysql
         cat > ${tmp_sql} <<EOF
 # Import SQL structure template.
-SOURCE $(eval ${LIST_FILES_IN_PKG} "${PKG_POLICYD}*" | grep '/DATABASE.mysql$');
+SOURCE /usr/local/share/doc/policyd/DATABASE.mysql;
 
 # Grant privileges.
 GRANT SELECT,INSERT,UPDATE,DELETE ON ${POLICYD_DB_NAME}.* TO "${POLICYD_DB_USER}"@localhost IDENTIFIED BY "${POLICYD_DB_PASSWD}";

iRedMail/pkgs/MD5.misc

-8d90e2cf15613ea6584aa8ff69b18205  misc/iRedAPD-1.3.6.tar.bz2
 ddd7ba4271056e9ce6b230420fd9b66b  misc/iRedAdmin-0.1.6.tar.bz2
 529bd9131e796e368b68b9aec9c885d0  misc/roundcubemail-0.7.2.tar.gz
 78ca61eb5d7913963f8e42eb3b4f0e95  misc/phpldapadmin-1.2.2.tgz
 ab181a3fffc89e5d5c4ebd62ccfe396b  misc/phpMyAdmin-3.4.9-all-languages.tar.bz2
+e615fc6b21f523371ce2f8679a361846  misc/iRedAPD-1.3.7.tar.bz2

iRedMail/pkgs/MD5.ubuntu.lucid

-8d90e2cf15613ea6584aa8ff69b18205  misc/iRedAPD-1.3.6.tar.bz2
 ddd7ba4271056e9ce6b230420fd9b66b  misc/iRedAdmin-0.1.6.tar.bz2
 529bd9131e796e368b68b9aec9c885d0  misc/roundcubemail-0.7.2.tar.gz
+e615fc6b21f523371ce2f8679a361846  misc/iRedAPD-1.3.7.tar.bz2

iRedMail/pkgs/SHASUM.freebsd.misc

 89a3e2f6272444f8ae55c037d9c09754464d1dcd  misc/iRedAdmin-0.1.6.tar.bz2
 9c702bac1305c3a52727758debf094b97cc155e1  misc/iRedAPD-1.3.6.tar.bz2
+dbc521462c67caddd876a94d5c2eacc6b9cf9dd2  misc/iRedAPD-1.3.7.tar.bz2