Merge pull request #14857 from neheb/em

emailrelay: update to 2.2

mail/emailrelay/Makefile

@@ -8,18 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=emailrelay
-PKG_VERSION:=2.1
-PKG_RELEASE:=1
+PKG_VERSION:=2.2
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=@SF/emailrelay/$(PKG_VERSION)
-PKG_HASH:=dcb1fc0cbb3d5407554685616e7ef691f30f733b4484979be0794c9d5f563762
+PKG_HASH:=41da9f4356eb6c6935a32f2940edb7af04b202e531c1028f700b93a36a03b0ac
 
 PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
 PKG_CONFIG_DEPENDS:=CONFIG_EMAILRELAY_SUPPORT_VERBOSE_DBG CONFIG_EMAILRELAY_SSL
+PKG_FORTIFY_SOURCE:=0 #GCC8 and 9 fix
 
 include $(INCLUDE_DIR)/package.mk
 

mail/emailrelay/patches/010-openssl-1.1.patch

@@ -1,38 +0,0 @@
---- a/src/gssl/gssl_openssl.cpp
-+++ b/src/gssl/gssl_openssl.cpp
-@@ -51,10 +51,12 @@ GSsl::OpenSSL::LibraryImp::LibraryImp( G
- 	m_verbose(verbose) ,
- 	m_config(library_config)
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	SSL_load_error_strings() ;
- 	SSL_library_init() ;
--	int rc = RAND_status() ; G_IGNORE_VARIABLE(int,rc) ;
- 	OpenSSL_add_all_digests() ;
-+#endif
-+	int rc = RAND_status() ; G_IGNORE_VARIABLE(int,rc) ;
- 
- 	// allocate a slot for a pointer from SSL to ProtocolImp
- 	m_index = SSL_get_ex_new_index( 0 , nullptr , nullptr , nullptr , nullptr ) ;
-@@ -72,15 +74,21 @@ GSsl::OpenSSL::LibraryImp::~LibraryImp()
- 
- void GSsl::OpenSSL::LibraryImp::cleanup()
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	// ffs...
- 	ERR_free_strings() ;
- 	RAND_cleanup() ;
- 	CRYPTO_cleanup_all_ex_data();
-+#endif
- }
- 
- std::string GSsl::OpenSSL::LibraryImp::sid()
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	return G::Str::printable( SSLeay_version(SSLEAY_VERSION) ) ;
-+#else
-+	return G::Str::printable( OpenSSL_version(OPENSSL_VERSION) ) ;
-+#endif
- }
- 
- std::string GSsl::OpenSSL::LibraryImp::id() const