From e83d0c0d8d117004addd8efc82f355abd512cea3 Mon Sep 17 00:00:00 2001
From: Paul Wassi
Date: Thu, 16 Nov 2017 10:00:26 +0100
Subject: [PATCH] mail/emailrelay: cosmetic fixes
This is just a cosmetic thing, therefore no increase of PKG_RELEASE.
- Trailing spaces and tabs
- Add newline to end of file
- Add License info to Makefile
- Move maintainer definition to PKG_MAINTAINER
Signed-off-by: Paul Wassi
---
mail/emailrelay/Makefile | 30 ++++++++++++++-------------
mail/emailrelay/files/emailrelay.auth | 2 +-
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/mail/emailrelay/Makefile b/mail/emailrelay/Makefile
index 592cb42e9..afe939ade 100644
--- a/mail/emailrelay/Makefile
+++ b/mail/emailrelay/Makefile
@@ -14,11 +14,14 @@ PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz
PKG_SOURCE_URL:=@SF/emailrelay/$(PKG_VERSION)
PKG_HASH:=869a3e2d053237d7f63784acc25e748af2dbf2d9b9c5c48e4a5269d4e4b5bda0
+PKG_MAINTAINER:=Federico Di Marco
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_CONFIG_DEPENDS:=CONFIG_EMAILRELAY_SUPPORT_VERBOSE_DBG CONFIG_EMAILRELAY_SSL
+PKG_CONFIG_DEPENDS:=CONFIG_EMAILRELAY_SUPPORT_VERBOSE_DBG CONFIG_EMAILRELAY_SSL
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=COPYING
#include $(INCLUDE_DIR)/uclibc++.mk # $(CXX_DEPENDS)
include $(INCLUDE_DIR)/package.mk
@@ -26,10 +29,9 @@ include $(INCLUDE_DIR)/package.mk
define Package/emailrelay
SECTION:=mail
CATEGORY:=Mail
- DEPENDS:=+EMAILRELAY_SSL:libopenssl +libstdcpp
+ DEPENDS:=+EMAILRELAY_SSL:libopenssl +libstdcpp
TITLE:=A simple SMTP proxy and MTA
URL:=http://emailrelay.sourceforge.net/
- MAINTAINER:=Federico Di Marco
MENU:=1
endef
@@ -42,7 +44,7 @@ config EMAILRELAY_SUPPORT_VERBOSE_DBG
help
Enables support for extended logging (must also be explicitely enabled by using command line switch --debug when starting emailrelay)
-config EMAILRELAY_SSL
+config EMAILRELAY_SSL
bool "Enable support for OpenSSL"
depends on PACKAGE_emailrelay
default y
@@ -54,14 +56,14 @@ endef
define Package/emailrelay/description
- Emailrelay is a simple SMTP proxy and store-and-forward message transfer agent (MTA).
-
- When running as a proxy all e-mail messages can be passed through
- a user-defined program, such as a spam filter, which can drop,
- re-address or edit messages as they pass through. When running
- as a store-and-forward MTA incoming messages are stored in a
- local spool directory, and then forwarded to the next SMTP
- server on request.
+ Emailrelay is a simple SMTP proxy and store-and-forward message transfer agent (MTA).
+
+ When running as a proxy all e-mail messages can be passed through
+ a user-defined program, such as a spam filter, which can drop,
+ re-address or edit messages as they pass through. When running
+ as a store-and-forward MTA incoming messages are stored in a
+ local spool directory, and then forwarded to the next SMTP
+ server on request.
endef
@@ -75,7 +77,7 @@ CONFIGURE_ARGS += \
--enable-testing=no
CONFIGURE_VARS += \
- CXXFLAGS="$$$$CXXFLAGS -fno-rtti"
+ CXXFLAGS="$$$$CXXFLAGS -fno-rtti"
ifeq ($(CONFIG_EMAILRELAY_SSL),y)
@@ -94,7 +96,7 @@ endif
ifeq ($(CONFIG_OPENSSL_WITH_SSL3),y)
CONFIGURE_VARS += \
- CXXFLAGS="$$$$CXXFLAGS -DSSL3_SUPPORT"
+ CXXFLAGS="$$$$CXXFLAGS -DSSL3_SUPPORT"
endif
define Package/emailrelay/install
diff --git a/mail/emailrelay/files/emailrelay.auth b/mail/emailrelay/files/emailrelay.auth
index 3d11bf0f2..8bc959459 100644
--- a/mail/emailrelay/files/emailrelay.auth
+++ b/mail/emailrelay/files/emailrelay.auth
@@ -13,4 +13,4 @@
#
#NONE server 192.168.1.* keyword
#LOGIN client smtpuser@smtpserver smtppassword
-#LOGIN server user1 secret
\ No newline at end of file
+#LOGIN server user1 secret