Merge branch 'dev'

ChangeLog

@@ -1,3 +1,8 @@
+v1.5.4 - 07/05/17
+    Fixed a termination issue while debug logging.
+    Updated configure scripts to use SSL_CTX_new instead of SSL_library_init to support OpenSSL 1.1
+    Added a systemd script.
+
 v1.5.3 - 03/15/17
     Lowered sleep duration in our main loop to increase throughput.
     Better Debian script setup and build instruction fixes.  Thanks Lionel!

configure

@@ -3701,9 +3701,9 @@ fi
 
 
 if test "x$with_ssl" != xno; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5
+$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
+if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -3717,27 +3717,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char SSL_CTX_new ();
 int
 main ()
 {
-return SSL_library_init ();
+return SSL_CTX_new ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ssl_SSL_library_init=yes
+  ac_cv_lib_ssl_SSL_CTX_new=yes
 else
-  ac_cv_lib_ssl_SSL_library_init=no
+  ac_cv_lib_ssl_SSL_CTX_new=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSSL 1
 _ACEOF

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT(ser2sock, 1.4.4, [email protected])
+AC_INIT(ser2sock, 1.5.4, [email protected])
 AC_CONFIG_SRCDIR([ser2sock.c])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
@@ -14,7 +14,7 @@ AC_PROG_CC
 AC_ARG_WITH([ssl], [AS_HELP_STRING([--without-ssl], [disable support for OpenSSL])], [], [with_ssl=yes])
 
 AS_IF([test "x$with_ssl" != xno],
-		[AC_CHECK_LIB([ssl], [SSL_library_init], [], [AC_MSG_FAILURE([ssl test failed (--without-ssl to disable)])])])
+		[AC_CHECK_LIB([ssl], [SSL_CTX_new], [], [AC_MSG_FAILURE([ssl test failed (--without-ssl to disable)])])])
 
 AS_IF([test "x$with_ssl" != xno],
 		[AC_CHECK_LIB([crypto], [BIO_pop], [], [AC_MSG_FAILURE([ssl test failed (--without-ssl to disable)])])])

init/systemd/ser2sock.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Proxy that allows tcp connections to serial ports
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/local/bin/ser2sock -d
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target