Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/rsyslog/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2015/01/16 16:58:28 fhajny Exp $
# $NetBSD: Makefile,v 1.4 2015/04/23 09:30:49 jperkin Exp $
#
BUILDLINK_DEPMETHOD.libestr= full
@@ -19,6 +19,10 @@ PLIST_VARS+= klog solaris
.if ${OPSYS} == "SunOS"
CONFIGURE_ARGS+= --enable-imsolaris --disable-klog
# Explicitly disable epoll/inotify on illumos, provided for Linux compat only.
CONFIGURE_ENV+= ac_cv_func_epoll_create=no
CONFIGURE_ENV+= ac_cv_func_epoll_create1=no
CONFIGURE_ENV+= ac_cv_func_inotify_init=no
PLIST.solaris= yes
RSYSLOG_SYSMOD= imsolaris
.else

8
sysutils/rsyslog/Makefile.common
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.7 2015/03/01 07:19:11 wiz Exp $
# $NetBSD: Makefile.common,v 1.11 2015/06/09 15:00:33 fhajny Exp $
# used by sysutils/rsyslog/Makefile
# used by sysutils/rsyslog-dbi/Makefile
# used by sysutils/rsyslog-gnutls/Makefile
@@ -11,7 +11,7 @@
.include "../../mk/bsd.prefs.mk"
DISTNAME= rsyslog-8.7.0
DISTNAME= rsyslog-8.10.0
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
@@ -26,6 +26,10 @@ PATCHDIR= ${.CURDIR}/../../sysutils/rsyslog/patches
BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
CONFIGURE_ARGS+= RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
.if ${OPSYS} == "SunOS"
CONFIGURE_ARGS+= ac_cv_func_epoll_create=no ac_cv_func_epoll_create1=no
.endif
GNU_CONFIGURE= yes
USE_LIBTOOL= yes

10
sysutils/rsyslog/distinfo
View File

@@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.4 2015/01/16 16:58:28 fhajny Exp $
$NetBSD: distinfo,v 1.6 2015/06/09 15:00:33 fhajny Exp $
SHA1 (rsyslog-8.7.0.tar.gz) = 7f3909e58ec2f785c6aadf2e0685479150c82cc7
RMD160 (rsyslog-8.7.0.tar.gz) = 2bb24de029edc69e0724c012bbe710e063d1907f
Size (rsyslog-8.7.0.tar.gz) = 2003365 bytes
SHA1 (rsyslog-8.10.0.tar.gz) = 9fddcf1121e438e5291f738bb4619230de525e50
RMD160 (rsyslog-8.10.0.tar.gz) = 7902285e72c47d14b9d21071ba6fe85f58ac2162
Size (rsyslog-8.10.0.tar.gz) = 2013205 bytes
SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec
SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
SHA1 (patch-plugins_imfile_imfile.c) = 6909e68e700d61099d9200fd26072bd7f199639f
SHA1 (patch-plugins_imfile_imfile.c) = 277d894673444caeb782a513c0d1cdd72c49a849
SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e
SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
SHA1 (patch-plugins_mmexternal_mmexternal.c) = 12053abfd32553c4c29faa131b803e7edfaa3803

21
sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
View File

@@ -1,9 +1,9 @@
$NetBSD: patch-plugins_imfile_imfile.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
$NetBSD: patch-plugins_imfile_imfile.c,v 1.3 2015/06/09 15:00:33 fhajny Exp $
Avoid unresolved symbol on inotify-less platforms.
--- plugins/imfile/imfile.c.orig 2014-12-02 10:15:16.000000000 +0000
--- plugins/imfile/imfile.c.orig 2015-05-19 08:53:40.000000000 +0000
+++ plugins/imfile/imfile.c
@@ -1709,11 +1709,14 @@ BEGINrunInput
@@ -1763,11 +1763,14 @@ BEGINrunInput
CODESTARTrunInput
DBGPRINTF("imfile: working in %s mode\n",
(runModConf->opMode == OPMODE_POLLING) ? "polling" : "inotify");
@@ -19,3 +19,18 @@ Avoid unresolved symbol on inotify-less platforms.
DBGPRINTF("imfile: terminating upon request of rsyslog core\n");
ENDrunInput
@@ -1869,12 +1872,14 @@ CODESTARTmodExit
objRelease(errmsg, CORE_COMPONENT);
objRelease(prop, CORE_COMPONENT);
objRelease(ruleset, CORE_COMPONENT);
+#if HAVE_INOTIFY_INIT
if(dirs != NULL) {
free(dirs->active.listeners);
free(dirs->configured.listeners);
free(dirs);
}
free(wdmap);
+#endif /* #if HAVE_INOTIFY_INIT */
ENDmodExit