This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via eb9f4587df23f92e3008abef4e505b4719925697 (commit) via c050a2243395789557f77e9d86015fe44ac90895 (commit) from 49c7cb232870cce6986f93bb6fc3b6dbf643ec07 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit eb9f4587df23f92e3008abef4e505b4719925697 Merge: c050a22 49c7cb2 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 18 16:49:30 2013 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit c050a2243395789557f77e9d86015fe44ac90895 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 18 16:48:31 2013 +0200

postfix: Do proper configuration.

Adds LDAP support because the libs are always installed. Disables IPv6, because IPFire 2 does not support IPv6. The rest is cleanup stuff.

-----------------------------------------------------------------------

Summary of changes: lfs/postfix | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)

Difference in files: diff --git a/lfs/postfix b/lfs/postfix index cfebeac..77c6dd0 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -36,6 +36,31 @@ PAK_VER = 7

DEPS = "amavisd mysql"

+CCARGS = -DNO_IPV6 `getconf LFS_CFLAGS` \ + -DDEF_DAEMON_DIR="'"/usr/lib/postfix"'" \ + -DDEF_MANPAGE_DIR="'"/usr/share/man"'" +AUXLIBS = + +# LDAP +CCARGS += -DHAS_LDAP -DLDAP_DEPRECATED=1 +AUXLIBS += -lldap -llber + +# PCRE +CCARGS += -DHAS_PCRE -I/usr/include/pcre +AUXLIBS += -lpcre + +# MySQL +CCARGS += -DHAS_MYSQL -I/usr/include/mysql +AUXLIBS += -L/usr/lib/mysql -lmysqlclient -lm + +# SASL +CCARGS += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl +AUXLIBS += -L/usr/lib/sasl2 -lsasl2 + +# SSL +CCARGS += -DUSE_TLS `pkg-config --cflags openssl` +AUXLIBS += `pkg-config --libs openssl` + ############################################################################### # Top-level Rules ############################################################################### @@ -78,8 +103,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make -f Makefile.init makefiles \ - 'CCARGS=-DDEF_DAEMON_DIR="/usr/lib/postfix" -DDEF_MANPAGE_DIR="/usr/share/man" -DUSE_TLS -I/usr/include/openssl -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -DHAS_MYSQL -I/usr/include/mysql' \ - 'AUXLIBS=-L/usr/lib -L/usr/lib/sasl2 -lz -lm -lssl -lcrypto -lmysqlclient -L/usr/lib/mysql -lsasl2 -L/usr/lib' + DEBUG="" OPT="$(CFLAGS) -fno-strict-aliasing" CCARGS="$(CCARGS)" AUXLIBS="$(AUXLIBS)" cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && sh postfix-install -non-interactive ## Install configuration

hooks/post-receive -- IPFire 2.x development tree