net/linknx/patches/010-iconv.patch

   1 From 8c025865f7cc57761d2227b897ba3980090391c2 Mon Sep 17 00:00:00 2001
   2 From: Rosen Penev <rosenp@gmail.com>
   3 Date: Mon, 24 Jun 2019 14:13:34 -0700
   4 Subject: [PATCH] Use AM_ICONV for properly supporting libiconv
   5
   6 AM_ICONV does multiple things like checking the function parameters to
   7 avoid const problems.
   8 ---
   9  configure.ac             | 1 +
  10  src/Makefile.am          | 2 +-
  11  src/objectcontroller.cpp | 2 +-
  12  3 files changed, 3 insertions(+), 2 deletions(-)
  13
  14 diff --git a/configure.ac b/configure.ac
  15 index 22f242c..23582cb 100644
  16 --- a/configure.ac
  17 +++ b/configure.ac
  18 @@ -10,6 +10,7 @@ PKG_CONFIG=`which pkg-config`
  19  AC_PROG_CXX
  20  AC_PROG_CC
  21  AC_PROG_RANLIB
  22 +AM_ICONV
  23  AC_CHECK_PTHSEM(2.0.4,yes,yes,no)
  24  AC_CHECK_HEADER(argp.h,,[AC_MSG_ERROR([argp_parse not found])])
  25  AC_SEARCH_LIBS(argp_parse,argp,,[AC_MSG_ERROR([argp_parse not found])])
  26 diff --git a/src/Makefile.am b/src/Makefile.am
  27 index 6a4f493..6e0dc03 100644
  28 --- a/src/Makefile.am
  29 +++ b/src/Makefile.am
  30 @@ -7,5 +7,5 @@ B64_CFLAGS=
  31  B64_LIBS=
  32  endif
  33  AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LOG4CPP_CFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS)
  34 -linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm
  35 +linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(LIBICONV) $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm
  36  linknx_SOURCES=linknx.cpp logger.cpp ruleserver.cpp objectcontroller.cpp eibclient.c threads.cpp timermanager.cpp  persistentstorage.cpp xmlserver.cpp smsgateway.cpp emailgateway.cpp knxconnection.cpp services.cpp suncalc.cpp  luacondition.cpp ioport.cpp ruleserver.h objectcontroller.h threads.h timermanager.h persistentstorage.h xmlserver.h smsgateway.h emailgateway.h knxconnection.h services.h suncalc.h luacondition.h ioport.h logger.h
  37 diff --git a/src/objectcontroller.cpp b/src/objectcontroller.cpp
  38 index fb2fc3a..7622491 100644
  39 --- a/src/objectcontroller.cpp
  40 +++ b/src/objectcontroller.cpp
  41 @@ -2925,7 +2925,7 @@ std::string StringObjectValue::transcode(const std::string &source, const std::s
  42         iconv_t conversionDescriptor = iconv_open((targetEncoding + "//TRANSLIT").c_str(), sourceEncoding.c_str());
  43         char cSource[source.size()];
  44         memcpy(cSource, source.c_str(), source.size() + 1);
  45 -       char *sourceStart = &cSource[0];
  46 +       ICONV_CONST char *sourceStart = &cSource[0];
  47         size_t sourceLength = source.size();
  48         const size_t targetLength = source.size() * 5; // Should be pretty enough even in worst cases.
  49         char targetChars[targetLength];
  50