Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

postfix: new packages for Postfix MTA #386

Merged
merged 1 commit into from
Oct 20, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
236 changes: 236 additions & 0 deletions mail/postfix/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
#
# Copyright (C) 2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#

include $(TOPDIR)/rules.mk

PKG_NAME:=postfix
PKG_RELEASE:=1
PKG_SOURCE_URL:=ftp://ftp.porcupine.org/mirrors/postfix-release/official/
PKG_VERSION:=2.11.1
PKG_MD5SUM:=56ac1f1a79737c4ac1e24535a122a4a6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_MAINTAINER:=Denis Shulyaka <[email protected]>
PKG_LICENSE:=IPL-1.0
PKG_LICENSE_FILE:=LICENSE
PKG_BUILD_DEPENDS:=+tinycdb

include $(INCLUDE_DIR)/package.mk

define Package/postfix
SECTION:=mail
CATEGORY:=Mail
TITLE:=Postfix Mail Transmit Agent
URL:=http://www.postfix.org/
DEPENDS:=+POSTFIX_TLS:libopenssl +POSTFIX_SASL:libsasl2 +POSTFIX_LDAP:libopenldap +libpcre
endef

define Package/postfix/description
Postfix is Wietse Venema's mailer that started life as an alternative to the widely-used Sendmail program. Postfix attempts to be fast, easy to administer, and secure, while at the same time being sendmail compatible enough to not upset existing users. Thus, the outside has a sendmail-ish flavor, but the inside is completely different.
endef

define Package/postfix/config
menu "Select postfix build options"
config POSTFIX_TLS
bool "TLS support"
default y
help
Implements TLS support in postfix (using OpenSSL).
config POSTFIX_SASL
bool "SASL support"
default y
help
Implements SASL support in postfix (using Cyrus SASL).
config POSTFIX_LDAP
bool "LDAP support"
default y
help
Implements LDAP support in postfix (using OpenLDAP).
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

ifdef CONFIG_POSTFIX_TLS
CCARGS+=-DUSE_TLS
AUXLIBS+=-lssl -lcrypto
endif

ifdef CONFIG_POSTFIX_SASL
CCARGS+=-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I$(STAGING_DIR)/usr/include/sasl
AUXLIBS+=-lsasl2
endif

ifdef CONFIG_POSTFIX_LDAP
CCARGS+=-DHAS_LDAP
AUXLIBS+=-lldap -llber
endif

config_directory=/etc/postfix
sample_directory=/etc/postfix
command_directory=/usr/sbin
daemon_directory=/usr/libexec/postfix
data_directory=/usr/var/lib/postfix
queue_directory=/usr/var/spool/postfix
mail_spool_directory=/usr/var/mail
html_directory=no
manpage_directory=no
readme_directory=no
sendmail_path=/usr/sbin/sendmail
newaliases_path=/usr/bin/newaliases
mailq_path=/usr/bin/mailq

ln_suffix=.postfix
ln_old_suffix=.old

define Build/Configure
cd $(PKG_BUILD_DIR); $(MAKE) makefiles CCARGS='$(CCARGS)' $(TARGET_CONFIGURE_OPTS) AUXLIBS="$(AUXLIBS)"
endef

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)'
mv $(PKG_BUILD_DIR)/conf/main.cf.default.openwrt $(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
echo "html_directory = $(html_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
echo "manpage_directory = $(manpage_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
echo "sample_directory = $(sample_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
echo "readme_directory = $(readme_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
echo "command_directory = $(command_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
echo "daemon_directory = $(daemon_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
echo "data_directory = $(data_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
echo "queue_directory = $(queue_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
echo "config_directory = $(config_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
echo "mail_spool_directory = $(mail_spool_directory)" >> $(PKG_BUILD_DIR)/conf/main.cf.default
endef

define Package/postfix/install
cd $(PKG_BUILD_DIR); $(MAKE) install_root=$(1) command_directory=$(command_directory) daemon_directory=$(daemon_directory) data_directory=$(data_directory) html_directory=$(html_directory) mail_owner=postfix mailq_path=$(mailq_path)$(ln_suffix) manpage_directory=$(manpage_directory) newaliases_path=$(newaliases_path)$(ln_suffix) queue_directory=$(queue_directory) readme_directory=$(readme_directory) sendmail_path=$(sendmail_path)$(ln_suffix) setgid_group=postdrop sample_directory=$(sample_directory) config_directory=$(config_directory) non-interactive-package
$(INSTALL_DIR) $(1)$(mail_spool_directory)
$(INSTALL_DIR) $(1)/etc/init.d/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/postfix_init $(1)/etc/init.d/postfix
endef

define Package/postfix/postinst
#!/bin/sh
# check if we are on real system
if [ -z "$${IPKG_INSTROOT}" ]; then

if [ -f "$(sendmail_path)" -a "$$(readlink "$(sendmail_path)")" != "$(sendmail_path)$(ln_suffix)" ]; then
mv "$(sendmail_path)" "$(sendmail_path)$(ln_old_suffix)"
echo "Warning: $(sendmail_path) saved as $(sendmail_path)$(ln_old_suffix)"
fi
if [ ! -f "$(sendmail_path)" ]; then
ln -s "$(sendmail_path)$(ln_suffix)" "$(sendmail_path)"
fi

if [ -f "$(newaliases_path)" -a "$$(readlink "$(newaliases_path)")" != "$(newaliases_path)$(ln_suffix)" ]; then
mv "$(newaliases_path)" "$(newaliases_path)$(ln_old_suffix)"
echo "Warning: $(newaliases_path) saved as $(newaliases_path)$(ln_old_suffix)"
fi
if [ ! -f "$(newaliases_path)" ]; then
ln -s "$(newaliases_path)$(ln_suffix)" "$(newaliases_path)"
fi

if [ -f "$(mailq_path)" -a "$$(readlink "$(mailq_path)")" != "$(mailq_path)$(ln_suffix)" ]; then
mv "$(mailq_path)" "$(mailq_path)$(ln_old_suffix)"
echo "Warning: $(mailq_path) saved as $(mailq_path)$(ln_old_suffix)"
fi
if [ ! -f "$(mailq_path)" ]; then
ln -s "$(mailq_path)$(ln_suffix)" "$(mailq_path)"
fi

echo "myhostname = $$(uci get system.@system[0].hostname)" >> $(config_directory)/main.cf.default
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)"

