cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

emailrelay: Update to 2.1

Browse Source 
Remove uClibc++ reference. This requires C++11 features not provided by
uClibc++.

Added size optimizations as this package is huge.

Cleaned up Makefile for consistency between packages.

Refreshed patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-10-19 14:05:02 -07:00
parent e210ba2b56
commit de4ed9178e
3 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/emailrelay/patches/010-openssl-1.1.patch
+5 -10
View File
@@ -1,24 +1,20 @@
diff --git a/src/gssl/gssl_openssl.cpp b/src/gssl/gssl_openssl.cpp
index 0e9b73b..49927db 100644
--- a/src/gssl/gssl_openssl.cpp
+++ b/src/gssl/gssl_openssl.cpp
@@ -52,10 +52,14 @@ GSsl::OpenSSL::LibraryImp::LibraryImp( G::StringArray & library_config , Library
@@ -51,10 +51,12 @@ GSsl::OpenSSL::LibraryImp::LibraryImp( G::StringArray & library_config , Library
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(rc) ;
- int rc = RAND_status() ; G_IGNORE_VARIABLE(int,rc) ;
OpenSSL_add_all_digests() ;
+#else
+ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL) ;
+#endif
+ int rc = RAND_status() ; G_IGNORE_VARIABLE(rc) ;
+ 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 ) ;
@@ -73,15 +77,21 @@ GSsl::OpenSSL::LibraryImp::~LibraryImp()
@@ -72,15 +74,21 @@ GSsl::OpenSSL::LibraryImp::~LibraryImp()
void GSsl::OpenSSL::LibraryImp::cleanup()
{
@@ -26,8 +22,7 @@ index 0e9b73b..49927db 100644
// ffs...
ERR_free_strings() ;
RAND_cleanup() ;
- CRYPTO_cleanup_all_ex_data();
+ CRYPTO_cleanup_all_ex_data() ;
CRYPTO_cleanup_all_ex_data();
+#endif
}
mail/emailrelay/patches/020-openssl-engine.patch
-10
View File
@@ -1,10 +0,0 @@
--- a/src/gssl/gssl_openssl.cpp
+++ b/src/gssl/gssl_openssl.cpp
@@ -32,7 +32,6 @@
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/rand.h>
-#include <openssl/engine.h>
#include <openssl/conf.h>
#include <openssl/evp.h>
#include <openssl/hmac.h>