This update of Postfix uses the Berkeley DB6 Update. The support for SQLite, OpenLDAP, PCRE, MySQL, Cyrus SASL and TLS are activated.
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
--- config/rootfiles/packages/postfix | 25 ++++++++++++++----------- lfs/postfix | 32 +++++++++++--------------------- src/paks/postfix/install.sh | 19 +++++++++---------- src/paks/postfix/uninstall.sh | 7 ++----- src/paks/postfix/update.sh | 2 +- 5 files changed, 37 insertions(+), 48 deletions(-)
diff --git a/config/rootfiles/packages/postfix b/config/rootfiles/packages/postfix index bc4739d..cf01364 100644 --- a/config/rootfiles/packages/postfix +++ b/config/rootfiles/packages/postfix @@ -1,23 +1,26 @@ -etc/aliases #etc/postfix -#etc/postfix/LICENSE -#etc/postfix/TLS_LICENSE +etc/postfix/LICENSE +etc/postfix/TLS_LICENSE etc/postfix/access +etc/postfix/aliases etc/postfix/body_checks -#etc/postfix/bounce.cf.default +etc/postfix/bounce.cf.default etc/postfix/canonical etc/postfix/generic etc/postfix/header_checks etc/postfix/main.cf +etc/postfix/main.cf.proto #etc/postfix/makedefs.out etc/postfix/master.cf +etc/postfix/master.cf.proto etc/postfix/mysql-canonical.cf etc/postfix/mysql-mydestination.cf etc/postfix/mysql-virtual.cf +etc/postfix/postfix-files +#etc/postfix/postfix-files.d etc/postfix/relocated etc/postfix/transport etc/postfix/virtual -etc/rc.d/init.d/postfix usr/bin/mailq usr/bin/newaliases #usr/lib/postfix @@ -30,15 +33,12 @@ usr/lib/postfix/error usr/lib/postfix/flush usr/lib/postfix/lmtp usr/lib/postfix/local -usr/lib/postfix/main.cf usr/lib/postfix/master -usr/lib/postfix/master.cf usr/lib/postfix/nqmgr usr/lib/postfix/oqmgr usr/lib/postfix/pickup usr/lib/postfix/pipe usr/lib/postfix/post-install -usr/lib/postfix/postfix-files usr/lib/postfix/postfix-script usr/lib/postfix/postfix-wrapper usr/lib/postfix/postmulti-script @@ -68,7 +68,7 @@ usr/sbin/postmap usr/sbin/postmulti usr/sbin/postqueue usr/sbin/postsuper -usr/sbin/sendmail.postfix +usr/sbin/sendmail #usr/share/man/man1/mailq.1 #usr/share/man/man1/newaliases.1 #usr/share/man/man1/postalias.1 @@ -93,6 +93,7 @@ usr/sbin/sendmail.postfix #usr/share/man/man5/generic.5 #usr/share/man/man5/header_checks.5 #usr/share/man/man5/ldap_table.5 +#usr/share/man/man5/lmdb_table.5 #usr/share/man/man5/master.5 #usr/share/man/man5/memcache_table.5 #usr/share/man/man5/mysql_table.5 @@ -103,6 +104,7 @@ usr/sbin/sendmail.postfix #usr/share/man/man5/postfix-wrapper.5 #usr/share/man/man5/regexp_table.5 #usr/share/man/man5/relocated.5 +#usr/share/man/man5/socketmap_table.5 #usr/share/man/man5/sqlite_table.5 #usr/share/man/man5/tcp_table.5 #usr/share/man/man5/transport.5 @@ -136,8 +138,8 @@ usr/sbin/sendmail.postfix #usr/share/man/man8/trivial-rewrite.8 #usr/share/man/man8/verify.8 #usr/share/man/man8/virtual.8 -var/ipfire/backup/addons/includes/postfix -var/lib/postfix +#var/ipfire/backup/addons/includes/postfix +#var/lib/postfix #var/spool/postfix var/spool/postfix/active var/spool/postfix/bounce @@ -153,3 +155,4 @@ var/spool/postfix/private var/spool/postfix/public var/spool/postfix/saved var/spool/postfix/trace +etc/rc.d/init.d/postfix diff --git a/lfs/postfix b/lfs/postfix index b8029f7..debbcd7 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -24,23 +24,25 @@
include Config
-VER = 2.10.0 - +VER = 3.0.3 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 9 - -DEPS = "amavisd mysql" +PAK_VER = 10 +DEPS = ""
-CCARGS = `getconf LFS_CFLAGS` \ +CCARGS = -DNO_IPV6 `getconf LFS_CFLAGS` \ -DDEF_DAEMON_DIR="'"/usr/lib/postfix"'" \ -DDEF_MANPAGE_DIR="'"/usr/share/man"'" AUXLIBS =
+# Sqlite +CCARGS += -DHAS_SQLITE +AUXLIBS += -L/usr/lib -lsqlite3 -lpthread + # LDAP CCARGS += -DHAS_LDAP -DLDAP_DEPRECATED=1 AUXLIBS += -lldap -llber @@ -65,20 +67,13 @@ AUXLIBS += `pkg-config --libs openssl` # Top-level Rules ###############################################################################
-objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = b2a563b2d5c53462952886e6fc4e4b7b - +objects = $(DL_FILE) +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) +$(DL_FILE)_MD5 = 61caffae689c11d09b4c972a394ae3b1 install : $(TARGET) - check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - download :$(patsubst %,$(DIR_DL)/%,$(objects)) - md5 : $(subst %,%_MD5,$(objects)) - dist: @$(PAK)
@@ -88,10 +83,8 @@ dist:
$(patsubst %,$(DIR_CHK)/%,$(objects)) : @$(CHECK) - $(patsubst %,$(DIR_DL)/%,$(objects)) : @$(LOAD) - $(subst %,%_MD5,$(objects)) : @$(MD5)
@@ -109,12 +102,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ## Install configuration rm -vf /etc/postfix/main.cf.default cp -vf $(DIR_CONF)/postfix/* /etc/postfix - mv -vf /etc/postfix/aliases /etc/aliases mkdir -p /var/lib/postfix chown postfix.root /var/lib/postfix - install -v -m 644 $(DIR_SRC)/config/backup/includes/postfix \ /var/ipfire/backup/addons/includes/postfix - mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh index 1629d21..39bc760 100644 --- a/src/paks/postfix/install.sh +++ b/src/paks/postfix/install.sh @@ -17,23 +17,22 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# Copyright (C) 2016 IPFire-Team info@ipfire.org. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh extract_files -restore_backup ${NAME} -postalias /etc/aliases +postalias /etc/postfix/aliases # Set postfix's hostname postconf -e "myhostname=$(hostname -f)" - -start_service ${NAME} +#/etc/init.d/postfix start
# Enable autostart for postfix -ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix -ln -sf ../init.d/postfix /etc/rc.d/rc3.d/S35postfix -ln -sf ../init.d/postfix /etc/rc.d/rc6.d/K25postfix +ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K23postfix +ln -sf ../init.d/postfix /etc/rc.d/rc3.d/S46postfix +ln -sf ../init.d/postfix /etc/rc.d/rc6.d/K23postfix +chmod 0754 /etc/rc.d/init.d/postfix
-# Update alternatives -/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.postfix 15 +# Creating link for libsasl2 +if [[ ! -e /usr/lib/libsasl2.so.3 ]]; then ln -sf /usr/lib/libsasl2.so.2.0.21 /usr/lib/libsasl2.so.3; fi; diff --git a/src/paks/postfix/uninstall.sh b/src/paks/postfix/uninstall.sh index bff411a..06b8511 100644 --- a/src/paks/postfix/uninstall.sh +++ b/src/paks/postfix/uninstall.sh @@ -17,14 +17,11 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# Copyright (C) 2016 IPFire-Team info@ipfire.org. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh -extract_backup_includes -stop_service ${NAME} -make_backup ${NAME} -/usr/sbin/alternatives --remove sendmail /usr/sbin/sendmail.postfix +/etc/init.d/postfix stop remove_files rm -rfv /etc/rc.d/rc*.d/*postfix diff --git a/src/paks/postfix/update.sh b/src/paks/postfix/update.sh index 89c40d0..f98da7d 100644 --- a/src/paks/postfix/update.sh +++ b/src/paks/postfix/update.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# Copyright (C) 2016 IPFire-Team info@ipfire.org. # # # ############################################################################ #