EXTRA_COMMANDS=create_users /etc/init.d/postfix create_users

postfix set-permissions
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

fi
endef

define Package/postfix/prerm
#!/bin/sh
# 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

/etc/init.d/postfix disable

fi
endef

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 "$(sendmail_path)" "$(newaliases_path)" "$(mailq_path)"

if [ -f "$(sendmail_path)$(ln_old_suffix)" ]; then
mv "$(sendmail_path)$(ln_old_suffix)" "$(sendmail_path)"
echo "Warning: $(sendmail_path) restored from $(sendmail_path)$(ln_old_suffix)"
fi
if [ -f "$(newaliases_path)$(ln_old_suffix)" ]; then
mv "$(newaliases_path)$(ln_old_suffix)" "$(newaliases_path)"
echo "Warning: $(newaliases_path) restored from $(newaliases_path)$(ln_old_suffix)"
fi
if [ -f "$(mailq_path)$(ln_old_suffix)" ]; then
mv "$(mailq_path)$(ln_old_suffix)" "$(mailq_path)"
echo "Warning: $(mailq_path) restored from $(mailq_path)$(ln_old_suffix)"
fi

fi
endef

$(eval $(call BuildPackage,postfix))
12 changes: 12 additions & 0 deletions mail/postfix/patches/100-fsstat.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -rupN postfix-2.8.1/src/smtpd/smtpd_check.c postfix-2.8.1_patched/src/smtpd/smtpd_check.c
--- postfix-2.8.1/src/smtpd/smtpd_check.c 2011-01-04 22:03:50.000000000 +0300
+++ postfix-2.8.1_patched/src/smtpd/smtpd_check.c 2011-03-06 19:35:39.000000000 +0300
@@ -4894,7 +4894,7 @@ char *smtpd_check_queue(SMTPD_STATE *s
*/
#define BLOCKS(x) ((x) / fsbuf.block_size)

- fsspace(".", &fsbuf);
+ fsspace("/overlay", &fsbuf);
if (msg_verbose)
msg_info("%s: blocks %lu avail %lu min_free %lu msg_size_limit %lu",
myname,
80 changes: 80 additions & 0 deletions mail/postfix/patches/200-manpages.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
diff -Naur postfix-2.10.2/conf/post-install postfix-2.10.2_patched/conf/post-install
--- postfix-2.10.2/conf/post-install 2013-06-13 18:07:46.000000000 +0400
+++ postfix-2.10.2_patched/conf/post-install 2013-11-19 21:17:49.572820573 +0400
@@ -350,10 +350,10 @@

# Sanity checks

-case $manpage_directory in
- no) echo $0: Error: manpage_directory no longer accepts \"no\" values. 1>&2
- echo Try again with \"$0 manpage_directory=/pathname ...\". 1>&2; exit 1;;
-esac
+#case $manpage_directory in
+# no) echo $0: Error: manpage_directory no longer accepts \"no\" values. 1>&2
+# echo Try again with \"$0 manpage_directory=/pathname ...\". 1>&2; exit 1;;
+#esac

case $setgid_group in
no) echo $0: Error: setgid_group no longer accepts \"no\" values. 1>&2
@@ -361,7 +361,7 @@
esac

