Fri Mar 23 12:24:32 2018 UTC ()
devel/librelp: Update to 1.2.16.

Version 1.2.15 - 2018-03-21
- made build on Solaris again
- made build on AIX
- bugfix: invalid handling of snprintf() return code
- bugfix: invalid assert predicate
- some code cleanup
- bugfix: error message on open error was truncated


(fhajny)
diff -r1.3 -r1.4 pkgsrc/devel/librelp/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/librelp/distinfo
diff -r0 -r1.1 pkgsrc/devel/librelp/patches/patch-configure
diff -r0 -r1.1 pkgsrc/devel/librelp/patches/patch-src_Makefile.in
diff -r1.1 -r1.2 pkgsrc/devel/librelp/patches/patch-src_tcp.c
cvs diff -r1.3 -r1.4 pkgsrc/devel/librelp/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/librelp/Makefile 2017/07/04 13:19:23 1.3
+++ pkgsrc/devel/librelp/Makefile 2018/03/23 12:24:32 1.4
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: Makefile,v 1.3 2017/07/04 13:19:23 fhajny Exp $ 1# $NetBSD: Makefile,v 1.4 2018/03/23 12:24:32 fhajny Exp $
2 2
3DISTNAME= librelp-1.2.14 3DISTNAME= librelp-1.2.15
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= http://download.rsyslog.com/librelp/ 5MASTER_SITES= http://download.rsyslog.com/librelp/
6 6
7MAINTAINER= filip@joyent.com 7MAINTAINER= filip@joyent.com
8HOMEPAGE= http://www.librelp.com/ 8HOMEPAGE= http://www.librelp.com/
9COMMENT= Reliable Event Logging Protocol core library 9COMMENT= Reliable Event Logging Protocol core library
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
15 15
16CONFIGURE_ARGS.SunOS+= ac_cv_func_epoll_create1=no 16CONFIGURE_ARGS.SunOS+= ac_cv_func_epoll_create1=no
17CONFIGURE_ARGS.SunOS+= ac_cv_func_epoll_create=no 17CONFIGURE_ARGS.SunOS+= ac_cv_func_epoll_create=no
18CONFIGURE_ARGS.SunOS+= ac_cv_header_sys_epoll_h=no 18CONFIGURE_ARGS.SunOS+= ac_cv_header_sys_epoll_h=no
 19# Needed for obsolete NI_MAXHOST
 20CPPFLAGS.SunOS+= -D__EXTENSIONS__
19 21
20PKGCONFIG_OVERRIDE+= relp.pc.in 22PKGCONFIG_OVERRIDE+= relp.pc.in
21 23
22.include "../../security/gnutls/buildlink3.mk" 24.include "../../security/gnutls/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/librelp/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/librelp/distinfo 2017/07/04 13:19:23 1.3
+++ pkgsrc/devel/librelp/distinfo 2018/03/23 12:24:32 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: distinfo,v 1.3 2017/07/04 13:19:23 fhajny Exp $ 1$NetBSD: distinfo,v 1.4 2018/03/23 12:24:32 fhajny Exp $
2 2
3SHA1 (librelp-1.2.14.tar.gz) = 13cb590d0cb36b415534339a1855e91cc771edc7 3SHA1 (librelp-1.2.15.tar.gz) = 648e773970f114ea78cbe21d94b264585a750d61
4RMD160 (librelp-1.2.14.tar.gz) = c76b261a6365b6bf1bb2a7113fb556353f7a22fc 4RMD160 (librelp-1.2.15.tar.gz) = 14d7bcc135385f572bba88e0dd87ad57ba33e829
5SHA512 (librelp-1.2.14.tar.gz) = b9a947edb7f23ba533f358d3271a61e80fcca7db8be0c20b39ec61ce4d913efed25173330a0604faebfbbdf33a051ed43234b2b41be2480dc3459c35b91acaae 5SHA512 (librelp-1.2.15.tar.gz) = 9cf52c82c8e61f6970a83ead60da4bc64ab56a2bda42fedf184a1ae60c28f66d565a0c3a8720b55b9a2e5e3ffb7ec35601158f634c8f2965f8c0d3b4f1c15568
6Size (librelp-1.2.14.tar.gz) = 437975 bytes 6Size (librelp-1.2.15.tar.gz) = 440273 bytes
7SHA1 (patch-src_tcp.c) = 088973b11f649f6815ccf9c734f89763d520c25b 7SHA1 (patch-configure) = 9c90263bddaa91d8b6adcc70591169ac6f7d78d4
 8SHA1 (patch-src_Makefile.in) = f59ca692ac59af2f96638ac3eb5597610c1e0a97
 9SHA1 (patch-src_tcp.c) = b8670856a958b92520162c5f86eeebad34a5c095
File Added: pkgsrc/devel/librelp/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2018/03/23 12:24:32 fhajny Exp $

Portability.

--- configure.orig	2018-03-21 08:43:29.000000000 +0000
+++ configure
@@ -3234,7 +3234,7 @@ $as_echo "#define OS_AIX 1" >>confdefs.h
     LDFLAGS="$LDFLAGS -brtl"
   ;;
 esac
- if test x$os_type == xapple; then
+ if test x$os_type = xapple; then
   OS_APPLE_TRUE=
   OS_APPLE_FALSE='#'
 else
@@ -3242,7 +3242,7 @@ else
   OS_APPLE_FALSE=
 fi
 
- if test x$os_type == xlinux; then
+ if test x$os_type = xlinux; then
   xOS_LINUX_TRUE=
   xOS_LINUX_FALSE='#'
 else
@@ -3250,7 +3250,7 @@ else
   xOS_LINUX_FALSE=
 fi
 
