Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

msmtp-scripts: Overhaul and update like upstream

Browse source 
The project has been revived upstream and a user has convinced me
there is a valid use case for this package in openwrt, so remove
deprecation notice, adjust links to upstream (it's moved) and
update to latest version.  Sync behavior with that expected upstream.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
This commit is contained in:
Daniel F. Dickinson 2019-08-08 17:53:50 -04:00
parent 6d8cff9a6c
commit d163eaea52
4 changed files with 60 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
mail/msmtp-scripts/Makefile
View file

@ -9,12 +9,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=msmtp-scripts PKG_NAME:=msmtp-scripts
PKG_VERSION:=1.0.8 PKG_VERSION:=1.2.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/msmtp-scripts PKG_SOURCE_URL:=https://launchpad.net/$(PKG_NAME)/1.2/$(PKG_VERSION)/+download
PKG_HASH:=2aec48d47b02facf2a33cf97a7434e969c1a054224406e6c55320d825c7902b2 PKG_HASH:=fc85ab8ed1348be584adfc1feb89f51daed7404e9e8643652ff31d2af00f1cf5
PKG_MAINTAINER:=Daniel F. Dickinson <cshored@thecshore.com>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
@ -24,24 +25,20 @@ include $(INCLUDE_DIR)/package.mk
define Package/msmtp-scripts/Default define Package/msmtp-scripts/Default
SECTION:=mail SECTION:=mail
CATEGORY:=Mail CATEGORY:=Mail
TITLE:=DEPRECATED: Simple sendmail SMTP queueing and forwarding TITLE:=Forwarding only SMTP with queuing
URL:=http://msmtp-scripts.sourceforge.net/ URL:=https://msmtp-scripts.thecshore.com
endef endef
define Package/msmtp-scripts/Default/description define Package/msmtp-scripts/Default/description
DEPRECATED: SourceForge project is abandonded; and upstream (on GitHub)
has deprecated this project. See:
https://github.com/cshore-history/msmtp-scripts#deprecation-notice
msmtp-scripts are scripts wrappers around the msmtp SMTP client that msmtp-scripts are scripts wrappers around the msmtp SMTP client that
add queueing, logging to syslog or file, a subset of sendmail/postfix add queueing, logging to syslog or file, and a subset of sendmail/postfix
mailq/postsuper/postqueue commands implemented in a compatible fashion. mailq/postsuper/postqueue commands implemented in a compatible fashion.
endef endef
define Package/msmtpq-ng define Package/msmtpq-ng
$(call Package/msmtp-scripts/Default) $(call Package/msmtp-scripts/Default)
DEPENDS+= +msmtp DEPENDS+= +msmtp
TITLE+= (msmtpq-ng wrappers) TITLE+= (common)
endef endef
define Package/msmtpq-ng/conffiles define Package/msmtpq-ng/conffiles
@ -59,16 +56,15 @@ define Package/msmtpq-ng-mta
$(call Package/msmtp-scripts/Default) $(call Package/msmtp-scripts/Default)
TITLE+= (as MTA) TITLE+= (as MTA)
DEPENDS+=+msmtpq-ng DEPENDS+=+msmtpq-ng
USERID:=msmtp=482:msmtp=482
ALTERNATIVES:=\ ALTERNATIVES:=\
400:/usr/sbin/sendmail:/usr/bin/msmtpq-ng-mta \ 400:/usr/sbin/sendmail:/usr/sbin/msmtpq-ng-mta \
400:/usr/lib/sendmail:/usr/bin/msmtpq-ng-mta \ 400:/usr/lib/sendmail:/usr/sbin/msmtpq-ng-mta \
400:/usr/sbin/mailq:/usr/bin/msmtpq-ng-queue-mta \ 400:/usr/sbin/mailq:/usr/sbin/msmtpq-ng-queue-mta \
400:/usr/sbin/postqueue:/usr/bin/msmtpq-ng-queue-mta \ 400:/usr/sbin/postqueue:/usr/sbin/msmtpq-ng-queue-mta \
400:/usr/sbin/postsuper:/usr/sin/msmtpq-ng-queue-mta 400:/usr/sbin/postsuper:/usr/sbin/msmtpq-ng-queue-mta
endef endef
define Package/msmtp-queue-mta/conffiles define Package/msmtpq-ng-mta/conffiles
/etc/msmtpq-ng-mta.rc /etc/msmtpq-ng-mta.rc
endef endef
@ -83,7 +79,8 @@ endef
define Package/msmtpq-ng-mta-smtpd define Package/msmtpq-ng-mta-smtpd
$(call Package/msmtp-scripts/Default) $(call Package/msmtp-scripts/Default)
DEPENDS+= +msmtpq-ng-mta +xinetd DEPENDS+= +msmtpq-ng-mta +xinetd
TITLE+= (basic SMTP server) TITLE+= (localhost SMTPd)
USERID:=msmtp=482:msmtp=482
endef endef
define Package/msmtp-ng-mta-smtpd/description define Package/msmtp-ng-mta-smtpd/description
@ -97,13 +94,13 @@ define Package/msmtp-ng-mta-smtpd/description
the hold queue before it can be delivered. the hold queue before it can be delivered.
endef endef
define Package/msmtpq-ng-mta/postinst define Package/msmtpq-ng-mta-smtpd/conffiles
mkdir -p $${IPKG_INSTROOT}/etc/crontabs /etc/xinetd.d/ms-mta-smtpd
if ! grep -q msmtpq-ng-mta $${IPKG_INSTROOT}/etc/crontabs/root; then echo $$'\n'"*/60 * * * * /usr/bin/msmtpq-ng-mta -q" >>$${IPKG_INSTROOT}/etc/crontabs/root; fi
endef endef
define Package/msmtp-queue-mta/prerm define Package/msmtpq-ng-mta/postinst
if grep -q msmtpq-ng-mta $${IPKG_INSTROOT}/etc/crontabs/root; then grep -v '\*/60 \* \* \* \* /usr/bin/msmtpq-ng-mta -q' $${IPKG_INSTROOT}/etc/crontabs/root >$${IPKG_INSTROOT}/etc/crontabs/root.new; mv -f $${IPKG_INSTROOT}/etc/crontabs/root.new $${IPKG_INSTROOT}/etc/crontabs; fi mkdir -p $${IPKG_INSTROOT}/etc/crontabs
if ! grep -q msmtpq-ng-mta $${IPKG_INSTROOT}/etc/crontabs/root 2>/dev/null; then echo $$'\n'"*/60 * * * * /usr/bin/msmtpq-ng-mta -q" >>$${IPKG_INSTROOT}/etc/crontabs/root; fi
endef endef
define Build/Configure define Build/Configure
@ -116,26 +113,24 @@ endef
define Package/msmtpq-ng/install define Package/msmtpq-ng/install
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
$(INSTALL_CONF) ./files/msmtpq-ng.rc $(1)/etc/msmtpq-ng.rc $(INSTALL_DATA) ./files/msmtpq-ng.rc $(1)/etc/msmtpq-ng.rc
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_BUILD_DIR)/msmtpq-ng/msmtpq-ng $(1)/usr/bin/ $(CP) $(PKG_BUILD_DIR)/src/usr/bin/msmtpq-ng $(1)/usr/bin/
$(SED) 's/logger -i/logger/' $(1)/usr/bin/msmtpq-ng $(CP) $(PKG_BUILD_DIR)/src/usr/bin/msmtpq-ng-queue $(1)/usr/bin/
$(CP) $(PKG_BUILD_DIR)/msmtpq-ng/msmtpq-ng-queue $(1)/usr/bin/
endef endef
define Package/msmtpq-ng-mta/install define Package/msmtpq-ng-mta/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/sbin $(1)/usr/lib $(1)/etc/init.d $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/sbin $(1)/usr/lib $(1)/etc/init.d
$(INSTALL_CONF) $(PKG_BUILD_DIR)/msmtpq-ng-mta/msmtpq-ng-mta.rc $(1)/etc/ $(INSTALL_DATA) ./files/msmtpq-ng-mta.rc $(1)/etc/
echo 'MSMTP_LOCK_DIR=/var/lock/msmtp' >>$(1)/etc/msmtpq-ng-mta.rc $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/usr/sbin/msmtpq-ng-mta $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/msmtpq-ng-mta/msmtpq-ng-mta $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/usr/sbin//msmtpq-ng-queue-mta $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/msmtpq-ng-mta/msmtpq-ng-queue-mta $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/crontabs $(INSTALL_DIR) $(1)/etc/crontabs
$(INSTALL_BIN) ./files/msmtpq-ng-mta.init $(1)/etc/init.d/msmtpq-ng-mta $(INSTALL_BIN) ./files/msmtpq-ng-mta.init $(1)/etc/init.d/msmtpq-ng-mta
endef endef
define Package/msmtpq-ng-mta-smtpd/install define Package/msmtpq-ng-mta-smtpd/install
$(INSTALL_DIR) $(1)/etc/xinetd.d $(INSTALL_DIR) $(1)/etc/xinetd.d
$(INSTALL_BIN) $(PKG_BUILD_DIR)/msmtpq-ng-mta/sendmail-bs.xinetd $(1)/etc/xinetd.d/msmtpq-ng-mta-smtpd $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/etc/xinetd.d/ms-mta-smtpd $(1)/etc/xinetd.d/ms-mta-smtpd
endef endef

