fix postfix segfaults by avoidance of berkeley db

4 files changed, 21 insertions, 64 deletions

diff --git a/package/postfix/Makefile b/package/postfix/Makefile
index c34530fd6..8fb05cd23 100644
--- a/package/postfix/Makefile
+++ b/package/postfix/Makefile
@@ -9,8 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b3ff47a38db920fc15bb207f42da53db
 PKG_DESCR:=		Postfix MTA
 PKG_SECTION:=		mail
-PKG_BUILDDEP:=		db
-PKG_DEPENDS:=		libdb
+PKG_BUILDDEP:=		tinycdb
 PKG_URL:=		http://www.postfix.org/
 PKG_SITES:=		http://de.postfix.org/ftpmirror/official/
 
@@ -25,6 +24,9 @@ CONFIG_STYLE:=		manual
 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")
+
 postfix-install:
 	$(INSTALL_DIR) $(IDIR_POSTFIX)/etc/postfix
 	$(CP) $(WRKBUILD)/conf/* $(IDIR_POSTFIX)/etc/postfix
diff --git a/package/postfix/patches/patch-makedefs b/package/postfix/patches/patch-makedefs
index cb064c6e3..1d2c3fde6 100644
--- a/package/postfix/patches/patch-makedefs
+++ b/package/postfix/patches/patch-makedefs
@@ -1,5 +1,5 @@
 --- postfix-2.8.7.orig/makedefs	2011-11-03 00:46:22.000000000 +0100
-+++ postfix-2.8.7/makedefs	2011-12-03 13:36:33.561684585 +0100
++++ postfix-2.8.7/makedefs	2011-12-04 11:53:35.807716569 +0100
 @@ -97,8 +97,8 @@ error() {
  
  case $# in
@@ -11,7 +11,7 @@
      VERSION=`(uname -v) 2>/dev/null`
      case "$VERSION" in
       dcosx*) SYSTEM=$VERSION;;
-@@ -343,20 +343,6 @@ EOF
+@@ -343,31 +343,7 @@ EOF
  		esac
  		;;
      Linux.3*)	SYSTYPE=LINUX3
@@ -29,6 +29,18 @@
 -		    echo "See the RELEASE_NOTES file for more information." 1>&2
 -		    exit 1
 -		fi
- 		SYSLIBS="-ldb"
- 		for name in nsl resolv
- 		do
+-		SYSLIBS="-ldb"
+-		for name in nsl resolv
+-		do
+-		    for lib in /usr/lib64 /lib64 /usr/lib /lib
+-		    do
+-			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
+-			    SYSLIBS="$SYSLIBS -l$name"
+-			    break
+-			}
+-		    done
+-		done
++		SYSLIBS="-lresolv"
+ 		;;
+      GNU.0*|GNU/kFreeBSD.[567]*)
+      		SYSTYPE=GNU0
diff --git a/package/postfix/patches/patch-src_util_Makefile_in b/package/postfix/patches/patch-src_util_Makefile_in
deleted file mode 100644
index b310d5608..000000000
--- a/package/postfix/patches/patch-src_util_Makefile_in
+++ /dev/null
@@ -1,33 +0,0 @@
---- postfix-2.8.7.orig/src/util/Makefile.in	2011-04-15 18:52:47.000000000 +0200
-+++ postfix-2.8.7/src/util/Makefile.in	2011-12-03 13:16:59.000000000 +0100
-@@ -4,8 +4,8 @@ SRCS	= alldig.c allprint.c argv.c argv_s
- 	attr_scan_plain.c auto_clnt.c base64_code.c basename.c binhash.c \
- 	chroot_uid.c cidr_match.c clean_env.c close_on_exec.c concatenate.c \
- 	ctable.c dict.c dict_alloc.c dict_cdb.c dict_cidr.c dict_db.c \
--	dict_dbm.c dict_debug.c dict_env.c dict_ht.c dict_ni.c dict_nis.c \
--	dict_nisplus.c dict_open.c dict_pcre.c dict_regexp.c dict_sdbm.c \
-+	dict_dbm.c dict_debug.c dict_env.c dict_ht.c dict_ni.c \
-+	dict_open.c dict_pcre.c dict_regexp.c dict_sdbm.c \
- 	dict_static.c dict_tcp.c dict_unix.c dir_forest.c doze.c dummy_read.c \
- 	dummy_write.c duplex_pipe.c environ.c events.c exec_command.c \
- 	fifo_listen.c fifo_trigger.c file_limit.c find_inet.c fsspace.c \
-@@ -39,8 +39,8 @@ OBJS	= alldig.o allprint.o argv.o argv_s
- 	attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \
- 	chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \
- 	ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \
--	dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \
--	dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \
-+	dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o \
-+	dict_open.o dict_pcre.o dict_regexp.o dict_sdbm.o \
- 	dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \
- 	dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \
- 	fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \
-@@ -72,7 +72,7 @@ OBJS	= alldig.o allprint.o argv.o argv_s
- HDRS	= argv.h attr.h attr_clnt.h auto_clnt.h base64_code.h binhash.h \
- 	chroot_uid.h cidr_match.h clean_env.h connect.h ctable.h dict.h \
- 	dict_cdb.h dict_cidr.h dict_db.h dict_dbm.h dict_env.h dict_ht.h \
--	dict_ni.h dict_nis.h dict_nisplus.h dict_pcre.h dict_regexp.h \
-+	dict_ni.h dict_pcre.h dict_regexp.h \
- 	dict_sdbm.h dict_static.h dict_tcp.h dict_unix.h dir_forest.h \
- 	events.h exec_command.h find_inet.h fsspace.h fullname.h \
- 	get_domainname.h get_hostname.h hex_code.h hex_quote.h host_port.h \
diff --git a/package/postfix/patches/patch-src_util_dict_open_c b/package/postfix/patches/patch-src_util_dict_open_c
deleted file mode 100644
index 48555d4e9..000000000
--- a/package/postfix/patches/patch-src_util_dict_open_c
+++ /dev/null
@@ -1,24 +0,0 @@
---- postfix-2.8.7.orig/src/util/dict_open.c	2011-04-11 19:37:49.000000000 +0200
-+++ postfix-2.8.7/src/util/dict_open.c	2011-12-03 13:38:06.889686949 +0100
-@@ -202,8 +202,6 @@
- #include <dict_sdbm.h>
- #include <dict_dbm.h>
- #include <dict_db.h>
--#include <dict_nis.h>
--#include <dict_nisplus.h>
- #include <dict_ni.h>
- #include <dict_pcre.h>
- #include <dict_regexp.h>
-@@ -242,12 +240,6 @@ static const DICT_OPEN_INFO dict_open_in
-     DICT_TYPE_HASH, dict_hash_open,
-     DICT_TYPE_BTREE, dict_btree_open,
- #endif
--#ifdef HAS_NIS
--    DICT_TYPE_NIS, dict_nis_open,
--#endif
--#ifdef HAS_NISPLUS
--    DICT_TYPE_NISPLUS, dict_nisplus_open,
--#endif
- #ifdef HAS_NETINFO
-     DICT_TYPE_NETINFO, dict_ni_open,
- #endif