diff --git a/luci-app-mail/Makefile b/luci-app-mail/Makefile index b871c4853..dfbbd5403 100644 --- a/luci-app-mail/Makefile +++ b/luci-app-mail/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Mail Configuration -LUCI_DEPENDS:=+msmtp-mta +ca-certificates +LUCI_DEPENDS:=+msmtp-mta PKG_LICENSE:=GPLv3 diff --git a/msmtp/Makefile b/msmtp/Makefile new file mode 100644 index 000000000..7c62d6923 --- /dev/null +++ b/msmtp/Makefile @@ -0,0 +1,148 @@ +# +# Copyright (C) 2009 David Cooper +# Copyright (C) 2009-2016 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:=msmtp +PKG_VERSION:=1.6.8 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://marlam.de/msmtp/releases +PKG_HASH:=55ff95a304d888b56d07d9c62327ab9bfe26532c9c2a2ed6aefc43bea1b659fb + +PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE_FILES:=COPYING +PKG_MAINTAINER:=Nicolas Thill + +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +define Package/msmtp/Default + SECTION:=mail + CATEGORY:=Mail + DEPENDS:=$(INTL_DEPENDS) + TITLE:=Simple sendmail SMTP forwarding + URL:=http://msmtp.sourceforge.net/ +endef + +define Package/msmtp/Default/description + msmtp is an SMTP client. In the default mode, it transmits a mail to + an SMTP server (for example at a free mail provider) which does the + delivery. To use this program with your mail user agent (MUA), create + a configuration file with your mail account(s) and tell your MUA to + call msmtp instead of /usr/sbin/sendmail. +endef + +define Package/msmtp +$(call Package/msmtp/Default) + DEPENDS+= +libopenssl +ca-bundle + TITLE+= (with SSL support) + VARIANT:=ssl +endef + +define Package/msmtp/conffiles +/etc/msmtprc +endef + +define Package/msmtp/description +$(call Package/msmtp/Default/description) + This package is built with SSL support. +endef + +define Package/msmtp-nossl +$(call Package/msmtp/Default) + TITLE+= (without SSL support) + VARIANT:=nossl +endef + +define Package/msmtp-nossl/description +$(call Package/msmtp/Default/description) + This package is built without SSL support. +endef + +define Package/msmtp-mta +$(call Package/msmtp/Default) + TITLE+= (as MTA) + DEPENDS+=+msmtp +# DEPENDS+=@(PACKAGE_msmtp||PACKAGE_msmtp-nossl) +endef + +define Package/msmtp-mta/description +$(call Package/msmtp/Default/description) + This package add a link from sendmail to msmtp + and is built with SSL support. +endef + +define Package/msmtp-queue +$(call Package/msmtp/Default) + DEPENDS+= +bash @(PACKAGE_msmtp||PACKAGE_msmtp-nossl) + TITLE+= (queue scripts) +endef + +define Package/msmtp-queue/description +$(call Package/msmtp/Default/description) + This package contains the msmtp queue scripts. +endef + +CONFIGURE_ARGS += \ + --disable-rpath \ + --without-libintl-prefix \ + --without-libgsasl \ + --without-libidn \ + --without-libsecret \ + --without-macosx-keyring \ + +ifneq ($(CONFIG_USE_UCLIBC),) + CONFIGURE_ARGS += --disable-gai-idn +endif + +MAKE_FLAGS := + +ifeq ($(BUILD_VARIANT),ssl) + CONFIGURE_ARGS += \ + --with-tls=openssl +endif + +ifeq ($(BUILD_VARIANT),nossl) + CONFIGURE_ARGS += \ + --with-tls=no +endif + +define Package/msmtp/install + $(INSTALL_DIR) $(1)/etc + $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/msmtprc-system.example \ + $(1)/etc/msmtprc + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/msmtp $(1)/usr/bin/ +endef + +define Package/msmtp-mta/install + $(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/lib + ln -sf ../bin/msmtp $(1)/usr/sbin/sendmail + ln -sf ../bin/msmtp $(1)/usr/lib/sendmail +endef + +Package/msmtp-nossl/conffiles = $(Package/msmtp/conffiles) +Package/msmtp-nossl/install = $(Package/msmtp/install) + +define Package/msmtp-queue/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/msmtpq/msmtp{q,-queue} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/msmtpqueue/msmtp-{en,list,run}queue.sh $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,msmtp)) +$(eval $(call BuildPackage,msmtp-nossl)) +$(eval $(call BuildPackage,msmtp-queue)) +$(eval $(call BuildPackage,msmtp-mta)) diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index 692a441e1..88da91542 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openmptcprouter-full -PKG_VERSION:=0.11 +PKG_VERSION:=0.12 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk @@ -36,8 +36,7 @@ MY_DEPENDS := \ luci-app-nginx-ha luci-app-omr-tracker \ luci-app-sqm sqm-scripts-extra \ luci-app-vnstat omr-quota luci-app-omr-quota \ - luci-app-mptcp luci-app-openmptcprouter luci-app-omr-bypass \ - luci-app-mail \ + luci-app-mptcp luci-app-openmptcprouter luci-app-omr-bypass luci-app-mail \ omr-6in4 ip6tables-mod-nat luci-proto-ipv6 6to4 6in4 6rd iputils-traceroute6 \ speedtestc \ iftop \ @@ -74,10 +73,6 @@ define Package/$(PKG_NAME)/description OpenMPTCProuter Full package endef -define Package/$(PKG_NAME)/conffiles -/etc/config/$(PKG_NAME) -endef - define Build/Compile endef