update to latest upstream

4 files changed, 33 insertions, 15 deletions

diff --git a/package/postfix/Makefile b/package/postfix/Makefile
index e95cc4c9c..c68d69e91 100644
--- a/package/postfix/Makefile
+++ b/package/postfix/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		postfix
-PKG_VERSION:=		2.10.2
+PKG_VERSION:=		2.11.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		109e753aecafe487207b425dd46e6ee9
+PKG_MD5SUM:=		25fe7dd05f81cc0755131beecee046fd
 PKG_DESCR:=		Postfix MTA
 PKG_SECTION:=		mail
 PKG_BUILDDEP:=		tinycdb
diff --git a/package/postfix/patches/patch-makedefs b/package/postfix/patches/patch-makedefs
index d39cec8a9..e4052d8dd 100644
--- a/package/postfix/patches/patch-makedefs
+++ b/package/postfix/patches/patch-makedefs
@@ -1,6 +1,6 @@
---- postfix-2.10.2.orig/makedefs	2013-02-04 02:33:13.000000000 +0100
-+++ postfix-2.10.2/makedefs	2013-10-10 16:28:03.000000000 +0200
-@@ -366,16 +366,7 @@ EOF
+--- postfix-2.11.0.orig/makedefs	2014-01-05 18:18:56.000000000 +0100
++++ postfix-2.11.0/makedefs	2014-03-25 08:55:06.000000000 +0100
+@@ -382,16 +382,7 @@ EOF
  		    SYSLIBS="-ldb"
  		    ;;
  		esac
@@ -17,4 +17,4 @@
 +		SYSLIBS="-lresolv"
  		;;
       GNU.0*|GNU/kFreeBSD.[567]*)
-      		SYSTYPE=GNU0
+ 		SYSTYPE=GNU0
diff --git a/package/postfix/patches/patch-src_posttls-finger_posttls-finger_c b/package/postfix/patches/patch-src_posttls-finger_posttls-finger_c
new file mode 100644
index 000000000..6f0e74fab
--- /dev/null
+++ b/package/postfix/patches/patch-src_posttls-finger_posttls-finger_c
@@ -0,0 +1,10 @@
+--- postfix-2.11.0.orig/src/posttls-finger/posttls-finger.c	2013-12-16 17:06:33.000000000 +0100
++++ postfix-2.11.0/src/posttls-finger/posttls-finger.c	2014-03-25 08:58:04.000000000 +0100
+@@ -290,6 +290,7 @@
+   */
+ #include <sys_defs.h>
+ #include <stdarg.h>
++#include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include <stdlib.h>
diff --git a/package/postfix/patches/patch-src_util_sys_defs_h b/package/postfix/patches/patch-src_util_sys_defs_h
index ecc7fc219..85974664e 100644
--- a/package/postfix/patches/patch-src_util_sys_defs_h
+++ b/package/postfix/patches/patch-src_util_sys_defs_h
@@ -1,13 +1,21 @@
---- postfix-2.10.2.orig/src/util/sys_defs.h	2012-09-25 01:53:56.000000000 +0200
-+++ postfix-2.10.2/src/util/sys_defs.h	2013-10-10 16:30:37.000000000 +0200
-@@ -753,8 +753,8 @@ extern int initgroups(const char *, int)
- #define DEF_MAILBOX_LOCK "fcntl, dotlock"	/* RedHat >= 4.x */
+--- postfix-2.11.0.orig/src/util/sys_defs.h	2013-09-29 22:51:55.000000000 +0200
++++ postfix-2.11.0/src/util/sys_defs.h	2014-03-26 19:38:02.000000000 +0100
+@@ -46,7 +46,7 @@
  #define HAS_FSYNC
  #define HAS_DB
--#define DEF_DB_TYPE	"hash"
--#define ALIAS_DB_MAP	"hash:/etc/aliases"
+ #define HAS_SA_LEN
+-#define NATIVE_DB_TYPE	"hash"
++#define NATIVE_DB_TYPE	"cdb"
+ #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
+ #define ALIAS_DB_MAP   DEF_DB_TYPE ":/etc/mail/aliases"	/* sendmail 8.10 */
+ #endif
+@@ -54,7 +54,8 @@
+ #define ALIAS_DB_MAP   DEF_DB_TYPE ":/etc/mail/aliases"	/* OpenBSD 2.7 */
+ #endif
+ #ifndef ALIAS_DB_MAP
+-#define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/aliases"
 +#define DEF_DB_TYPE    "cdb"
-+#define ALIAS_DB_MAP   "cdb:/etc/postfix/aliases"
- #ifndef NO_NIS
- #define HAS_NIS
++#define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/postfix/aliases"
  #endif
+ #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
+ #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"