From 250f1f2adec96a522965e55371cf1855e3a3def5 Mon Sep 17 00:00:00 2001 From: Denis Shulyaka Date: Sat, 1 Nov 2014 13:20:17 +0300 Subject: [PATCH] postfix: Added experimental support for Berkeley DB (btree files). Note that hash files are currently not supported by OpenWRT package of Berkeley DB. CDB is still default. Signed-off-by: Denis Shulyaka --- mail/postfix/Makefile | 115 +++++++++++------- mail/postfix/files/main.cf.default | 3 - .../patches/300-bdb_hash_segfault.patch | 14 +++ 3 files changed, 85 insertions(+), 47 deletions(-) create mode 100644 mail/postfix/patches/300-bdb_hash_segfault.patch diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index c4ed890596..704530e2d4 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postfix -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=ftp://ftp.porcupine.org/mirrors/postfix-release/official/ PKG_VERSION:=2.11.3 PKG_MD5SUM:=c3f0f51d8865559b40e9350eb3816011 @@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MAINTAINER:=Denis Shulyaka PKG_LICENSE:=IPL-1.0 PKG_LICENSE_FILE:=LICENSE -PKG_BUILD_DEPENDS:=+tinycdb +PKG_BUILD_DEPENDS:=+POSTFIX_CDB:tinycdb include $(INCLUDE_DIR)/package.mk @@ -25,7 +25,7 @@ define Package/postfix CATEGORY:=Mail TITLE:=Postfix Mail Transmit Agent URL:=http://www.postfix.org/ - DEPENDS:=+POSTFIX_TLS:libopenssl +POSTFIX_SASL:libsasl2 +POSTFIX_LDAP:libopenldap +libpcre + DEPENDS:=+POSTFIX_TLS:libopenssl +POSTFIX_SASL:libsasl2 +POSTFIX_LDAP:libopenldap +POSTFIX_DB:libdb47 +libpcre endef define Package/postfix/description @@ -49,17 +49,22 @@ define Package/postfix/config default y help Implements LDAP support in postfix (using OpenLDAP). + config POSTFIX_DB + bool "BerkeleyDB support" + default n + help + Implements support for btree files using Berkeley DB. Note that hash files support is not compiled into Berkeley DB OpenWRT distribution + config POSTFIX_CDB + bool "CDB support" + default y + help + Implements support for cdb files using tinycdb endmenu endef -define Package/postfix/conffiles -/etc/postfix/main.cf -/etc/postfix/master.cf -/etc/postfix/aliases -endef - -CCARGS=-DHAS_CDB -DNO_DB -DNO_EPOLL -DNO_SIGSETJMP -DNO_NIS -DDEF_DB_TYPE=\"cdb\" -AUXLIBS=-L$(STAGING_DIR)/usr/lib -lcdb +CCARGS=-DNO_EPOLL -DNO_SIGSETJMP -DNO_NIS +AUXLIBS=-L$(STAGING_DIR)/usr/lib +default_database_type=cdb ifdef CONFIG_POSTFIX_TLS CCARGS+=-DUSE_TLS @@ -76,6 +81,23 @@ ifdef CONFIG_POSTFIX_LDAP AUXLIBS+=-lldap -llber endif +ifdef CONFIG_POSTFIX_CDB + CCARGS+=-DHAS_CDB + AUXLIBS+=-lcdb +endif + +ifdef CONFIG_POSTFIX_DB + AUXLIBS+=-ldb + CCARGS+=-DHAS_DB + ifndef CONFIG_POSTFIX_CDB + default_database_type=btree + endif +else + CCARGS+=-DNO_DB +endif + +CCARGS+=-DDEF_DB_TYPE=\"$(default_database_type)\" + config_directory=/etc/postfix sample_directory=/etc/postfix command_directory=/usr/sbin @@ -93,7 +115,18 @@ mailq_path=/usr/bin/mailq ln_suffix=.postfix ln_old_suffix=.old +define Package/postfix/conffiles +$(config_directory)/main.cf +$(config_directory)/master.cf +$(config_directory)/aliases +endef + define Build/Configure + if [ "$(CONFIG_POSTFIX_DB)" = "" -a "$(CONFIG_POSTFIX_CDB)" = "" ]; then\ + echo "Build error: You must select at least one of the DB types";\ + exit 1;\ + fi + cd $(PKG_BUILD_DIR); $(MAKE) makefiles CCARGS='$(CCARGS)' $(TARGET_CONFIGURE_OPTS) AUXLIBS="$(AUXLIBS)" endef @@ -101,6 +134,9 @@ define Build/Compile # Currently postfix has a bug with Makefiles that CCARGS are not passed to the compiler, so we are copying them to CC cd $(PKG_BUILD_DIR); $(MAKE) $(TARGET_CONFIGURE_OPTS) CC='$(TARGET_CC) $(CCARGS)' cp ./files/main.cf.default $(PKG_BUILD_DIR)/conf/main.cf.default + echo "default_database_type = $(default_database_type)" >> $(PKG_BUILD_DIR)/conf/main.cf.default + echo "alias_database = $(default_database_type):$(config_directory)/aliases" >> $(PKG_BUILD_DIR)/conf/main.cf.default + echo "alias_maps = $(default_database_type):$(config_directory)/aliases" >> $(PKG_BUILD_DIR)/conf/main.cf.default echo "sendmail_path = $(sendmail_path)$(ln_suffix)" >> $(PKG_BUILD_DIR)/conf/main.cf.default echo "newaliases_path = $(newaliases_path)$(ln_suffix)" >> $(PKG_BUILD_DIR)/conf/main.cf.default echo "mailq_path = $(mailq_path)$(ln_suffix)" >> $(PKG_BUILD_DIR)/conf/main.cf.default @@ -156,24 +192,24 @@ if [ -z "$${IPKG_INSTROOT}" ]; then echo "mydomain = $$(uci get system.@system[0].hostname|sed -e "s/[^\.]*\.\(.*\)/\1/")" >> $(config_directory)/main.cf.default for net in $$(uci show network|grep ipaddr|sed -e "s/network\.\([^\.]*\).*/\1/"); do eval "$$(ipcalc.sh $$(uci get network.$$net.ipaddr) $$(uci get network.$$net.netmask))"; echo "$$IP/$$PREFIX"; done | xargs echo "mynetworks =" >> $(config_directory)/main.cf.default - grep -qc "^sendmail_path" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^sendmail_path =" /etc/postfix/main.cf.default)" - grep -qc "^newaliases_path" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^newaliases_path =" /etc/postfix/main.cf.default)" - grep -qc "^mailq_path" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^mailq_path =" /etc/postfix/main.cf.default)" - grep -qc "^html_directory" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^html_directory =" /etc/postfix/main.cf.default)" - grep -qc "^manpage_directory" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^manpage_directory =" /etc/postfix/main.cf.default)" - grep -qc "^sample_directory" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^sample_directory =" /etc/postfix/main.cf.default)" - grep -qc "^readme_directory" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^readme_directory =" /etc/postfix/main.cf.default)" - grep -qc "^command_directory" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^command_directory =" /etc/postfix/main.cf.default)" - grep -qc "^daemon_directory" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^daemon_directory =" /etc/postfix/main.cf.default)" - grep -qc "^data_directory" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^data_directory =" /etc/postfix/main.cf.default)" - grep -qc "^queue_directory" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^queue_directory =" /etc/postfix/main.cf.default)" - grep -qc "^config_directory" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^config_directory =" /etc/postfix/main.cf.default)" - grep -qc "^mail_spool_directory" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^mail_spool_directory =" /etc/postfix/main.cf.default)" - grep -qc "^mail_owner" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^mail_owner =" /etc/postfix/main.cf.default)" - grep -qc "^setgid_group" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^setgid_group =" /etc/postfix/main.cf.default)" - grep -qc "^myhostname" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^myhostname =" /etc/postfix/main.cf.default)" - grep -qc "^mydomain" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^mydomain =" /etc/postfix/main.cf.default)" - grep -qc "^mynetworks" /etc/postfix/main.cf >/dev/null || postconf -e "$$(grep "^mynetworks =" /etc/postfix/main.cf.default)" + grep -qc "^sendmail_path" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^sendmail_path =" $(config_directory)/main.cf.default)" + grep -qc "^newaliases_path" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^newaliases_path =" $(config_directory)/main.cf.default)" + grep -qc "^mailq_path" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^mailq_path =" $(config_directory)/main.cf.default)" + grep -qc "^html_directory" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^html_directory =" $(config_directory)/main.cf.default)" + grep -qc "^manpage_directory" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^manpage_directory =" $(config_directory)/main.cf.default)" + grep -qc "^sample_directory" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^sample_directory =" $(config_directory)/main.cf.default)" + grep -qc "^readme_directory" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^readme_directory =" $(config_directory)/main.cf.default)" + grep -qc "^command_directory" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^command_directory =" $(config_directory)/main.cf.default)" + grep -qc "^daemon_directory" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^daemon_directory =" $(config_directory)/main.cf.default)" + grep -qc "^data_directory" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^data_directory =" $(config_directory)/main.cf.default)" + grep -qc "^queue_directory" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^queue_directory =" $(config_directory)/main.cf.default)" + grep -qc "^config_directory" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^config_directory =" $(config_directory)/main.cf.default)" + grep -qc "^mail_spool_directory" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^mail_spool_directory =" $(config_directory)/main.cf.default)" + grep -qc "^mail_owner" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^mail_owner =" $(config_directory)/main.cf.default)" + grep -qc "^setgid_group" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^setgid_group =" $(config_directory)/main.cf.default)" + grep -qc "^myhostname" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^myhostname =" $(config_directory)/main.cf.default)" + grep -qc "^mydomain" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^mydomain =" $(config_directory)/main.cf.default)" + grep -qc "^mynetworks" $(config_directory)/main.cf >/dev/null || postconf -e "$$(grep "^mynetworks =" $(config_directory)/main.cf.default)" EXTRA_COMMANDS=create_users /etc/init.d/postfix create_users @@ -181,15 +217,10 @@ if [ -z "$${IPKG_INSTROOT}" ]; then postfix post-install upgrade-source postfix upgrade-configuration newaliases - if [ `ps | grep "postfix/master" | grep -cv grep` -gt 0 ] - then - postfix reload - fi - if [ `grep -c aliases /etc/sysupgrade.conf` -eq 0 ] - then - echo "$(config_directory)/main.cf" >> /etc/sysupgrade.conf - echo "$(config_directory)/aliases" >> /etc/sysupgrade.conf - fi + ps | grep "postfix/master" | grep -cvq grep >/dev/null && postfix reload + grep -qc main\.cf /etc/sysupgrade.conf >/dev/null || echo "$(config_directory)/main.cf" >> /etc/sysupgrade.conf + grep -qc master\.cf /etc/sysupgrade.conf >/dev/null || echo "$(config_directory)/master.cf" >> /etc/sysupgrade.conf + grep -qc aliases /etc/sysupgrade.conf >/dev/null || echo "$(config_directory)/aliases" >> /etc/sysupgrade.conf fi endef @@ -199,11 +230,7 @@ define Package/postfix/prerm # check if we are on real system if [ -z "$${IPKG_INSTROOT}" ]; then - if [ `ps | grep "postfix/master" | grep -cv grep` -gt 0 ] - then - postfix stop - fi - + ps | grep "postfix/master" | grep -cvq grep >/dev/null && postfix stop /etc/init.d/postfix disable fi @@ -213,7 +240,7 @@ define Package/postfix/postrm #!/bin/sh # check if we are on real system if [ -z "$${IPKG_INSTROOT}" ]; then - rm -f $(config_directory)/aliases.cdb $(data_directory)/master.lock + rm -f $(config_directory)/aliases.cdb $(config_directory)/aliases.db $(data_directory)/master.lock rm -f "$(sendmail_path)" "$(newaliases_path)" "$(mailq_path)" diff --git a/mail/postfix/files/main.cf.default b/mail/postfix/files/main.cf.default index 9e2096209b..7947dbc306 100644 --- a/mail/postfix/files/main.cf.default +++ b/mail/postfix/files/main.cf.default @@ -24,8 +24,6 @@ address_verify_sender_ttl = 0s address_verify_service_name = verify address_verify_transport_maps = $transport_maps address_verify_virtual_transport = $virtual_transport -alias_database = cdb:/etc/aliases -alias_maps = cdb:/etc/aliases allow_mail_to_commands = alias, forward allow_mail_to_files = alias, forward allow_min_user = no @@ -72,7 +70,6 @@ daemon_timeout = 18000s debug_peer_level = 2 debug_peer_list = debugger_command = -default_database_type = cdb default_delivery_slot_cost = 5 default_delivery_slot_discount = 50 default_delivery_slot_loan = 3 diff --git a/mail/postfix/patches/300-bdb_hash_segfault.patch b/mail/postfix/patches/300-bdb_hash_segfault.patch new file mode 100644 index 0000000000..c7f0df0959 --- /dev/null +++ b/mail/postfix/patches/300-bdb_hash_segfault.patch @@ -0,0 +1,14 @@ +diff -Naur postfix-2.11.3/src/util/dict_db.c postfix-2.11.3_patched/src/util/dict_db.c +--- postfix-2.11.3/src/util/dict_db.c 2012-01-25 04:41:08.000000000 +0400 ++++ postfix-2.11.3_patched/src/util/dict_db.c 2014-11-01 12:36:44.287641712 +0300 +@@ -691,8 +691,8 @@ + msg_panic("db_create null result"); + if ((errno = db->set_cachesize(db, 0, dict_db_cache_size, 0)) != 0) + msg_fatal("set DB cache size %d: %m", dict_db_cache_size); +- if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) +- msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); ++// if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) ++// msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); + #if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) + if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) + FREE_RETURN(dict_surrogate(class, path, open_flags, dict_flags,