mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-12 10:31:51 +00:00
Code Issues Releases Wiki Activity

Update msmtp

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-03-18 15:49:32 +01:00
parent c7559aea4d
commit 8cfcc6888b
1 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
msmtp/Makefile
View file

@ -1,6 +1,7 @@
# #
# Copyright (C) 2009 David Cooper <dave@kupesoft.com> # Copyright (C) 2009 David Cooper <dave@kupesoft.com>
# Copyright (C) 2009-2016 OpenWrt.org # Copyright (C) 2009-2016 OpenWrt.org
# Copyright (C) 2021 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,21 +10,20 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=msmtp PKG_NAME:=msmtp
PKG_VERSION:=1.6.8 PKG_VERSION:=1.8.14
PKG_RELEASE:=2 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://marlam.de/msmtp/releases PKG_SOURCE_URL:=https://marlam.de/msmtp/releases
PKG_HASH:=55ff95a304d888b56d07d9c62327ab9bfe26532c9c2a2ed6aefc43bea1b659fb PKG_HASH:=d56f065d711486e9c234618515a02a48a48dab4051b34f3e108fbecb6fb773b4
PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org> PKG_CPE_ID:=cpe:/a:marlam:msmtp
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
@ -33,7 +33,7 @@ define Package/msmtp/Default
CATEGORY:=Mail CATEGORY:=Mail
DEPENDS:=$(INTL_DEPENDS) DEPENDS:=$(INTL_DEPENDS)
TITLE:=Simple sendmail SMTP forwarding TITLE:=Simple sendmail SMTP forwarding
URL:=http://msmtp.sourceforge.net/ URL:=https://marlam.de/msmtp
endef endef
define Package/msmtp/Default/description define Package/msmtp/Default/description
@ -46,9 +46,10 @@ endef
define Package/msmtp define Package/msmtp
$(call Package/msmtp/Default) $(call Package/msmtp/Default)
DEPENDS+= +libopenssl +ca-bundle DEPENDS+= +libgnutls +ca-bundle
TITLE+= (with SSL support) TITLE+= (with SSL support)
VARIANT:=ssl VARIANT:=ssl
DEFAULT_VARIANT:=1
endef endef
define Package/msmtp/conffiles define Package/msmtp/conffiles
@ -64,6 +65,7 @@ define Package/msmtp-nossl
$(call Package/msmtp/Default) $(call Package/msmtp/Default)
TITLE+= (without SSL support) TITLE+= (without SSL support)
VARIANT:=nossl VARIANT:=nossl
PROVIDES:=msmtp
endef endef
define Package/msmtp-nossl/description define Package/msmtp-nossl/description
@ -75,7 +77,9 @@ define Package/msmtp-mta
$(call Package/msmtp/Default) $(call Package/msmtp/Default)
TITLE+= (as MTA) TITLE+= (as MTA)
DEPENDS+=+msmtp DEPENDS+=+msmtp
# DEPENDS+=@(PACKAGE_msmtp||PACKAGE_msmtp-nossl) ALTERNATIVES:=\
100:/usr/sbin/sendmail:/usr/bin/msmtp \
100:/usr/lib/sendmail:/usr/bin/msmtp
endef endef
define Package/msmtp-mta/description define Package/msmtp-mta/description
@ -86,7 +90,7 @@ endef
define Package/msmtp-queue define Package/msmtp-queue
$(call Package/msmtp/Default) $(call Package/msmtp/Default)
DEPENDS+= +bash @(PACKAGE_msmtp||PACKAGE_msmtp-nossl) DEPENDS+= +bash +msmtp
TITLE+= (queue scripts) TITLE+= (queue scripts)
endef endef
@ -102,21 +106,12 @@ CONFIGURE_ARGS += \
--without-libidn \ --without-libidn \
--without-libsecret \ --without-libsecret \
--without-macosx-keyring \ --without-macosx-keyring \
--without-msmtpd
ifneq ($(CONFIG_USE_UCLIBC),)
CONFIGURE_ARGS += --disable-gai-idn
endif
MAKE_FLAGS :=
ifeq ($(BUILD_VARIANT),ssl) ifeq ($(BUILD_VARIANT),ssl)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += --with-tls=openssl
--with-tls=openssl else
endif CONFIGURE_ARGS += --without-tls
ifeq ($(BUILD_VARIANT),nossl)
CONFIGURE_ARGS += \
--with-tls=no
endif endif
define Package/msmtp/install define Package/msmtp/install
@ -129,8 +124,6 @@ endef
define Package/msmtp-mta/install define Package/msmtp-mta/install
$(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/lib $(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 endef
Package/msmtp-nossl/conffiles = $(Package/msmtp/conffiles) Package/msmtp-nossl/conffiles = $(Package/msmtp/conffiles)