svn commit: r376993 - in head/sysutils: rsyslog7-devel rsyslog8 rsyslog8-devel rsyslog8/files
Brad Davis
brd at FreeBSD.org
Wed Jan 14 03:06:51 UTC 2015
Author: brd (doc committer)
Date: Wed Jan 14 03:06:48 2015
New Revision: 376993
URL: https://svnweb.freebsd.org/changeset/ports/376993
QAT: https://qat.redports.org/buildarchive/r376993/
Log:
- Upgrade sysutils/rsyslog8 to 8.7.0. [1]
- Deprecate sysutils/rsyslog7-devel and sysutils/rsyslog8-devel [2]
1: http://www.rsyslog.com/changelog-for-8-7-0-v8-stable/
2: http://www.rsyslog.com/rsyslog-devel-packages-are-being-removed-soon/
Approved by: zi
Added:
head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c (contents, props changed)
Deleted:
head/sysutils/rsyslog8/files/patch-tools_rsyslogd.c
Modified:
head/sysutils/rsyslog7-devel/Makefile
head/sysutils/rsyslog8-devel/Makefile
head/sysutils/rsyslog8/Makefile
head/sysutils/rsyslog8/distinfo
Modified: head/sysutils/rsyslog7-devel/Makefile
==============================================================================
--- head/sysutils/rsyslog7-devel/Makefile Wed Jan 14 02:53:53 2015 (r376992)
+++ head/sysutils/rsyslog7-devel/Makefile Wed Jan 14 03:06:48 2015 (r376993)
@@ -9,6 +9,9 @@ MASTER_SITES= http://www.rsyslog.com/fil
MAINTAINER= brd at FreeBSD.org
COMMENT= Syslogd supporting SQL, TCP, and TLS
+DEPRECATED= EoL, use sysutils/rsyslog8
+EXPIRATION_DATE= 2015-02-13
+
BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt
LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \
Modified: head/sysutils/rsyslog8-devel/Makefile
==============================================================================
--- head/sysutils/rsyslog8-devel/Makefile Wed Jan 14 02:53:53 2015 (r376992)
+++ head/sysutils/rsyslog8-devel/Makefile Wed Jan 14 03:06:48 2015 (r376993)
@@ -9,6 +9,9 @@ MASTER_SITES= http://www.rsyslog.com/fil
MAINTAINER= brd at FreeBSD.org
COMMENT= Syslogd supporting SQL, TCP, and TLS
+DEPRECATED= EoL, use sysutils/rsyslog8
+EXPIRATION_DATE= 2015-02-13
+
BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt \
rst2man:${PORTSDIR}/textproc/py-docutils
Modified: head/sysutils/rsyslog8/Makefile
==============================================================================
--- head/sysutils/rsyslog8/Makefile Wed Jan 14 02:53:53 2015 (r376992)
+++ head/sysutils/rsyslog8/Makefile Wed Jan 14 03:06:48 2015 (r376993)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= rsyslog
-PORTVERSION= 8.6.0
-PORTREVISION= 1
+PORTVERSION= 8.7.0
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
Modified: head/sysutils/rsyslog8/distinfo
==============================================================================
--- head/sysutils/rsyslog8/distinfo Wed Jan 14 02:53:53 2015 (r376992)
+++ head/sysutils/rsyslog8/distinfo Wed Jan 14 03:06:48 2015 (r376993)
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.6.0.tar.gz) = 759f836be460c794a7649f2b5b5ef8d423388ec599bf3b49f51fded3f8c02431
-SIZE (rsyslog-8.6.0.tar.gz) = 1975854
+SHA256 (rsyslog-8.7.0.tar.gz) = c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c
+SIZE (rsyslog-8.7.0.tar.gz) = 2003365
Added: head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/rsyslog8/files/patch-runtime_nsd__ptcp.c Wed Jan 14 03:06:48 2015 (r376993)
@@ -0,0 +1,38 @@
+--- runtime/nsd_ptcp.c.orig 2015-01-13 22:06:22 UTC
++++ runtime/nsd_ptcp.c
+@@ -656,7 +656,11 @@ EnableKeepAlive(nsd_t *pNsd)
+ if(pThis->iKeepAliveProbes > 0) {
+ optval = pThis->iKeepAliveProbes;
+ optlen = sizeof(optval);
++#if defined(SOL_TCP)
+ ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen);
++#else
++ ret = setsockopt(pThis->sock, SOL_SOCKET, TCP_KEEPCNT, &optval, optlen);
++#endif
+ } else {
+ ret = 0;
+ }
+@@ -671,7 +675,11 @@ EnableKeepAlive(nsd_t *pNsd)
+ if(pThis->iKeepAliveTime > 0) {
+ optval = pThis->iKeepAliveTime;
+ optlen = sizeof(optval);
++#if defined(SOL_TCP)
+ ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen);
++#else
++ ret = setsockopt(pThis->sock, SOL_SOCKET, TCP_KEEPIDLE, &optval, optlen);
++#endif
+ } else {
+ ret = 0;
+ }
+@@ -686,7 +694,11 @@ EnableKeepAlive(nsd_t *pNsd)
+ if(pThis->iKeepAliveIntvl > 0) {
+ optval = pThis->iKeepAliveIntvl;
+ optlen = sizeof(optval);
++#if defined(SOL_TCP)
+ ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen);
++#else
++ ret = setsockopt(pThis->sock, SOL_SOCKET, TCP_KEEPINTVL, &optval, optlen);
++#endif
+ } else {
+ ret = 0;
+ }
More information about the svn-ports-all
mailing list