From: Amul Shah <Amul.Shah@fisglobal.com>
Description: Backport upstream changes to the source sr_unix/Makefile.mk file
  The upstream V6.1-000 sources did not correctly the production enryption
  plugin libraries.

  Encryption plugin Makefile.mk needed some extra library paths to build on all platforms.

  Fix an undefined symbol problem when building a release encryption plugin.
Applied-Upstream: V6.2-000

--- a/sr_unix/Makefile.mk
+++ b/sr_unix/Makefile.mk
@@ -133,9 +133,11 @@
 # Common header and library paths
 IFLAGS += -I /usr/local/ssl/include -I /usr/local/include -I /usr/include -I $(gtm_dist) -I $(CURDIR)
 ifeq ($(BIT64),0)
-	LIBFLAGS += -L /usr/local/ssl/lib -L /usr/local/lib64 -L /usr/local/lib -L /usr/lib64 -L /usr/lib -L /lib64 -L /lib -L `pwd`
+	LIBFLAGS += -L /usr/local/ssl/lib -L /usr/lib/x86_64-linux-gnu -L /usr/local/lib64
+	LIBFLAGS += -L /usr/local/lib -L /usr/lib64 -L /usr/lib -L /lib64 -L /lib -L `pwd`
 else
-	LIBFLAGS += -L /usr/local/ssl/lib -L /usr/local/lib32 -L /usr/local/lib -L /usr/lib32 -L /usr/lib -L /lib32 -L /lib -L `pwd`
+	LIBFLAGS += -L /usr/local/ssl/lib -L /usr/lib/x86-linux-gnu -L /usr/local/lib32
+	LIBFLAGS += -L /usr/local/lib -L /usr/lib32 -L /usr/lib -L /lib32 -L /lib -L `pwd`
 endif
 
 CFLAGS += $(IFLAGS)
--- a/sr_unix/gtm_tls_impl.h
+++ b/sr_unix/gtm_tls_impl.h
@@ -48,7 +48,7 @@
 #define DBG_VERIFY_AUTORETRY_SET(TLS_DESC)	assert(SSL_MODE_AUTO_RETRY & SSL_CTX_get_mode((SSL_CTX *)TLS_DESC));
 
 #else
-#define DBG_VERIFY_SOCK_IS_NONBLOCKING(SOCKFD)
+#define DBG_VERIFY_SOCK_IS_BLOCKING(SOCKFD)
 #define DBG_VERIFY_AUTORETRY_SET(TLS_DESC)
 #endif
 
