fix build of postfix, disable pcre, update to latest upstream

3 files changed, 18 insertions, 46 deletions

diff --git a/package/postfix/Makefile b/package/postfix/Makefile
index 8fb05cd23..7e27207c4 100644
--- a/package/postfix/Makefile
+++ b/package/postfix/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		postfix
-PKG_VERSION:=		2.8.7
+PKG_VERSION:=		2.10.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b3ff47a38db920fc15bb207f42da53db
+PKG_MD5SUM:=		109e753aecafe487207b425dd46e6ee9
 PKG_DESCR:=		Postfix MTA
 PKG_SECTION:=		mail
 PKG_BUILDDEP:=		tinycdb
@@ -25,7 +25,7 @@ ALL_TARGET:=
 INSTALL_STYLE:=		manual
 
 do-configure:
-	(cd $(WRKBUILD) && make -f Makefile.init makefiles "CCARGS=-DHAS_CDB -I$(STAGING_DIR)/usr/include" "AUXLIBS=$(STAGING_DIR)/usr/lib/libcdb.a")
+	(cd $(WRKBUILD) && make -f Makefile.init makefiles "CCARGS=-DNO_PCRE -DNO_NIS -DNO_DB -DHAS_CDB -I$(STAGING_DIR)/usr/include" "AUXLIBS=$(STAGING_DIR)/usr/lib/libcdb.a")
 
 postfix-install:
 	$(INSTALL_DIR) $(IDIR_POSTFIX)/etc/postfix
diff --git a/package/postfix/patches/patch-makedefs b/package/postfix/patches/patch-makedefs
index 1d2c3fde6..d39cec8a9 100644
--- a/package/postfix/patches/patch-makedefs
+++ b/package/postfix/patches/patch-makedefs
@@ -1,38 +1,12 @@
---- postfix-2.8.7.orig/makedefs	2011-11-03 00:46:22.000000000 +0100
-+++ postfix-2.8.7/makedefs	2011-12-04 11:53:35.807716569 +0100
-@@ -97,8 +97,8 @@ error() {
- 
- case $# in
-  # Officially supported usage.
-- 0) SYSTEM=`(uname -s) 2>/dev/null`
--    RELEASE=`(uname -r) 2>/dev/null`
-+ 0) SYSTEM=Linux
-+    RELEASE=3.1.4
-     VERSION=`(uname -v) 2>/dev/null`
-     case "$VERSION" in
-      dcosx*) SYSTEM=$VERSION;;
-@@ -343,31 +343,7 @@ EOF
+--- 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
+ 		    SYSLIBS="-ldb"
+ 		    ;;
  		esac
- 		;;
-     Linux.3*)	SYSTYPE=LINUX3
--		if [ -f /usr/include/db.h ]
--		then
--		    : we are all set
--		elif [ -f /usr/include/db/db.h ]
--		then
--		    CCARGS="$CCARGS -I/usr/include/db"
--		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
--		    echo "See the RELEASE_NOTES file for more information." 1>&2
--		    exit 1
--		fi
--		SYSLIBS="-ldb"
 -		for name in nsl resolv
 -		do
--		    for lib in /usr/lib64 /lib64 /usr/lib /lib
+-		    for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
 -		    do
 -			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
 -			    SYSLIBS="$SYSLIBS -l$name"
diff --git a/package/postfix/patches/patch-src_util_sys_defs_h b/package/postfix/patches/patch-src_util_sys_defs_h
index 253463f83..ecc7fc219 100644
--- a/package/postfix/patches/patch-src_util_sys_defs_h
+++ b/package/postfix/patches/patch-src_util_sys_defs_h
@@ -1,15 +1,13 @@
---- postfix-2.8.7.orig/src/util/sys_defs.h	2011-11-03 00:46:22.000000000 +0100
-+++ postfix-2.8.7/src/util/sys_defs.h	2011-12-04 11:50:06.187711393 +0100
-@@ -721,10 +721,8 @@ extern int initgroups(const char *, int)
- #define INTERNAL_LOCK	MYFLOCK_STYLE_FLOCK
+--- 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 */
  #define HAS_FSYNC
--#define HAS_DB
+ #define HAS_DB
 -#define DEF_DB_TYPE	"hash"
 -#define ALIAS_DB_MAP	"hash:/etc/aliases"
--#define HAS_NIS
-+#define DEF_DB_TYPE	"cdb"
-+#define ALIAS_DB_MAP	"cdb:/etc/postfix/aliases"
- #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
- #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
- #define FIONREAD_IN_TERMIOS_H
++#define DEF_DB_TYPE    "cdb"
++#define ALIAS_DB_MAP   "cdb:/etc/postfix/aliases"
+ #ifndef NO_NIS
+ #define HAS_NIS
+ #endif