- if test x$os_type == xlinux; then
+ if test x$os_type = xlinux; then
   OS_LINUX_TRUE=
   OS_LINUX_FALSE='#'
 else
@@ -3258,7 +3258,7 @@ else
   OS_LINUX_FALSE=
 fi
 
- if test x$os_type == xsolaris; then
+ if test x$os_type = xsolaris; then
   OS_SOLARIS_TRUE=
   OS_SOLARIS_FALSE='#'
 else
File Added: pkgsrc/devel/librelp/patches/patch-src_Makefile.in
$NetBSD: patch-src_Makefile.in,v 1.1 2018/03/23 12:24:32 fhajny Exp $

Fix M4 syntax error.

--- src/Makefile.in.orig	2018-03-21 08:43:29.000000000 +0000
+++ src/Makefile.in
@@ -821,7 +821,6 @@ uninstall-am: uninstall-includeHEADERS u
 
 .PRECIOUS: Makefile
 
-@OS_SOLARIS_TRUE@then
 @OS_SOLARIS_TRUE@	PTHREADS_CFLAGS = -pthread
 @OS_AIX_TRUE@@OS_SOLARIS_FALSE@	PTHREADS_CFLAGS = -qthreaded
 @OS_AIX_FALSE@@OS_SOLARIS_FALSE@	PTHREADS_CFLAGS = -mt
cvs diff -r1.1 -r1.2 pkgsrc/devel/librelp/patches/Attic/patch-src_tcp.c (expand / switch to unified diff)

--- pkgsrc/devel/librelp/patches/Attic/patch-src_tcp.c 2017/02/13 18:33:24 1.1
+++ pkgsrc/devel/librelp/patches/Attic/patch-src_tcp.c 2018/03/23 12:24:32 1.2
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1$NetBSD: patch-src_tcp.c,v 1.1 2017/02/13 18:33:24 fhajny Exp $ 1$NetBSD: patch-src_tcp.c,v 1.2 2018/03/23 12:24:32 fhajny Exp $
2 2
3Improve portability, fix build on SunOS and BSD. 3Improve portability, fix build on SunOS and BSD.
4 4
5--- src/tcp.c.orig 2016-07-07 11:24:53.000000000 +0000 5--- src/tcp.c.orig 2018-03-21 08:40:38.000000000 +0000
6+++ src/tcp.c 6+++ src/tcp.c
7@@ -653,7 +653,7 @@ EnableKeepAlive(const relpTcp_t *__restr 7@@ -668,7 +668,7 @@ EnableKeepAlive(const relpTcp_t *__restr
8 if(pSrv->iKeepAliveProbes > 0) { 8 if(pSrv->iKeepAliveProbes > 0) {
9 optval = pSrv->iKeepAliveProbes; 9 optval = pSrv->iKeepAliveProbes;
10 optlen = sizeof(optval); 10 optlen = sizeof(optval);
11- ret = setsockopt(sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen); 11- ret = setsockopt(sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen);
12+ ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen); 12+ ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen);
13 } else { 13 } else {
14 ret = 0; 14 ret = 0;
15 } 15 }
16@@ -669,7 +669,7 @@ EnableKeepAlive(const relpTcp_t *__restr 16@@ -684,7 +684,7 @@ EnableKeepAlive(const relpTcp_t *__restr
17 if(pSrv->iKeepAliveTime > 0) { 17 if(pSrv->iKeepAliveTime > 0) {
18 optval = pSrv->iKeepAliveTime; 18 optval = pSrv->iKeepAliveTime;
19 optlen = sizeof(optval); 19 optlen = sizeof(optval);
20- ret = setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen); 20- ret = setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen);
21+ ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen); 21+ ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen);
22 } else { 22 } else {
23 ret = 0; 23 ret = 0;
24 } 24 }
25@@ -685,7 +685,7 @@ EnableKeepAlive(const relpTcp_t *__restr 25@@ -700,7 +700,7 @@ EnableKeepAlive(const relpTcp_t *__restr
26 if(pSrv->iKeepAliveIntvl > 0) { 26 if(pSrv->iKeepAliveIntvl > 0) {
27 optval = pSrv->iKeepAliveIntvl; 27 optval = pSrv->iKeepAliveIntvl;
28 optlen = sizeof(optval); 28 optlen = sizeof(optval);
29- ret = setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen); 29- ret = setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen);
30+ ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen); 30+ ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen);
31 } else { 31 } else {
32 ret = 0; 32 ret = 0;
33 } 33 }
34@@ -1548,7 +1548,7 @@ static inline void 34@@ -1592,7 +1592,7 @@ static inline void
35 setCORKopt(int sock, int onOff) 35 setCORKopt(int sock, const int onOff)
36 { 36 {
37 #if defined(TCP_CORK) 37 #if defined(TCP_CORK)
38- setsockopt(sock, SOL_TCP, TCP_CORK, &onOff, sizeof (onOff)); 38- setsockopt(sock, SOL_TCP, TCP_CORK, &onOff, sizeof (onOff));
39+ setsockopt(sock, IPPROTO_TCP, TCP_CORK, &onOff, sizeof (onOff)); 39+ setsockopt(sock, IPPROTO_TCP, TCP_CORK, &onOff, sizeof (onOff));
40 #elif defined(TCP_NOPUSH) 40 #elif defined(TCP_NOPUSH)
41 setsockopt(sock, IPPROTO_TCP, TCP_NOPUSH, &onOff, sizeof (onOff)); 41 setsockopt(sock, IPPROTO_TCP, TCP_NOPUSH, &onOff, sizeof (onOff));
42 #endif 42 #endif