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

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sysutils/rsyslog/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2015/04/23 09:30:49 jperkin Exp $
# $NetBSD: Makefile,v 1.8 2016/04/22 16:52:14 jperkin Exp $
#
BUILDLINK_DEPMETHOD.libestr= full
@@ -9,7 +9,7 @@ BUILDLINK_DEPMETHOD.libuuid= full
COMMENT= The enhanced syslogd for Unix
CONFIGURE_ARGS+= --disable-testbench --enable-cached-man-pages \
CONFIGURE_ARGS+= --disable-testbench \
--enable-diagtools --enable-usertools --enable-uuid \
--enable-imdiag --enable-imfile --enable-impstats \
--enable-mail --enable-mmjsonparse --enable-mmnormalize \
@@ -31,6 +31,13 @@ PLIST.klog= yes
RSYSLOG_SYSMOD= imklog
.endif
# needs to be able to do compare-and-swap on time_t (cmpxchg8b)
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -march=i586
.endif
BUILDLINK_TRANSFORM.Darwin+= rm:-luuid
BUILD_DEFS+= VARBASE RSYSLOG_PIDDIR RSYSLOG_WRKDIR
RSYSLOG_PIDDIR?= ${VARBASE}/run
RSYSLOG_WRKDIR?= ${VARBASE}/lib/rsyslog
@@ -44,6 +51,11 @@ SUBST_VARS.paths= RSYSLOG_PIDDIR RSYSLOG_SYSMOD
SUBST_SED.paths= -e "s|/etc|${PKG_SYSCONFDIR}|g"
SUBST_MESSAGE.paths= Setting default paths and options.
SUBST_CLASSES.Darwin+= ldargs
SUBST_STAGE.ldargs= pre-configure
SUBST_FILES.ldargs= tools/Makefile.in
SUBST_SED.ldargs= -e '/whole-archive.*librsyslog/d'
RCD_SCRIPTS= rsyslogd
CONF_FILES+= share/examples/rsyslog/rsyslog.conf \
@@ -54,6 +66,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/platform/redhat/rsyslog.conf \
${DESTDIR}${EGDIR}/rsyslog.conf
BUILDLINK_ABI_DEPENDS.liblognorm+= liblognorm>=1.0.2
BUILDLINK_API_DEPENDS.liblognorm+= liblognorm>=1.1.2
.include "../../sysutils/liblognorm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

13
sysutils/rsyslog/Makefile.common
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.13 2015/09/05 15:32:19 wiedi Exp $
# $NetBSD: Makefile.common,v 1.22 2016/08/09 11:55:41 fhajny Exp $
# used by sysutils/rsyslog/Makefile
# used by sysutils/rsyslog-dbi/Makefile
# used by sysutils/rsyslog-elasticsearch/Makefile
@@ -12,7 +12,7 @@
.include "../../mk/bsd.prefs.mk"
DISTNAME= rsyslog-8.12.0
DISTNAME= rsyslog-8.20.0
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
@@ -27,9 +27,7 @@ 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
CONFIGURE_ARGS.SunOS+= ac_cv_func_epoll_create=no ac_cv_func_epoll_create1=no
GNU_CONFIGURE= yes
@@ -40,7 +38,8 @@ PYTHON_FOR_BUILD_ONLY= yes
EGDIR= ${PREFIX}/share/examples/rsyslog
CONFIGURE_ARGS+= --disable-libgcrypt --disable-testbench \
--enable-diagtools --enable-usertools
--enable-diagtools --enable-usertools \
--enable-generate-man-pages
BUILDLINK_DEPMETHOD.libestr+= build
BUILDLINK_DEPMETHOD.liblogging+= build
@@ -51,4 +50,4 @@ BUILDLINK_DEPMETHOD.libuuid+= build
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/pyversion.mk"
.include "../../sysutils/liblogging/buildlink3.mk"
.include "../../textproc/json-c/buildlink3.mk"
.include "../../textproc/libfastjson/buildlink3.mk"

15
sysutils/rsyslog/distinfo
View File

@@ -1,15 +1,16 @@
$NetBSD: distinfo,v 1.8 2015/09/21 11:15:34 wiedi Exp $
$NetBSD: distinfo,v 1.19 2016/08/09 11:55:41 fhajny Exp $
SHA1 (rsyslog-8.12.0.tar.gz) = d43b917ec413a249310d5dcf76f848ea6871ea73
RMD160 (rsyslog-8.12.0.tar.gz) = 1e9cc2651d6e0e033829c600c9d0aef05cd7e2bc
Size (rsyslog-8.12.0.tar.gz) = 2091620 bytes
SHA1 (rsyslog-8.20.0.tar.gz) = 1863ce688d2e5cc134677f4f98c63b756dc908d7
RMD160 (rsyslog-8.20.0.tar.gz) = e5ad874894e132648f6fbf1c2d8c56ec7e6748da
SHA512 (rsyslog-8.20.0.tar.gz) = 179b61e4d5393633909bf718cf9b187d34161e9e4395fa2577cfc4f2c35a50e3f9128de376b1a0bb9dc3dd112857d377e553f10e5332719df35e98f9cd631e2b
Size (rsyslog-8.20.0.tar.gz) = 2287709 bytes
SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec
SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
SHA1 (patch-plugins_imfile_imfile.c) = 05b171b241825b19573315aa9b185b4708e38155
SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be
SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e
SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
SHA1 (patch-plugins_mmexternal_mmexternal.c) = 00606bd11d5d281bf4b32f038e857eb364954c4c
SHA1 (patch-plugins_omelasticsearch_omelasticsearch.c) = 7bd0f94d1a3fd16106b952e63ff4593e8e37386b
SHA1 (patch-plugins_mmexternal_mmexternal.c) = 09b8007f44abc9a20fed884a132e734c8b613fb4
SHA1 (patch-runtime_lookup.c) = cedb0531ff00063d44467029beba852ce4fbc0be
SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437
SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
SHA1 (patch-tools_rsyslogd.c) = 5d480bc32f44ee308acad76588b250f8a56d894f

