From 37738084126df66a1e86915cff4e20d59f275a28 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 24 Jan 2006 12:35:08 +0000 Subject: [PATCH] - updated for 4.14 Changed files: stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch -> 1.7 stunnel-libwrap_srv_name_log.patch -> 1.3 --- ...thostbyname_is_in_libc_aka_no_libnsl.patch | 23 +++++++++++-------- stunnel-libwrap_srv_name_log.patch | 13 +++++------ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch b/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch index fa5dbe8..dd655f9 100644 --- a/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch +++ b/stunnel-gethostbyname_is_in_libc_aka_no_libnsl.patch @@ -1,12 +1,15 @@ -diff -ur stunnel-4.12/configure.ac stunnel-4.12.new/configure.ac ---- stunnel-4.12/configure.ac 2005-09-29 19:56:55.000000000 +0000 -+++ stunnel-4.12.new/configure.ac 2005-09-30 07:20:00.968968264 +0000 -@@ -42,7 +42,7 @@ +--- stunnel-4.14/configure.ac.orig 2006-01-24 13:27:15.000000000 +0100 ++++ stunnel-4.14/configure.ac 2006-01-24 13:28:56.000000000 +0100 +@@ -41,9 +41,9 @@ + + AC_MSG_NOTICE([**************************************** libraries]) # Checks for standard libraries - #AC_CHECK_LIB(dl, dlopen) - #AC_CHECK_LIB(dld, shl_load) -AC_CHECK_LIB(nsl, gethostbyname) -+AC_CHECK_FUNC(gethostbyname, [], AC_CHECK_LIB(nsl, gethostbyname)) - AC_CHECK_LIB(socket, socket) - AC_CHECK_LIB(util, openpty) - AC_CHECK_LIB(z, inflateEnd) +-AC_CHECK_LIB(socket, socket) +-AC_CHECK_LIB(util, openpty) ++AC_SEARCH_LIBS(gethostbyname, nsl) ++AC_SEARCH_LIBS(socket, socket) ++AC_SEARCH_LIBS(openpty, util) + # Checks for dynamic loader and zlib needed by OpenSSL + AC_CHECK_LIB(dl, dlopen) + AC_CHECK_LIB(dld, shl_load) diff --git a/stunnel-libwrap_srv_name_log.patch b/stunnel-libwrap_srv_name_log.patch index 247b1db..3a915d6 100644 --- a/stunnel-libwrap_srv_name_log.patch +++ b/stunnel-libwrap_srv_name_log.patch @@ -1,14 +1,13 @@ -diff -burN stunnel-4.06.orig/src/client.c stunnel-4.06/src/client.c ---- stunnel-4.06.orig/src/client.c 2004-12-26 18:33:15.114067672 +0100 -+++ stunnel-4.06/src/client.c 2004-12-26 19:11:56.030234784 +0100 -@@ -705,8 +705,8 @@ - leave_critical_section(CRIT_INET); +--- stunnel-4.14/src/client.c.orig 2005-10-24 20:00:56.000000000 +0200 ++++ stunnel-4.14/src/client.c 2006-01-24 13:31:39.000000000 +0100 +@@ -735,8 +735,8 @@ + } - if (!result) { + if(!result) { - s_log(LOG_WARNING, "Connection from %s REFUSED by libwrap", - c->accepting_address); + s_log(LOG_WARNING, "Connection to service %s from %s REFUSED by libwrap", + c->opt->servname, c->accepting_address); - s_log(LOG_DEBUG, "See hosts_access(5) for details"); + s_log(LOG_DEBUG, "See hosts_access(5) manual for details"); return -1; /* FAILED */ } -- 2.44.0