for path in "$daemon_directory" "$command_directory" "$queue_directory" \
- "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory"
+ "$sendmail_path" "$newaliases_path" "$mailq_path"
do
case "$path" in
/*) ;;
@@ -369,7 +369,7 @@
esac
done

-for path in "$html_directory" "$readme_directory"
+for path in "$html_directory" "$readme_directory" "$manpage_directory"
do
case "$path" in
/*) ;;
diff -Naur postfix-2.10.2/postfix-install postfix-2.10.2_patched/postfix-install
--- postfix-2.10.2/postfix-install 2012-05-22 23:40:29.000000000 +0400
+++ postfix-2.10.2_patched/postfix-install 2013-11-19 21:12:20.694160734 +0400
@@ -481,13 +481,13 @@
exit 1;;
esac

-case "$manpage_directory" in
- no) (echo $0: Error: the manpage_directory parameter no longer accepts
- echo \"no\" values. Try again with \"manpage_directory=/path/name\"
- echo on the command line or execute \"make install\" and specify
- echo manpage_directory interactively.) | ${FMT} 1>&2
- exit 1;;
-esac
+#case "$manpage_directory" in
+# no) (echo $0: Error: the manpage_directory parameter no longer accepts
+# echo \"no\" values. Try again with \"manpage_directory=/path/name\"
+# echo on the command line or execute \"make install\" and specify
+# echo manpage_directory interactively.) | ${FMT} 1>&2
+# exit 1;;
+#esac

for path in "$html_directory" "$readme_directory"
do
@@ -500,7 +500,7 @@
done

for path in "$daemon_directory" "$data_directory" "$command_directory" "$queue_directory" \
- "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory"
+ "$sendmail_path" "$newaliases_path" "$mailq_path"
do
case "$path" in
/*) ;;
@@ -680,8 +680,8 @@
compare_or_replace $mode "$owner" "$group" html/$file \
$HTML_DIRECTORY/$file || exit 1;;
'$manpage_directory')
- check_parent $MANPAGE_DIRECTORY/$file || exit 1
- compare_or_replace $mode "$owner" "$group" man/$file \
+ test "$manpage_directory" = "no" || check_parent $MANPAGE_DIRECTORY/$file || exit 1
+ test "$manpage_directory" = "no" || compare_or_replace $mode "$owner" "$group" man/$file \
$MANPAGE_DIRECTORY/$file || exit 1;;
'$readme_directory')
test "$readme_directory" = "no" ||
23 changes: 23 additions & 0 deletions mail/postfix/patches/300-init.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff -rupN postfix-2.8.1/postfix_init postfix-2.8.1_patched/postfix_init
--- postfix-2.8.1/postfix_init 1970-01-01 03:00:00.000000000 +0300
+++ postfix-2.8.1_patched/postfix_init 2011-03-06 21:44:50.000000000 +0300
@@ -0,0 +1,19 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2014 OpenWrt.org
+
+START=50
+STOP=50
+
+create_users() {
+ group_exists postfix || group_add postfix 87
+ user_exists postfix || user_add postfix 87
+ group_exists postdrop || group_add postdrop 88
+}
+
+start() {
+ postfix start
+}
+
+stop() {
+ postfix stop
+}
14 changes: 14 additions & 0 deletions mail/postfix/patches/400-cdb.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff -Naur postfix-2.11.1/src/util/sys_defs.h postfix-2.11.1.patched/src/util/sys_defs.h
--- postfix-2.11.1/src/util/sys_defs.h 2013-09-30 00:51:55.000000000 +0400
+++ postfix-2.11.1.patched/src/util/sys_defs.h 2014-09-29 03:11:48.962277971 +0400
@@ -767,9 +767,8 @@
#define INTERNAL_LOCK MYFLOCK_STYLE_FLOCK
#define DEF_MAILBOX_LOCK "fcntl, dotlock" /* RedHat >= 4.x */
#define HAS_FSYNC
-#define HAS_DB
#define NATIVE_DB_TYPE "hash"
-#define ALIAS_DB_MAP DEF_DB_TYPE ":/etc/aliases"
+#define ALIAS_DB_MAP DEF_DB_TYPE ":/etc/postfix/aliases"
#ifndef NO_NIS
#define HAS_NIS
#endif
27 changes: 27 additions & 0 deletions mail/postfix/patches/500-crosscompile.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--- postfix-2.10.2/makedefs 2013-02-04 05:33:13.000000000 +0400
+++ postfix-2.10.2_patched/makedefs 2013-11-19 22:48:50.528560454 +0400
@@ -107,9 +107,9 @@

case $# in
# Officially supported usage.
- 0) SYSTEM=`(uname -s) 2>/dev/null`
- RELEASE=`(uname -r) 2>/dev/null`
- VERSION=`(uname -v) 2>/dev/null`
+ 0) SYSTEM="Linux"
+ RELEASE="3.10.18"
+ VERSION="OpenWRT"
case "$VERSION" in
dcosx*) SYSTEM=$VERSION;;
esac;;
@@ -384,9 +384,9 @@
esac
for name in nsl resolv
do
- for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
+ for lib in /usr/lib64 /usr/lib64/* /usr/lib /usr/lib/* /lib /lib/*
do
- test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
+ test -e $PKG_BUILD_DIR/$lib/lib$name.a -o -e $PKG_BUILD_DIR/$lib/lib$name.so && {
SYSLIBS="$SYSLIBS -l$name"
break
}
Loading