6
mail/msmtp-scripts/files/msmtpq-ng-mta.init
View file

@ -5,13 +5,11 @@ START=90
boot() { boot() {
[ ! -d /var/spool/msmtp ] && { [ ! -d /var/spool/msmtp ] && {
mkdir -m 0770 -p /var/spool/msmtp mkdir -m1777 -p /var/spool/msmtp
chown msmtp:msmtp /var/spool/msmtp
} }
[ ! -d /var/lock/msmtp ] && { [ ! -d /var/lock/msmtp ] && {
mkdir -m 0770 -p /var/lock/msmtp mkdir -m1777 -p /var/lock/msmtp
chown msmtp:msmtp /var/lock/msmtp
} }
} }

22
mail/msmtp-scripts/files/msmtpq-ng-mta.rc Normal file
View file

@ -0,0 +1,22 @@
#!/bin/sh
#Q=/var/spool/msmtp/"$(id -un)"
#LOG=syslog
#MAXLOGLEVEL=7
#MSMTP_LOCK_DIR=/var/lock/msmtp/"$(id -un)"
#MSMTP_UMASK=077
#MSMTP_LOG_UMASK=007
#MSMTP_QUEUE_QUIET=true
#MSMTP_IGNORE_NO_RECIPIENTS=true
#MSMTP_QUEUE_ONLY=false
#MSMTP_SEND_DELAY=0
#MSMTP_MAXIMUM_QUEUE_LIFETIME=345600 # Four days
#MSMTPQ_NG=msmtpq-ng
#MSMTPQ_NG_QUEUE=msmtpq-ng-queue
#MSMTP_CONF=/etc/msmtprc
#EMAIL_CONN_TEST=p
EMAIL_CONN_TEST_PING=openwrt.org
#EMAIL_CONN_TEST_IP=8.8.8.8
#EMAIL_CONN_TEST_SITE=www.debian.org
#MSMTP_HOLD_SMTP_MAIL=true
#MSMTP_HOLD_CLI_MAIL=false

