diff options
Diffstat (limited to 'net-mgmt/collectd5/files')
| -rw-r--r-- | net-mgmt/collectd5/files/patch-Makefile.am | 27 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-Makefile.in | 216 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-configure.ac | 95 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src__Makefile.am | 107 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src__daemon__Makefile.am | 11 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src__daemon__collectd.h | 21 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src__dns.c | 18 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src__modbus.c | 12 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src__tcpconns.c | 18 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src_config.h.in | 40 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src_daemon_collectd.h | 11 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src_write__mongodb.c | 11 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src_zfs__arc.c | 4 | ||||
| -rw-r--r-- | net-mgmt/collectd5/files/patch-version-gen.sh | 4 |
14 files changed, 254 insertions, 341 deletions
diff --git a/net-mgmt/collectd5/files/patch-Makefile.am b/net-mgmt/collectd5/files/patch-Makefile.am index e92f3aed1883..06e715146e15 100644 --- a/net-mgmt/collectd5/files/patch-Makefile.am +++ b/net-mgmt/collectd5/files/patch-Makefile.am @@ -1,10 +1,29 @@ ---- Makefile.am.orig 2016-09-11 08:10:25 UTC +--- Makefile.am.orig 2017-11-18 09:03:27 UTC +++ Makefile.am -@@ -14,7 +14,6 @@ EXTRA_DIST = contrib version-gen.sh test +@@ -165,7 +165,7 @@ AM_CPPFLAGS = \ + -DPREFIX='"${prefix}"' \ + -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ + -DLOCALSTATEDIR='"${localstatedir}"' \ +- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ ++ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \ + -DPLUGINDIR='"${pkglibdir}"' \ + -DPKGDATADIR='"${pkgdatadir}"' + +@@ -1964,15 +1964,10 @@ endif install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) ++ $(mkinstalldirs) $(DESTDIR)/var/db/$(PACKAGE_NAME) $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log - - maintainer-clean-local: + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) +- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ +- then \ +- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ +- else \ +- $(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ +- fi; \ ++ $(INSTALL) -m 0640 src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(pkgdatadir)/types.db; + $(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \ diff --git a/net-mgmt/collectd5/files/patch-Makefile.in b/net-mgmt/collectd5/files/patch-Makefile.in new file mode 100644 index 000000000000..2243b8119553 --- /dev/null +++ b/net-mgmt/collectd5/files/patch-Makefile.in @@ -0,0 +1,216 @@ +--- Makefile.in.orig 2017-11-18 09:03:50 UTC ++++ Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.14.1 from Makefile.am. ++# Makefile.in generated by automake 1.15.1 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2017 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -18,7 +18,17 @@ + + + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -351,26 +361,6 @@ check_PROGRAMS = test_common$(EXEEXT) te + @BUILD_PLUGIN_WRITE_PROMETHEUS_TRUE@am__append_237 = prometheus.pb-c.c prometheus.pb-c.h + @HAVE_GRPC_CPP_TRUE@@HAVE_PROTOC3_TRUE@am__append_238 = collectd.grpc.pb.cc collectd.pb.cc types.pb.cc + subdir = . +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +- $(top_srcdir)/configure $(am__configure_deps) \ +- $(top_srcdir)/src/config.h.in \ +- $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \ +- $(top_srcdir)/src/collectd.conf.in \ +- $(top_srcdir)/src/libcollectdclient/libcollectdclient.pc.in \ +- src/liboconfig/scanner.c src/liboconfig/parser.h \ +- src/liboconfig/parser.c $(top_srcdir)/build-aux/depcomp \ +- $(top_srcdir)/build-aux/ylwrap $(am__dist_noinst_JAVA_DIST) \ +- $(dist_man_MANS) $(pkginclude_HEADERS) \ +- $(top_srcdir)/build-aux/test-driver AUTHORS COPYING ChangeLog \ +- README build-aux/compile build-aux/config.guess \ +- build-aux/config.sub build-aux/depcomp build-aux/install-sh \ +- build-aux/missing build-aux/ylwrap build-aux/ltmain.sh \ +- $(top_srcdir)/build-aux/compile \ +- $(top_srcdir)/build-aux/config.guess \ +- $(top_srcdir)/build-aux/config.sub \ +- $(top_srcdir)/build-aux/install-sh \ +- $(top_srcdir)/build-aux/ltmain.sh \ +- $(top_srcdir)/build-aux/missing + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \ + $(top_srcdir)/m4/ax_compiler_vendor.m4 \ +@@ -379,6 +369,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ ++ $(am__configure_deps) $(am__dist_noinst_JAVA_DIST) \ ++ $(pkginclude_HEADERS) $(am__DIST_COMMON) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d +@@ -2673,6 +2666,25 @@ TEST_LOGS = $(am__test_logs2:.test.log=. + TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver + TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) ++am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ ++ $(top_srcdir)/build-aux/compile \ ++ $(top_srcdir)/build-aux/config.guess \ ++ $(top_srcdir)/build-aux/config.sub \ ++ $(top_srcdir)/build-aux/depcomp \ ++ $(top_srcdir)/build-aux/install-sh \ ++ $(top_srcdir)/build-aux/ltmain.sh \ ++ $(top_srcdir)/build-aux/missing \ ++ $(top_srcdir)/build-aux/test-driver \ ++ $(top_srcdir)/build-aux/ylwrap \ ++ $(top_srcdir)/src/collectd.conf.in \ ++ $(top_srcdir)/src/config.h.in \ ++ $(top_srcdir)/src/libcollectdclient/collectd/lcc_features.h.in \ ++ $(top_srcdir)/src/libcollectdclient/libcollectdclient.pc.in \ ++ AUTHORS COPYING ChangeLog INSTALL NEWS README \ ++ build-aux/compile build-aux/config.guess build-aux/config.sub \ ++ build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ ++ build-aux/missing build-aux/ylwrap src/liboconfig/parser.c \ ++ src/liboconfig/parser.h src/liboconfig/scanner.c + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -2908,6 +2920,7 @@ LOAD_PLUGIN_NETWORK = @LOAD_PLUGIN_NETWO + LOAD_PLUGIN_RRDTOOL = @LOAD_PLUGIN_RRDTOOL@ + LOAD_PLUGIN_SYSLOG = @LOAD_PLUGIN_SYSLOG@ + LTLIBOBJS = @LTLIBOBJS@ ++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ + LUA_CFLAGS = @LUA_CFLAGS@ + LUA_LIBS = @LUA_LIBS@ + MAKEINFO = @MAKEINFO@ +@@ -3183,7 +3196,7 @@ AM_CPPFLAGS = \ + -DPREFIX='"${prefix}"' \ + -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ + -DLOCALSTATEDIR='"${localstatedir}"' \ +- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ ++ -DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \ + -DPLUGINDIR='"${pkglibdir}"' \ + -DPKGDATADIR='"${pkgdatadir}"' + +@@ -4172,7 +4185,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +-.PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -7114,7 +7126,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ +- else \ ++ elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ +@@ -7385,7 +7397,7 @@ distdir: $(DISTFILES) + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" + dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + $(am__post_remove_distdir) + dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 +@@ -7400,17 +7412,17 @@ dist-xz: distdir + $(am__post_remove_distdir) + + dist-tarZ: distdir +- @echo WARNING: "Support for shar distribution archives is" \ +- "deprecated." >&2 ++ @echo WARNING: "Support for distribution archives compressed with" \ ++ "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + + dist-shar: distdir +- @echo WARNING: "Support for distribution archives compressed with" \ +- "legacy program 'compress' is deprecated." >&2 ++ @echo WARNING: "Support for shar distribution archives is" \ ++ "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + $(am__post_remove_distdir) + + dist-zip: distdir +@@ -7428,7 +7440,7 @@ dist dist-all: + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ ++ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ +@@ -7438,23 +7450,23 @@ distcheck: dist + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ ++ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) +- mkdir $(distdir)/_build $(distdir)/_inst ++ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ +- && $(am__cd) $(distdir)/_build \ +- && ../configure \ ++ && $(am__cd) $(distdir)/_build/sub \ ++ && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ +- --srcdir=.. --prefix="$$dc_install_base" \ ++ --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ +@@ -7686,6 +7698,8 @@ uninstall-man: uninstall-man1 uninstall- + uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES \ + uninstall-sbinPROGRAMS + ++.PRECIOUS: Makefile ++ + + .pod.1: + $(AM_V_POD2MAN_C)pod2man --release=$(VERSION) --center=$(PACKAGE) $< \ +@@ -7721,7 +7735,7 @@ uninstall-man: uninstall-man1 uninstall- + + install-exec-hook: + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run +- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) ++ $(mkinstalldirs) $(DESTDIR)/var/db/$(PACKAGE_NAME) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) + if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ diff --git a/net-mgmt/collectd5/files/patch-configure.ac b/net-mgmt/collectd5/files/patch-configure.ac deleted file mode 100644 index d2da50ad1c1d..000000000000 --- a/net-mgmt/collectd5/files/patch-configure.ac +++ /dev/null @@ -1,95 +0,0 @@ ---- configure.ac.orig 2016-09-11 08:10:25 UTC -+++ configure.ac -@@ -185,7 +185,7 @@ then - fi - - # Where to install .pc files. --pkgconfigdir="${libdir}/pkgconfig" -+pkgconfigdir="${prefix}/libdata/pkgconfig" - AC_SUBST(pkgconfigdir) - - # Check for standards compliance mode -@@ -841,7 +841,7 @@ SAVE_CFLAGS="$CFLAGS" - # Emulate behavior of src/Makefile.am - if test "x$GCC" = "xyes" - then -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall " - fi - - AC_CACHE_CHECK([for strtok_r], -@@ -968,7 +968,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen - if test "x$GCC" = "xyes" - then - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -Wall -Wextra -Werror" -+ CFLAGS="$CFLAGS -Wall -Wextra " - fi - - AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"]) -@@ -1757,6 +1757,7 @@ if test "x$with_kstat" = "xyes" - then - AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], []) - fi -+ - if test "x$with_kstat" = "xyes" - then - AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], []) -@@ -1766,6 +1767,8 @@ if test "x$with_kstat" = "xyes" - then - AC_DEFINE(HAVE_LIBKSTAT, 1, - [Define to 1 if you have the 'kstat' library (-lkstat)]) -+ BUILD_WITH_LIBKSTAT_LIBS="-lkstat" -+ AC_SUBST(BUILD_WITH_LIBKSTAT_LIBS) - fi - AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes") - AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes") -@@ -3053,8 +3056,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([ - with_libmongoc="no" - else - with_libmongoc="yes" -- LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include" -- LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib" -+ LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include/libmongoc-1.0 -I$withval/include/libbson-1.0" -+ LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib -lsasl2 -lssl -lcrypto -lmongoc-1.0 -lbson-1.0" - fi; fi - ], - [with_libmongoc="yes"]) -@@ -3071,7 +3074,7 @@ then - then - AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CPPFLAGS]) - fi -- AC_CHECK_HEADERS(mongo.h, -+ AC_CHECK_HEADERS(mongoc.h, - [with_libmongoc="yes"], - [with_libmongoc="no ('mongo.h' not found)"], - [#if HAVE_STDINT_H -@@ -3087,7 +3090,7 @@ then - then - AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS]) - fi -- AC_CHECK_LIB(mongoc, mongo_run_command, -+ AC_CHECK_LIB(mongoc-1.0, mongoc_client_command, - [with_libmongoc="yes"], - [with_libmongoc="no (symbol 'mongo_run_command' not found)"]) - fi -@@ -3873,7 +3876,7 @@ then - SAVE_LIBS="$LIBS" - # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3) - # (see issues #41 and #42) -- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall " - LIBS="$LIBS $PERL_LIBS" - - AC_CACHE_CHECK([for broken Perl_load_module()], -@@ -5249,8 +5252,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING( - else if test -d "$with_libvarnish/lib" - then - AC_MSG_NOTICE([Not checking for libvarnish: Manually configured]) -- with_libvarnish_cflags="-I$withval/include" -- with_libvarnish_libs="-L$withval/lib -lvarnishapi" -+ with_libvarnish_cflags="-I$withval/include/varnish" -+ with_libvarnish_libs="-L$withval/lib/varnish -lvarnishapi" - with_libvarnish="yes" - fi; fi; fi - ], diff --git a/net-mgmt/collectd5/files/patch-src__Makefile.am b/net-mgmt/collectd5/files/patch-src__Makefile.am deleted file mode 100644 index 3cd035d57c28..000000000000 --- a/net-mgmt/collectd5/files/patch-src__Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ ---- src/Makefile.am.orig 2016-09-11 08:10:25 UTC -+++ src/Makefile.am -@@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon - AM_CPPFLAGS += -DPREFIX='"${prefix}"' - AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' - AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' --AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' -+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' - if BUILD_FEATURE_DAEMON - AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' - endif -@@ -274,7 +274,7 @@ cpu_la_CFLAGS = $(AM_CFLAGS) - cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS) - cpu_la_LIBADD = - if BUILD_WITH_LIBKSTAT --cpu_la_LIBADD += -lkstat -+cpu_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) - endif - if BUILD_WITH_LIBDEVINFO - cpu_la_LIBADD += -ldevinfo -@@ -358,7 +358,7 @@ disk_la_CFLAGS = $(AM_CFLAGS) - disk_la_LDFLAGS = $(PLUGIN_LDFLAGS) - disk_la_LIBADD = - if BUILD_WITH_LIBKSTAT --disk_la_LIBADD += -lkstat -+disk_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) - endif - if BUILD_WITH_LIBDEVINFO - disk_la_LIBADD += -ldevinfo -@@ -381,6 +381,9 @@ endif - if BUILD_WITH_PERFSTAT - disk_la_LIBADD += -lperfstat - endif -+if BUILD_FREEBSD -+disk_la_LIBADD += -ldevstat -lgeom -+endif - endif - - if BUILD_PLUGIN_DNS -@@ -481,7 +484,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS - interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) - else - if BUILD_WITH_LIBKSTAT --interface_la_LIBADD += -lkstat -+interface_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) - endif - if BUILD_WITH_LIBDEVINFO - interface_la_LIBADD += -ldevinfo -@@ -669,7 +672,7 @@ memory_la_CFLAGS = $(AM_CFLAGS) - memory_la_LDFLAGS = $(PLUGIN_LDFLAGS) - memory_la_LIBADD = - if BUILD_WITH_LIBKSTAT --memory_la_LIBADD += -lkstat -+memory_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) - endif - if BUILD_WITH_LIBDEVINFO - memory_la_LIBADD += -ldevinfo -@@ -1034,7 +1037,7 @@ swap_la_CFLAGS = $(AM_CFLAGS) - swap_la_LDFLAGS = $(PLUGIN_LDFLAGS) - swap_la_LIBADD = - if BUILD_WITH_LIBKSTAT --swap_la_LIBADD += -lkstat -+swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) - endif - if BUILD_WITH_LIBDEVINFO - swap_la_LIBADD += -ldevinfo -@@ -1080,7 +1083,7 @@ if BUILD_PLUGIN_TAPE - pkglib_LTLIBRARIES += tape.la - tape_la_SOURCES = tape.c - tape_la_LDFLAGS = $(PLUGIN_LDFLAGS) --tape_la_LIBADD = -lkstat -ldevinfo -+tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo - endif - - if BUILD_PLUGIN_TARGET_NOTIFICATION -@@ -1184,7 +1187,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS) - uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS) - uptime_la_LIBADD = - if BUILD_WITH_LIBKSTAT --uptime_la_LIBADD += -lkstat -+uptime_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) - endif - if BUILD_WITH_PERFSTAT - uptime_la_LIBADD += -lperfstat -@@ -1340,7 +1343,7 @@ if BUILD_FREEBSD - zfs_arc_la_LIBADD = -lm - endif - if BUILD_SOLARIS --zfs_arc_la_LIBADD = -lkstat -+zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) - endif - endif - -@@ -1433,12 +1436,7 @@ endif - - install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ -- then \ -- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ -- else \ -- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ -- fi; \ -+ $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - $(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db; - $(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \ diff --git a/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am b/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am deleted file mode 100644 index 0c5ab0d7af24..000000000000 --- a/net-mgmt/collectd5/files/patch-src__daemon__Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/daemon/Makefile.am.orig 2016-09-11 08:10:25 UTC -+++ src/daemon/Makefile.am -@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src - AM_CPPFLAGS += -DPREFIX='"${prefix}"' - AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' - AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' --AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' -+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' - if BUILD_FEATURE_DAEMON - AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' - endif diff --git a/net-mgmt/collectd5/files/patch-src__daemon__collectd.h b/net-mgmt/collectd5/files/patch-src__daemon__collectd.h deleted file mode 100644 index 4c2e39643fd2..000000000000 --- a/net-mgmt/collectd5/files/patch-src__daemon__collectd.h +++ /dev/null @@ -1,21 +0,0 @@ ---- src/daemon/collectd.h.orig 2017-01-23 07:53:57 UTC -+++ src/daemon/collectd.h -@@ -243,15 +243,15 @@ typedef int _Bool; - #endif - - #ifndef LOCALSTATEDIR --#define LOCALSTATEDIR PREFIX "/var" -+#define LOCALSTATEDIR "/var" - #endif - - #ifndef PKGLOCALSTATEDIR --#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME -+#define PKGLOCALSTATEDIR "/var/db/" PACKAGE_NAME - #endif - - #ifndef PIDFILE --#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid" -+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid" - #endif - - #ifndef PLUGINDIR diff --git a/net-mgmt/collectd5/files/patch-src__dns.c b/net-mgmt/collectd5/files/patch-src__dns.c deleted file mode 100644 index ca6efc56501d..000000000000 --- a/net-mgmt/collectd5/files/patch-src__dns.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/dns.c.orig 2017-01-23 07:53:57 UTC -+++ src/dns.c -@@ -198,6 +198,15 @@ static int dns_run_pcap_loop(void) { - pthread_sigmask(SIG_SETMASK, &sigmask, NULL); - } - -+ /* Check for pcap_device, if needed */ -+#ifdef __sparc64__ -+ if (pcap_device == NULL) -+ { -+ ERROR ("dns plugin: Interface required"); -+ return (NULL); -+ } -+#endif -+ - /* Passing `pcap_device == NULL' is okay and the same as passign "any" */ - DEBUG("dns plugin: Creating PCAP object.."); - pcap_obj = pcap_open_live((pcap_device != NULL) ? pcap_device : "any", diff --git a/net-mgmt/collectd5/files/patch-src__modbus.c b/net-mgmt/collectd5/files/patch-src__modbus.c deleted file mode 100644 index f11dfac63902..000000000000 --- a/net-mgmt/collectd5/files/patch-src__modbus.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/modbus.c.orig 2017-01-23 07:53:57 UTC -+++ src/modbus.c -@@ -26,6 +26,9 @@ - #include "configfile.h" - #include "plugin.h" - -+/* FreeBSD needs this */ -+#include <sys/socket.h> -+ - #include <modbus.h> - #include <netdb.h> - #include <sys/socket.h> diff --git a/net-mgmt/collectd5/files/patch-src__tcpconns.c b/net-mgmt/collectd5/files/patch-src__tcpconns.c deleted file mode 100644 index 07406fc5d2b7..000000000000 --- a/net-mgmt/collectd5/files/patch-src__tcpconns.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/tcpconns.c.orig 2017-03-21 00:18:33.371554000 -0700 -+++ src/tcpconns.c 2017-03-21 00:21:09.631089000 -0700 -@@ -745,9 +745,15 @@ - for (in_ptr = (struct xinpgen *)(((char *)in_orig) + in_orig->xig_len); - in_ptr->xig_len > sizeof(struct xinpgen); - in_ptr = (struct xinpgen *)(((char *)in_ptr) + in_ptr->xig_len)) { -+#if __FreeBSD_version >= 1200026 -+ struct xtcpcb *tp = (struct xtcpcb *)in_ptr; -+ struct xinpcb *inp = &tp->xt_inp; -+ struct xsocket *so = &inp->xi_socket; -+#else - struct tcpcb *tp = &((struct xtcpcb *)in_ptr)->xt_tp; - struct inpcb *inp = &((struct xtcpcb *)in_ptr)->xt_inp; - struct xsocket *so = &((struct xtcpcb *)in_ptr)->xt_socket; -+#endif - - /* Ignore non-TCP sockets */ - if (so->xso_protocol != IPPROTO_TCP) diff --git a/net-mgmt/collectd5/files/patch-src_config.h.in b/net-mgmt/collectd5/files/patch-src_config.h.in deleted file mode 100644 index db3f9c715949..000000000000 --- a/net-mgmt/collectd5/files/patch-src_config.h.in +++ /dev/null @@ -1,40 +0,0 @@ ---- src/config.h.in.orig 2016-09-11 08:10:42 UTC -+++ src/config.h.in -@@ -587,8 +587,8 @@ - /* Define to 1 if you have the <modbus.h> header file. */ - #undef HAVE_MODBUS_H - --/* Define to 1 if you have the <mongo.h> header file. */ --#undef HAVE_MONGO_H -+/* Define to 1 if you have the <mongoc.h> header file. */ -+#undef HAVE_MONGOC_H - - /* Define to 1 if you have the <mosquitto.h> header file. */ - #undef HAVE_MOSQUITTO_H -@@ -1617,13 +1617,15 @@ - module search path. */ - #undef LT_MODULE_PATH_VAR - --/* Define to the sub-directory in which libtool stores uninstalled libraries. -- */ -+/* Define to the sub-directory where libtool stores uninstalled libraries. */ - #undef LT_OBJDIR - - /* Define to the shared library suffix, say, ".dylib". */ - #undef LT_SHARED_EXT - -+/* Define to the shared archive member specification, say "(shr.o)". */ -+#undef LT_SHARED_LIB_MEMBER -+ - /* Define if NAN is defined by default and can initialize static variables. */ - #undef NAN_STATIC_DEFAULT - -@@ -1715,7 +1717,7 @@ - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const - --/* Define to a type to use for `error_t' if it is not otherwise available. */ -+/* Define to a type to use for 'error_t' if it is not otherwise available. */ - #undef error_t - - /* Define to `int' if <sys/types.h> doesn't define. */ diff --git a/net-mgmt/collectd5/files/patch-src_daemon_collectd.h b/net-mgmt/collectd5/files/patch-src_daemon_collectd.h new file mode 100644 index 000000000000..7cef38729056 --- /dev/null +++ b/net-mgmt/collectd5/files/patch-src_daemon_collectd.h @@ -0,0 +1,11 @@ +--- src/daemon/collectd.h.orig 2017-11-18 09:03:27 UTC ++++ src/daemon/collectd.h +@@ -207,7 +207,7 @@ + #endif + + #ifndef PKGLOCALSTATEDIR +-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME ++#define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME + #endif + + #ifndef PIDFILE diff --git a/net-mgmt/collectd5/files/patch-src_write__mongodb.c b/net-mgmt/collectd5/files/patch-src_write__mongodb.c deleted file mode 100644 index 42eef9c4b99a..000000000000 --- a/net-mgmt/collectd5/files/patch-src_write__mongodb.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/write_mongodb.c.orig 2016-09-11 08:10:25 UTC -+++ src/write_mongodb.c -@@ -39,7 +39,7 @@ - #else - # define MONGO_USE_LONG_LONG_INT 1 - #endif --#include <mongo.h> -+#include <mongoc.h> - - #if (MONGO_MAJOR == 0) && (MONGO_MINOR < 8) - # define bson_alloc() bson_create() diff --git a/net-mgmt/collectd5/files/patch-src_zfs__arc.c b/net-mgmt/collectd5/files/patch-src_zfs__arc.c index 667d63d5e181..4225ab16ed9f 100644 --- a/net-mgmt/collectd5/files/patch-src_zfs__arc.c +++ b/net-mgmt/collectd5/files/patch-src_zfs__arc.c @@ -1,6 +1,6 @@ ---- src/zfs_arc.c.orig 2017-01-23 07:53:57 UTC +--- src/zfs_arc.c.orig 2017-11-18 09:03:27 UTC +++ src/zfs_arc.c -@@ -286,8 +286,6 @@ static int za_read(void) { +@@ -301,8 +301,6 @@ static int za_read(void) { za_read_derive(ksp, "prefetch_metadata_hits", "cache_result", "prefetch_metadata-hit"); za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss"); diff --git a/net-mgmt/collectd5/files/patch-version-gen.sh b/net-mgmt/collectd5/files/patch-version-gen.sh index 3b25a7416170..6c0e6c9d5fba 100644 --- a/net-mgmt/collectd5/files/patch-version-gen.sh +++ b/net-mgmt/collectd5/files/patch-version-gen.sh @@ -1,8 +1,8 @@ ---- version-gen.sh.orig 2017-02-03 20:46:49 UTC +--- version-gen.sh.orig 2017-11-18 09:03:27 UTC +++ version-gen.sh @@ -2,10 +2,6 @@ - DEFAULT_VERSION="5.7.1.git" + DEFAULT_VERSION="5.8.0.git" -if [ -d .git ]; then - VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`" |