postfix: version up

Further work by Vincent Pelletier:
- do not enable openldap dependency, we do not need such advanced features
  (yet ?)
- refresh noroot.patch
- if we this component is to reference m4, then it should extend it

component/postfix/buildout.cfg

@@ -8,19 +8,19 @@ extends =
   ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../cyrus-sasl/buildout.cfg
+  ../m4/buildout.cfg
 
 [postfix]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.11.6.tar.gz
-md5sum = c3277d05b78eaaf5955406bc7b6d2b9f
+url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.5.8.tar.gz
+md5sum = c7c55ccc1db2a30d35c3867c21fe7109
 location = @@LOCATION@@
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/noroot.patch#738bcc97b8044c45b58708bdf3a84b8e
-  ${:_profile_base_location_}/skip-libdb-check.patch#f7fdbd8787874b535fee548b0139c0d8
+  ${:_profile_base_location_}/noroot.patch#05fc6333e05576ea8e5a49f27a6ef951
 configure-command = make
 configure-options = makefiles CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl-1.0:location}/include -I${cyrus-sasl:location}/include/sasl' AUXLIBS='-L${openssl-1.0:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -L${cyrus-sasl:location}/lib -lssl -lpcre -ldb -lcrypto -lsasl2 -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib'
 make-targets = non-interactive-package install_root=${:location}
 environment =
-  PATH=${patch:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${m4:location}/bin:%(PATH)s

component/postfix/noroot.patch

@@ -2,16 +2,16 @@ diff --git a/src/global/mail_params.c b/src/global/mail_params.c
 index 2d91977..0f06298 100644
 --- a/src/global/mail_params.c
 +++ b/src/global/mail_params.c
-@@ -721,7 +721,9 @@ void    mail_params_init()
+@@ -911,7 +911,9 @@ void    mail_params_init()
      check_default_privs();
      check_mail_owner();
      check_sgid_group();
 +    /*
      check_overlap();
 +    */
- #ifdef HAS_DB
      dict_db_cache_size = var_db_read_buf;
- #endif
+     dict_lmdb_map_size = var_lmdb_map_size;
+     inet_windowsize = var_inet_windowsize;
 diff --git a/src/master/master.c b/src/master/master.c
 index a9d5d1b..db88c55 100644
 --- a/src/master/master.c
@@ -29,12 +29,13 @@ index a9d5d1b..db88c55 100644
  
      /*
       * Process JCL.
-@@ -392,8 +392,10 @@ int     main(int argc, char **argv)
+@@ -433,9 +433,11 @@ int     main(int argc, char **argv)
       * all MTA processes cleanly. Give up if we can't separate from our
       * parent process. We're not supposed to blow away the parent.
       */
 +    /*
-     if (debug_me == 0 && master_detach != 0 && setsid() == -1 && getsid(0) != getpid())
+     if (init_mode == 0 && debug_me == 0 && master_detach != 0
+ 	&& setsid() == -1 && getsid(0) != getpid())
  	msg_fatal("unable to set session and process group ID: %m");
 +    */
  

component/postfix/skip-libdb-check.patch

-diff --git a/makedefs b/makedefs
-index dd5f256..e90880e 100644
---- a/makedefs
-+++ b/makedefs
-@@ -299,13 +299,13 @@ case "$SYSTEM.$RELEASE" in
- 		    elif [ -f /usr/include/db/db.h ]
- 		    then
- 			CCARGS="$CCARGS -I/usr/include/db"
--		    else
-+		    #else
- 			# No, we're not going to try db1 db2 db3 etc.
- 			# On a properly installed system, Postfix builds
- 			# by including <db.h> and by linking with -ldb
--			echo "No <db.h> include file found." 1>&2
--			echo "Install the appropriate db*-devel package first." 1>&2
--			exit 1
-+			#echo "No <db.h> include file found." 1>&2
-+			#echo "Install the appropriate db*-devel package first." 1>&2
-+			#exit 1
- 		    fi
- 		    SYSLIBS="-ldb"
- 		    ;;
-@@ -372,12 +372,12 @@ EOF
- 		    elif [ -f /usr/include/db/db.h ]
- 		    then
- 			CCARGS="$CCARGS -I/usr/include/db"
--		    else
-+		    #else
- 			# On a properly installed system, Postfix builds
- 			# by including <db.h> and by linking with -ldb
--			echo "No <db.h> include file found." 1>&2
--			echo "Install the appropriate db*-devel package first." 1>&2
--			exit 1
-+			#echo "No <db.h> include file found." 1>&2
-+			#echo "Install the appropriate db*-devel package first." 1>&2
-+			#exit 1
- 		    fi
- 		    SYSLIBS="-ldb"
- 		    ;;
-@@ -403,12 +403,12 @@ EOF
- 		    elif [ -f /usr/include/db/db.h ]
- 		    then
- 			CCARGS="$CCARGS -I/usr/include/db"
--		    else
-+		    #else
- 			# On a properly installed system, Postfix builds
- 			# by including <db.h> and by linking with -ldb
--			echo "No <db.h> include file found." 1>&2
--			echo "Install the appropriate db*-devel package first." 1>&2
--			exit 1
-+			#echo "No <db.h> include file found." 1>&2
-+			#echo "Install the appropriate db*-devel package first." 1>&2
-+			#exit 1
- 		    fi
- 		    SYSLIBS="-ldb"
- 		    ;;