11
mail/msmtp-scripts/files/msmtpq-ng.rc
View file

@ -1,14 +1,17 @@
#!/bin/sh
#Q=~/msmtp.queue #Q=~/msmtp.queue
#LOG=~/log/.msmtp.queue.log #LOG=~/log/.msmtp.queue.log
#MAXLOGLEVEL=7 #MAXLOGLEVEL=7
#MSMTP_LOCKDIR=/var/lock #MSMTP_LOCK_DIR=~/.msmtp.lock
EMAIL_CONN_TEST=p EMAIL_CONN_TEST=p
EMAIL_CONN_TEST_SITE=www.lede-project.org EMAIL_CONN_TEST_PING=openwrt.org
#EMAIL_CONN_TEST_IP=8.8.8.8 #EMAIL_CONN_TEST_IP=8.8.8.8
#EMAIL_CONN_TEST_SITE=www.debian.org
#MSMTP_UMASK=077 #MSMTP_UMASK=077
#MSMTP_LOG_UMASK=077 #MSMTP_LOG_UMASK=077
#MSMTP_QUEUE_QUIET=false #MSMTP_QUEUE_QUIET=false
#MSMTP_IGNORE_NO_RECIPIENTS=false #MSMTP_IGNORE_NO_RECIPIENTS=true
#MSMTP_QUEUE_ONLY=false #MSMTP_QUEUE_ONLY=false
#MSMTP_SEND_DELAY=0 #MSMTP_SEND_DELAY=0
#MSMTP_MAXIMUM_QUEUE_LIFETIME=345600 # Four days #MSMTP_MAXIMUM_QUEUE_LIFETIME=345600 # Four days
@ -16,3 +19,5 @@ EMAIL_CONN_TEST_SITE=www.lede-project.org
#MSMTPQ_NG_QUEUE=msmtpq-ng-queue #MSMTPQ_NG_QUEUE=msmtpq-ng-queue
#MSMTP_HOLD_SMTP_MAIL=true #MSMTP_HOLD_SMTP_MAIL=true
#MSMTP_HOLD_CLI_MAIL=false #MSMTP_HOLD_CLI_MAIL=false
#MSMTP_CONF=/etc/msmtprc
#LOCK_CMD=flock