[pkgsrc/trunk]: pkgsrc/devel/librelp devel/librelp: Update to 1....

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c2d09ee045f
branches:  trunk
changeset: 308103:0c2d09ee045f
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Wed May 16 11:33:14 2018 +0000

description:
devel/librelp: Update to 1.2.16.

- API changes
  - add new API: relpSrvSetOversizeMode()
  - add new API: relpSrvSetLstnAddr()
- support additional hashes for fingerprint mode
- bugfix: potential memory leak
- bugfix: memory leak on protocol error
- fixed a couple of minor issues

diffstat:

 devel/librelp/Makefile                |   7 +++--
 devel/librelp/distinfo                |  13 +++++-----
 devel/librelp/patches/patch-configure |  21 ++++++++++++-----
 devel/librelp/patches/patch-src_tcp.c |  42 -----------------------------------
 4 files changed, 25 insertions(+), 58 deletions(-)

diffs (143 lines):

diff -r a563c6ae6c6b -r 0c2d09ee045f devel/librelp/Makefile
--- a/devel/librelp/Makefile    Wed May 16 11:30:50 2018 +0000
+++ b/devel/librelp/Makefile    Wed May 16 11:33:14 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/04/17 22:29:31 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/16 11:33:14 fhajny Exp $
 
-DISTNAME=      librelp-1.2.15
-PKGREVISION=   1
+DISTNAME=      librelp-1.2.16
 CATEGORIES=    devel
 MASTER_SITES=  http://download.rsyslog.com/librelp/
 
@@ -22,5 +21,7 @@
 
 PKGCONFIG_OVERRIDE+=   relp.pc.in
 
+TEST_TARGET=   check
+
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a563c6ae6c6b -r 0c2d09ee045f devel/librelp/distinfo
--- a/devel/librelp/distinfo    Wed May 16 11:30:50 2018 +0000
+++ b/devel/librelp/distinfo    Wed May 16 11:33:14 2018 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.4 2018/03/23 12:24:32 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2018/05/16 11:33:14 fhajny Exp $
 
-SHA1 (librelp-1.2.15.tar.gz) = 648e773970f114ea78cbe21d94b264585a750d61
-RMD160 (librelp-1.2.15.tar.gz) = 14d7bcc135385f572bba88e0dd87ad57ba33e829
-SHA512 (librelp-1.2.15.tar.gz) = 9cf52c82c8e61f6970a83ead60da4bc64ab56a2bda42fedf184a1ae60c28f66d565a0c3a8720b55b9a2e5e3ffb7ec35601158f634c8f2965f8c0d3b4f1c15568
-Size (librelp-1.2.15.tar.gz) = 440273 bytes
-SHA1 (patch-configure) = 9c90263bddaa91d8b6adcc70591169ac6f7d78d4
+SHA1 (librelp-1.2.16.tar.gz) = 40934dba5ad2cc1184ee0a60acaf2da70dca54f4
+RMD160 (librelp-1.2.16.tar.gz) = ba79e0ce34789e85d5a7f602d9c0209ea3a3ad4a
+SHA512 (librelp-1.2.16.tar.gz) = 54c101281c94046e4f8d6f77e73ab52874408e62c77f3dfa29ec0b294f39c216637674cc0bf1b7e04173557b3f21bfa74b7be1aafa3ff2771acd41d1d067d3a3
+Size (librelp-1.2.16.tar.gz) = 474456 bytes
+SHA1 (patch-configure) = 4c48a61df9445534f341eb3050d9fcbdd01303c2
 SHA1 (patch-src_Makefile.in) = f59ca692ac59af2f96638ac3eb5597610c1e0a97
-SHA1 (patch-src_tcp.c) = b8670856a958b92520162c5f86eeebad34a5c095
diff -r a563c6ae6c6b -r 0c2d09ee045f devel/librelp/patches/patch-configure
--- a/devel/librelp/patches/patch-configure     Wed May 16 11:30:50 2018 +0000
+++ b/devel/librelp/patches/patch-configure     Wed May 16 11:33:14 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2018/03/23 12:24:32 fhajny Exp $
+$NetBSD: patch-configure,v 1.2 2018/05/16 11:33:14 fhajny Exp $
 
 Portability.
 
