5 files changed, 4 insertions, 88 deletions

diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index 91f34e5b9f2d..75e5040fbee9 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	8.1905.0
+PORTVERSION=	8.1907.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
@@ -147,12 +147,6 @@ CONFIGURE_ARGS+=	--enable-imdiag --enable-imfile --enable-impstats \
 			--enable-omuxsock --enable-rfc3195 --disable-testbench \
 			ac_cv_func_inotify_init=no ac_cv_header_sys_inotify_h=no
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200061
-CONFIGURE_ARGS+=	--enable-imuxsock-rfc5424
-.else
-CONFIGURE_ARGS+=	--disable-imuxsock-rfc5424
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\
 		${WRKSRC}/tools/syslogd.c
diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo
index df370d458f25..a60b7bee09c2 100644
--- a/sysutils/rsyslog8/distinfo
+++ b/sysutils/rsyslog8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559113281
-SHA256 (rsyslog-8.1905.0.tar.gz) = 96bd4fab8d768fd6ad22d45e10b83e159b93df9bafcde1d582e1224f647116e4
-SIZE (rsyslog-8.1905.0.tar.gz) = 2911703
+TIMESTAMP = 1562702295
+SHA256 (rsyslog-8.1907.0.tar.gz) = eb27535ece93174ef6b551c88467d2c9cd826b62479625bb881a53d50b079fb5
+SIZE (rsyslog-8.1907.0.tar.gz) = 2926855
diff --git a/sysutils/rsyslog8/files/patch-config.h.in b/sysutils/rsyslog8/files/patch-config.h.in
deleted file mode 100644
index 1fb43569c474..000000000000
--- a/sysutils/rsyslog8/files/patch-config.h.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- config.h.in.orig	2018-04-14 15:52:32 UTC
-+++ config.h.in
-@@ -18,6 +18,10 @@
- /* Indicator that RELP is present */
- #undef ENABLE_RELP
- 
-+/* Indicator that syslog(3) sends RFC5424 format via the local unix
-+   socket, rather than the traditional RFC3164 */
-+#undef ENABLE_IMUXSOCK_RFC5424
-+
- /* Regular expressions support enabled. */
- #undef FEATURE_REGEXP
- 
diff --git a/sysutils/rsyslog8/files/patch-configure.ac b/sysutils/rsyslog8/files/patch-configure.ac
deleted file mode 100644
index f5c10c2b010f..000000000000
--- a/sysutils/rsyslog8/files/patch-configure.ac
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.ac.orig	2019-05-29 07:03:26 UTC
-+++ configure.ac
-@@ -1661,6 +1661,20 @@ if test "x$enable_imfile" = "xyes"; then
- fi
- AM_CONDITIONAL(ENABLE_IMFILE, test x$enable_imfile = xyes)
- 
-+# choose default settings for the format the system syslog(3)
-+# generates: (old, default) RFC 3164 needs a special parser. (new) RFC
-+# 5424 is handled by the default parser.
-+AC_ARG_ENABLE(imuxsock_rfc5424,
-+	[AS_HELP_STRING([--enable-imuxsock-rfc5424],[unix socket input defaults to RFC5424 format @<:default=no@:>@])],
-+	[case "${enableval}" in
-+	 yes) enable_imuxsock_rfc5424="yes" ;;
-+	  no) enable_imuxsock_rfc5424="no" ;;
-+	   *) AC_MSG_ERROR(bad value ${enableval} for --enable-imuxsock-rfc5424) ;;
-+	 esac],
-+	[enable_imuxsock_rfc5424=no]
-+)
-+AM_CONDITIONAL(ENABLE_IMUXSOCK_RFC5424, test x$enable_imuxsock_rfc5424 = xyes)
-+
- # settings for the docker log input module
- AC_ARG_ENABLE(imdocker,
-         [AS_HELP_STRING([--enable-imdocker],[input docker module enabled @<:@default=no@:>@])],
-@@ -2529,6 +2543,7 @@ echo "    file input module enabled:                $e
- echo "    docker log input module enabled:          $enable_imdocker"
- echo "    Solaris input module enabled:             $enable_imsolaris"
- echo "    periodic statistics module enabled:       $enable_impstats"
-+echo "    syslog(3) unix socket uses RFC5424:       $enable_imuxsock_rfc5424"
- echo "    imczmq input module enabled:              $enable_imczmq"
- echo "    imjournal input module enabled:           $enable_imjournal"
- echo "    imbatchreport input module enabled:       $enable_imbatchreport"
diff --git a/sysutils/rsyslog8/files/patch-plugins_imuxsock_imuxsock.c b/sysutils/rsyslog8/files/patch-plugins_imuxsock_imuxsock.c
deleted file mode 100644
index e7e2af3444ea..000000000000
--- a/sysutils/rsyslog8/files/patch-plugins_imuxsock_imuxsock.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- plugins/imuxsock/imuxsock.c.orig	2018-04-08 11:15:54 UTC
-+++ plugins/imuxsock/imuxsock.c
-@@ -180,6 +180,13 @@ static int sd_fds = 0;			/* number of sy
- #define DFLT_ratelimitInterval 0
- #define DFLT_ratelimitBurst 200
- #define DFLT_ratelimitSeverity 1			/* do not rate-limit emergency messages */
-+
-+#ifdef ENABLE_IMUXSOCK_RFC5424
-+#define DFLT_bUseSpecialParser 0			/* assumes syslog(3) generates RFC5424 format */
-+#else
-+#define DFLT_bUseSpecialParser 1			/* assumes syslog(3) generates RFC3164 format */
-+#endif
-+
- /* config vars for the legacy config system */
- static struct configSettings_s {
- 	int bOmitLocalLogging;
-@@ -323,7 +330,7 @@ createInstance(instanceConf_t **pinst)
- 	inst->ratelimitBurst = DFLT_ratelimitBurst;
- 	inst->ratelimitSeverity = DFLT_ratelimitSeverity;
- 	inst->bUseFlowCtl = 0;
--	inst->bUseSpecialParser = 1;
-+	inst->bUseSpecialParser = DFLT_bUseSpecialParser;
- 	inst->bParseHost = UNSET;
- 	inst->bIgnoreTimestamp = 1;
- 	inst->bCreatePath = DFLT_bCreatePath;
-@@ -1243,7 +1250,7 @@ CODESTARTbeginCnfLoad
- 	pModConf->bAnnotateSysSock = 0;
- 	pModConf->bParseTrusted = 0;
- 	pModConf->bParseHost = UNSET;
--	pModConf->bUseSpecialParser = 1;
-+	pModConf->bUseSpecialParser = DFLT_bUseSpecialParser;
- 	/* if we do not process internal messages, we will see messages
- 	 * from ourselves, and so we need to permit this.
- 	 */