3
sysutils/rsyslog/files/smf/manifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<service_bundle type="manifest" name="rsyslog">
<service_bundle type="manifest" name="export">
<service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
<create_default_instance enabled="false" />
<single_instance />
@@ -23,7 +23,6 @@
<property_group name="application" type="application">
<propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/rsyslog.conf" />
</property_group>
<stability value="Evolving" />
<template>
<common_name>
<loctext xml:lang="C">rsyslog daemon</loctext>

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

@@ -1,21 +1,20 @@
$NetBSD: patch-plugins_imfile_imfile.c,v 1.4 2015/08/26 00:55:33 fhajny Exp $
$NetBSD: patch-plugins_imfile_imfile.c,v 1.5 2016/01/26 15:20:33 fhajny Exp $
Avoid unresolved symbol on inotify-less platforms.
--- plugins/imfile/imfile.c.orig 2015-08-10 10:24:49.000000000 +0000
--- plugins/imfile/imfile.c.orig 2016-01-22 07:54:28.000000000 +0000
+++ plugins/imfile/imfile.c
@@ -1840,11 +1840,14 @@ BEGINrunInput
@@ -1839,10 +1839,14 @@ BEGINrunInput
CODESTARTrunInput
DBGPRINTF("imfile: working in %s mode\n",
DBGPRINTF("imfile: working in %s mode\n",
(runModConf->opMode == OPMODE_POLLING) ? "polling" : "inotify");
+#if HAVE_INOTIFY_INIT
if(runModConf->opMode == OPMODE_POLLING)
iRet = doPolling();
else
iRet = do_inotify();
-
+#else
+ iRet = doPolling();
+#endif
DBGPRINTF("imfile: terminating upon request of rsyslog core\n");
ENDrunInput

6
sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
View File

@@ -1,14 +1,14 @@
$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.3 2015/08/26 00:55:33 fhajny Exp $
$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.4 2016/04/22 16:52:14 jperkin Exp $
Fix build on BSD.
--- plugins/mmexternal/mmexternal.c.orig 2015-08-10 10:24:49.000000000 +0000
--- plugins/mmexternal/mmexternal.c.orig 2016-03-02 11:12:44.000000000 +0000
+++ plugins/mmexternal/mmexternal.c
@@ -31,7 +31,7 @@
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__)
#include <sys/wait.h>
#else
#include <wait.h>

16
sysutils/rsyslog/patches/patch-plugins_omelasticsearch_omelasticsearch.c
View File

@@ -1,16 +0,0 @@
$NetBSD: patch-plugins_omelasticsearch_omelasticsearch.c,v 1.1 2015/09/21 11:15:34 wiedi Exp $
Ignore O_LARGEFILE on systems that don't have it
--- plugins/omelasticsearch/omelasticsearch.c.orig 2015-07-08 14:31:07.000000000 +0000
+++ plugins/omelasticsearch/omelasticsearch.c
@@ -49,6 +49,10 @@
#include "cfsysline.h"
#include "unicode-helper.h"
+#if !defined(O_LARGEFILE)
+#define O_LARGEFILE 0
+#endif
+
MODULE_TYPE_OUTPUT
MODULE_TYPE_NOKEEP
MODULE_CNFNAME("omelasticsearch")

21
sysutils/rsyslog/patches/patch-runtime_lookup.c Normal file
View File

@@ -0,0 +1,21 @@
$NetBSD: patch-runtime_lookup.c,v 1.2 2016/04/22 16:52:14 jperkin Exp $
Handle Darwin's pthread_setname_np().
--- runtime/lookup.c.orig 2016-03-07 06:47:55.000000000 +0000
+++ runtime/lookup.c
@@ -926,8 +926,14 @@ lookupTableDefProcessCnf(struct cnfobj *
strcpy(reloader_thd_name, reloader_prefix);
strcpy(reloader_thd_name + strlen(reloader_prefix), (char*) lu->name);
reloader_thd_name[thd_name_len - 1] = '\0';
+#if defined(__NetBSD__)
+ pthread_setname_np(lu->reloader, "%s", reloader_thd_name);
+#elif defined(__APPLE__)
+ pthread_setname_np(reloader_thd_name);
+#else
pthread_setname_np(lu->reloader, reloader_thd_name);
#endif
+#endif
CHKiRet(lookupReadFile(lu->self, lu->name, lu->filename));
DBGPRINTF("lookup table '%s' loaded from file '%s'\n", lu->name, lu->filename);