---- configure.orig     2018-03-21 08:43:29.000000000 +0000
+--- configure.orig     2018-05-14 08:49:08.000000000 +0000
 +++ configure
-@@ -3234,7 +3234,7 @@ $as_echo "#define OS_AIX 1" >>confdefs.h
+@@ -3247,7 +3247,7 @@ $as_echo "#define OS_AIX 1" >>confdefs.h
      LDFLAGS="$LDFLAGS -brtl"
    ;;
  esac
@@ -13,7 +13,7 @@
    OS_APPLE_TRUE=
    OS_APPLE_FALSE='#'
  else
-@@ -3242,7 +3242,7 @@ else
+@@ -3255,7 +3255,7 @@ else
    OS_APPLE_FALSE=
  fi
  
@@ -22,7 +22,7 @@
    xOS_LINUX_TRUE=
    xOS_LINUX_FALSE='#'
  else
-@@ -3250,7 +3250,7 @@ else
+@@ -3263,7 +3263,7 @@ else
    xOS_LINUX_FALSE=
  fi
  
@@ -31,7 +31,7 @@
    OS_LINUX_TRUE=
    OS_LINUX_FALSE='#'
  else
-@@ -3258,7 +3258,7 @@ else
+@@ -3271,7 +3271,7 @@ else
    OS_LINUX_FALSE=
  fi
  
@@ -40,3 +40,12 @@
    OS_SOLARIS_TRUE=
    OS_SOLARIS_FALSE='#'
  else
+@@ -14691,7 +14691,7 @@ fi
+ 
+ 
+ fi
+- if test "$enable_valgrind" == "yes"; then
++ if test "$enable_valgrind" = "yes"; then
+   HAVE_VALGRIND_TRUE=
+   HAVE_VALGRIND_FALSE='#'
+ else
diff -r a563c6ae6c6b -r 0c2d09ee045f devel/librelp/patches/patch-src_tcp.c
--- a/devel/librelp/patches/patch-src_tcp.c     Wed May 16 11:30:50 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-$NetBSD: patch-src_tcp.c,v 1.2 2018/03/23 12:24:32 fhajny Exp $
-
-Improve portability, fix build on SunOS and BSD.
-
---- src/tcp.c.orig     2018-03-21 08:40:38.000000000 +0000
-+++ src/tcp.c
-@@ -668,7 +668,7 @@ EnableKeepAlive(const relpTcp_t *__restr
-       if(pSrv->iKeepAliveProbes > 0) {
-               optval = pSrv->iKeepAliveProbes;
-               optlen = sizeof(optval);
--              ret = setsockopt(sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen);
-+              ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen);
-       } else {
-               ret = 0;
-       }
-@@ -684,7 +684,7 @@ EnableKeepAlive(const relpTcp_t *__restr
-       if(pSrv->iKeepAliveTime > 0) {
-               optval = pSrv->iKeepAliveTime;
-               optlen = sizeof(optval);
--              ret = setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen);
-+              ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen);
-       } else {
-               ret = 0;
-       }
-@@ -700,7 +700,7 @@ EnableKeepAlive(const relpTcp_t *__restr
-       if(pSrv->iKeepAliveIntvl > 0) {
-               optval = pSrv->iKeepAliveIntvl;
-               optlen = sizeof(optval);
--              ret = setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen);
-+              ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen);
-       } else {
-               ret = 0;
-       }
-@@ -1592,7 +1592,7 @@ static inline void
- setCORKopt(int sock, const int onOff)
- {
- #if defined(TCP_CORK)
--      setsockopt(sock, SOL_TCP, TCP_CORK, &onOff, sizeof (onOff));
-+      setsockopt(sock, IPPROTO_TCP, TCP_CORK, &onOff, sizeof (onOff));
- #elif defined(TCP_NOPUSH)
-       setsockopt(sock, IPPROTO_TCP, TCP_NOPUSH, &onOff, sizeof (onOff));
- #endif