Hello community, here is the log from the commit of package collectd for openSUSE:Leap:15.2 checked in at 2020-02-21 13:54:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/collectd (Old) and /work/SRC/openSUSE:Leap:15.2/.collectd.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectd" Fri Feb 21 13:54:26 2020 rev:10 rq:777940 version:5.10.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/collectd/collectd.changes 2020-01-15 14:50:39.729424162 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.collectd.new.26092/collectd.changes 2020-02-21 13:54:27.506103302 +0100 @@ -1,0 +2,260 @@ +Mon Nov 25 14:02:12 UTC 2019 - Christian Vögl <[email protected]> + +- Update to 5.10.0 (jsc#SLE-9892) + * turbostat plugin: Power metrics update for recent server CPUs. Thanks + to Chris MacNamara. #3276 + * turbostat plugin: Fix warnings generated by the turbostat plugin. + Thanks to Ryan Mccabe. #3340 + * ZFS ARC plugin: New cache values are now read on Linux. Thanks to + Jan-Philipp Litza. #3247, #2843 + * connectivity plugin: monitor the network interface up/down status via + the netlink library. Thanks to Andrew Bays. #2622 + * sysevent plugin: A new plugin that monitors rsyslog for system events. + Thanks to Andrew Bays. #2624 + * procevent plugin: A new plugin that monitors process starts/stops via + netlink library. Thanks to Andrew Bays. #2623 + * daemon: Check if plugin actually loaded before reporting configuration + issues. Thanks to Pavel Rochnyak. #3217 + * daemon: Recover setlocale() call in src/daemon/collectd.c do_init(). + Thanks to Pavel Rochnyak. #3181, #3214 + * Build System: Only include <sys/sysctl.h> when needed. Thanks to Ruben + Kerkhof. #3298 + * Build System: Link to libnsl.so if needed for inet_ntop(). Thanks to + Dagobert Michelsen. #3291 + * Build System: Remove double "without" added by commit b781871. Thanks + to Fabrice Fontaine. #3261 + * Build System: fix compile time issues. Thanks to Matthias Runge. + #3179, #3242, #3245 + * Build System: Fix activation of snmp_agent. Thanks to Fabrice + Fontaine. #3241 + * Build System: Fix bug that leads to CPPFLAGS gets overridden with + CFLAGS when libxmms is enabled. Thanks to Dagobert Michelsen. #3207 + * perl module: Collectd::Plugins::Openvz: Fix indentation of some + closing curlies. Thanks to Christian Bartolomäus. #3239 + * tree-wide: Fix a few issues found with LGTM. Thanks to Ruben Kerkhof. + #3252 + * tree-wide: fix ssnprintf wrapper. Thanks to Fabien Wernli. + #3237, #3232, #3235, #3236 + * tree-wide: Fix make check. Thanks to Ruben Kerkhof. #3306 + * CI System: Travis: switch to Bionic. Thanks to Ruben Kerkhof. #3307 + * CI System: Travis improvements for MacOS. Thanks to Ruben Kerkhof. + #3308 + * MySQL plugin: Minor documentation improvements. Thanks to Christian + Bartolomäus. #3288 + * Java plugin: Fix typo in an error message. Thanks to Matthias Runge. + #3285, #3286 + * sysevent plugin: Add a few missing calloc result checks in the + sysevent_init function. Thanks to Andrew Bays. #3282 + * ZFS ARC plugin: A bug that caused the first to values to be skipped + was fixed. Thanks to Jan-Philipp Litza. #3246 + * SysLog plugin: restore previous behaviour: fallback to info for + unsupported level. Thanks to Fabien Wernli. #3236, #3238 + * virt plugin: Fix memory leak with libvirt MetadataXPath enabled. + Thanks to Pavel Rochnyak. #3225, #3228 + * GPU NVidia plugin: Fix build of the plugin. Thanks to Ruben Kerkhof. + #3320 +- Changes from 5.9.2: +* syslog plugin: Don't fail if syslog loglevel doesn't match. Thanks to + Fabien Wernli. #3236 #3238 + * collectd: Fix ssnprintf wrapper. Thanks to Fabien Wernli. #3237 + * rdt plugin: Fix compile time issues. Thanks to Matthias Runge. #3245 +- Changes from 5.9.1: + * collectd: regex match: Fix unexpected match with empty meta data . + Thanks to Takuro Ashie. #3178 + * collectd: Fix return value or loglevel for several plugins. Thanks to + Fabien Wernli. #3182 + * collectd: Add standard include early or _FILE_OFFSET_BITS will have + definition … . Thanks to Dagobert Michelsen. #3193 + * collectd: Use GCC-specific flags only when compiling with GCC. Thanks + to Dagobert Michelsen. #3195 + * Use test_utils_proc_pids only when compiling the plugin that uses it. + Thanks to Dagobert Michelsen. #3197 + * DNS plugin: Do not use headers from glibc. Thanks to Pavel Rochnyak. + #3156, #3145 + * collectd: Add missing definitions for libnetsnmpagent. Thanks to + Dagobert Michelsen. #3203 + * collectd: Move Makefile rules for pid_test inside conditional for + code. Thanks to Dagobert Michelsen. #3206 + * collectd: Recover setlocale() call in src/daemon/collectd.c do_init(). + Thanks to Pavel Rochnyak. #3214, #3181 + * collectd: Add snprintf wrapper for GCC 8.2/3. Thanks to zebity. #3153, + #2895, #3038 + * collectd: Fix bug that leads to CPPFLAGS gets overridden with CFLAGS + when libxmms is enabled. Thanks to Dagobert Michelsen. #3207 + * Write_Riemann plugin: Copy MetaData to Riemann events in + write_riemann. Thanks to Romain Tartière. #3158 + * virt plugin: Fix memory leak with libvirt MetadataXPath enabled. + Thanks to Pavel Rochnyak. #3225, #3230 +-Disabled Plugins due to missing dependencies: + * lvm on Factory, Tumbleweed, Leap15.2 and SLES_15-SP2 + * gps and sigrok on SLES_15 and later +-Removed libstatgrab from buildrequires: only needed for non-Linux systems. +-Rebased patch 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch +-Add new subpackages: + * plugin-sysevent + * plugin-procevent + * plugin-uptime + ------------------------------------------------------------------- +Thu Jun 13 19:54:45 UTC 2019 - Martin Hauke <[email protected]> + +- Update to 5.9.0: + * collectd: A new "UNKNOWN" state as the initial state of metrics has + been added. + * collectd: config parser: Improved error reporting on global options. + * collectd: daemon: make plugin_dispatch_multivalue() obey write queue + limits. + * collectd: Macros "STRERROR" and "STRERRNO" have been added. + * collectd: Plugin name field has been added to plugin context to + improve error reporting. + * collectd-tg: Use "CLOCK_REALTIME" for collectd-tg times. + * AMPQ1 plugin: A new plugin to write to amqp1 protocol. + * Chrony plugin: Ignoring late responses has been added. + * CPUFreq plugin: Read number of p-state transitions and time spent in + each p-state. + * cURL, cURL-XML plugins: Option "Interval" has been added. + * Exec plugin: Dynamic allocation of grname buffer has been added. + * GPU NVML plugin: New plugin to collect NVIDIA GPU stats. + * gRPC plugin: The "VerifyPeer" option for servers has been added. + * Intel RDT plugin: Support for groups of PIDs has been added. + * IPMI plugin: Config options "SELSensor" and "SELIgnoreSelected" have + been added. + * Modbus plugin: Support for 64 bit vals has been added, support for + CDAB endian 32-bit modbus polls has been added. + * Modbus plugin: The "Scale" and "Shift" metrics have been added. + * Netlink plugin: Handle new counter from Linux kernel version 4.6+. + * Network plugin: Option "BindAddress" has been added. + * Ping plugin: An "AddressFamily" configuration option has been added. + * OVS Stats plugin: Extended metrics "ovs-dpdk" have been added. + * OVS Stats plugin: Support of bond interface and a "InterfaceStats" + config option have been added. + * PCIe Errors plugin: New plugin to read "PCIe" errors. + * Processes plugin: Support for Linux Delay Accounting has been added. + * Redis plugin: Keyspace "hitratio" metric has been added, metric + "operations_per_second" has been removed, an option for connecting via + UNIX socket has been added. + * RouterOS plugin: Support for temperature and voltage data has been + added, use MAC-address when Radio-name is missing. + * RRDCacheD plugin: Time resolution has been improved to microseconds. + * Sensors plugin: Checks for upper limit of "SENSORS_API_VERSION" have + been removed, support for libsensors older than 3.0.0 has been + dropped. + * SNMP plugin: New options "PluginInstance", "TypeInstance", + "TypeInstanceOID", "PluginInstanceOID", "FilterOID", "FilterValues" + and "FilterIgnoreSelected" have been added. + * SNMP Agent plugin: Multiple key indexes to snmp table and other new + features have been added, refactoring, coverity scan issues have been + fixed. + * Swap plugin: Support for Linux 2.4 has been dropped. + * Turbostat plugin: Configuration option "RestoreAffinityPolicy" has + been added. + * Turbostat plugin: New metrics "P-states", "Turboboost", "Platform + TDP", "Uncore bus ratio" have been added. + * Turbostat plugin: Support of reporting GPU power on SKL has been + added. + * virt plugin: Allow read "Hostname" from libvirt metadata. + * virt plugin: Block info statistics for disk devices have been added. + * Wireless plugin: A "bitrate" metric has been added. + * Write Graphite, Write Kafka plugins: Support for Graphite 1.1+ tag has + been added. + * Write Prometheus plugin: Option "Host" has been added. + * Write Stackdriver plugin: New plugin to write to Google Stackdriver + Monitoring. + * Write Syslog plugin: "write_syslog" plugin writes values lists as + syslog messages. + * collectd: collectdmon cannot exit command line options parse loop has + been fixed. + * collectd: Include "kstat.h" if available to provide "kstat_ctl_t", + include "kstat.h" when available. + * collectd: Parsing option for avoiding making BaseDir has been fixed. + * collectd: Remove empty "cmd_listval_t" data structure and related + no-op code. + * collectd: src/daemon/plugin.c: Refactor plugin_load_file(), + src/utils_format_json.c: Remove chatty debug messages. + * collectd: Stop poisoning function in debug mode. + * collectd: The number of allocations when parsing types.db has been + reduced. + * AMQP1 plugin: Potential memory leaks found via scan-build have been + fixed, a typo in error log message has been fixed, cleanups. + * Barometer plugin: Support to "libi2c-4.0" has been added. + * DBI, Oracle, PostgreSQL plugins: Fixes and improvements. + * Disk plugin: In linux, reset the disk when it disappears from + "/proc/diskstats". + * DPDK Events, DPDK Stats plugins: Buffer size for parsing lcores has + been increased, a deprecation warning has been fixed, runtime config + file path has been fixed. + * GPS plugin: Build with gpsd version 3.18 has been fixed. + * LUA plugin: A memory leak has been fixed. + * MySQL plugin: Properly cleanup dropped MySQL connections. + * Netlink plugin: Truncation warnings have been fixed. + * NFS plugin: Message "Unexpected number of fields for NFSv4 server + statistics: 62" has been fixed. + * NFS plugin: Number of fields for "NFSv4" has been fixed. + * Notify Email plugin: All notification parameters have been included + into email. + * NTPd plugin: Don't treat normal peers as refclocks, skip "0.0.0.0" + hosts in ntpd plugin. + * OVS Stats plugin: A macro to populate counters list has been added, + value of "OpenFlow" has been corrected. ++++ 63 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/collectd/collectd.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.collectd.new.26092/collectd.changes Old: ---- collectd-5.7.2.tar.bz2 collectd-javac_target.patch collectd-split_README.patch New: ---- avoid-pg-config.patch collectd-5.10.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:28.378105068 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:28.378105068 +0100 @@ -1,7 +1,7 @@ # # spec file for package collectd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2005-2013 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -34,6 +34,20 @@ wireless write_graphite write_http write_log write_sensu write_tsdb write_prometheus \\\ zfs_arc zookeeper +%if !0%{?is_opensuse} +%if 0%{?sle_version} <= 150100 +%define lvm2app 1 +%else +%define lvm2app 0 +%endif +%else +%if !0%{?suse_version} > 1500 +%define lvm2app 1 +%else +%define lvm2app 0 +%endif +%endif + %ifnarch s390 s390x %define sensors 1 %define sensors_plugin sensors @@ -42,28 +56,28 @@ %define sensors_plugin %{nil} %endif Name: collectd -Version: 5.7.2 +Version: 5.10.0 Release: 0 Summary: Statistics Collection Daemon for filling RRD Files -License: GPL-2.0 +License: GPL-2.0-only AND MIT Group: System/Monitoring -Url: http://collectd.org/ +URL: http://collectd.org/ Source: http://collectd.org/files/collectd-%{version}.tar.bz2 Source1: collectd.suse.init Source2: collectd.apache2.conf Source3: collectd-js.apache2.conf Source99: collectd-rpmlintrc -Patch7: collectd-fix-config.patch -Patch9: collectd-version.patch -Patch10: collectd-perl-vendor.patch +Patch1: collectd-fix-config.patch +Patch2: collectd-version.patch +Patch3: collectd-perl-vendor.patch # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072 -Patch11: collectd-fix_broken_perl-5.10.patch -Patch18: collectd-fix_collection_cgi.patch -Patch19: collectd-fix_spamassassin_doc.patch -Patch20: collectd-split_README.patch -Patch21: collectd-fix_collectd_config_path_in_snmp_probe.patch -Patch23: collectd-javac_target.patch -Patch24: 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch +Patch4: collectd-fix_broken_perl-5.10.patch +Patch5: collectd-fix_collection_cgi.patch +Patch6: collectd-fix_spamassassin_doc.patch +Patch7: collectd-fix_collectd_config_path_in_snmp_probe.patch +Patch8: 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch +# PATCH-FIX-OPENSUSE avoid-pg-config.patch avoid pg_config if possible +Patch11: avoid-pg-config.patch # for /etc/apache2/... ownership (rpmlint): BuildRequires: apache2 BuildRequires: autoconf @@ -97,7 +111,11 @@ BuildRequires: xfsprogs-devel BuildRequires: pkgconfig(OpenIPMI) BuildRequires: pkgconfig(OpenIPMIpthread) +%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} BuildRequires: pkgconfig(Qgpsmm) +BuildRequires: pkgconfig(libgps) +BuildRequires: pkgconfig(libsigrok) +%endif BuildRequires: pkgconfig(dbi) BuildRequires: pkgconfig(devmapper) BuildRequires: pkgconfig(freetype2) @@ -108,23 +126,22 @@ BuildRequires: pkgconfig(libatasmart) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libevent) -#BuildRequires: pkgconfig(libgpsd) -BuildRequires: pkgconfig(libgps) BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(libmemcached) BuildRequires: pkgconfig(libmicrohttpd) BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(liboping) +BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(librrd) -BuildRequires: pkgconfig(libsigrok) -BuildRequires: pkgconfig(libstatgrab) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libupsclient) BuildRequires: pkgconfig(libvirt) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(lua) +%if %{?lvm2app} BuildRequires: pkgconfig(lvm2app) +%endif BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(xtables) BuildRequires: pkgconfig(zlib) @@ -156,6 +173,7 @@ Requires: perl(CGI) Requires: perl(Data::Dumper) Requires: perl(HTML::Entities) +Requires: perl(RRDs) Requires: perl(URI::Escape) %description web @@ -239,6 +257,7 @@ This plugin for collectd provides Network UPS Tools support. %endif +%if %{?lvm2app} %package plugin-lvm Summary: LVM plugin for collectd Group: System/Monitoring @@ -246,6 +265,15 @@ %description plugin-lvm This plugin collects information from lvm. +%endif + +%package plugin-pcie +Summary: PCIe Monitoring Plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-pcie +Optional %{name} plugin to monitor PCIe errors. %package plugin-postgresql Summary: PostgreSQL Monitoring Plugin for %{name} @@ -308,6 +336,7 @@ Optional %{name} plugin to receive and dispatch timing values from Pinba, a profiling extension for PHP. +%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} %package plugin-sigrok Summary: Sigrok Monitoring Plugin for %{name} Group: System/Monitoring @@ -316,6 +345,7 @@ %description plugin-sigrok Optional %{name} plugin to collect measurements from various devices supported by libsigrok. +%endif %package plugin-smart Summary: SMART Monitoring Plugin for %{name} @@ -335,35 +365,128 @@ %description plugin-lua Optional %{name} Lua API in order to write %{name} plugins in Lua. +%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} %package plugin-gps -Summary: gpsd monitoring plugin for %{name} +Summary: GPSD monitoring plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} %description plugin-gps Optional %{name} plugin to monitor gpsd. +%endif + +%package plugin-mcelog +Summary: Machine Check Exceptions plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-mcelog +Optional %{name} plugin to monitor machine check exceptions. + +%package plugin-ovs +Summary: Open vSwitch (OVS) plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-ovs +Optional %{name} plugin to monitor an OVS database. + +%package plugin-synproxy +Summary: Synproxy stats plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-synproxy +Optional %{name} plugin to monitor Synproxy stats. + +%package plugin-write_stackdriver +Summary: Write Stackdriver plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-write_stackdriver +Optional %{name} plugin to to write to Google Stackdriver. + +%package plugin-write_syslog +Summary: Write Syslog plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-write_syslog +Optional %{name} plugin to write values lists as syslog messages. + +%package plugin-uptime +Summary: Uptime plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-uptime +Optional %{name} plugin to collect system uptime statistics. + +%package plugin-connectivity +Summary: Connectivity plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-connectivity +Optional %{name} plugin to collect Event-based interface status. + + +%package plugin-procevent +Summary: Procevent plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-procevent +Optional %{name} plugin to listen for process starts and exits via netlink. + + +%package plugin-sysevent +Summary: Sysevent plugin for %{name} +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-sysevent +Optional %{name} plugin to listen to rsyslog events and submit matched values. +. %package plugins-all Summary: All Monitoring Plugins for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} +Requires: %{name}-plugin-connectivity = %{version}-%{release} Requires: %{name}-plugin-dbi = %{version}-%{release} +%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} Requires: %{name}-plugin-gps = %{version}-%{release} +%endif Requires: %{name}-plugin-ipmi = %{version}-%{release} Requires: %{name}-plugin-java = %{version}-%{release} Requires: %{name}-plugin-lua = %{version}-%{release} +%if %{?lvm2app} Requires: %{name}-plugin-lvm = %{version}-%{release} +%endif +Requires: %{name}-plugin-mcelog = %{version}-%{release} Requires: %{name}-plugin-memcachec = %{version}-%{release} Requires: %{name}-plugin-mysql = %{version}-%{release} Requires: %{name}-plugin-notify-desktop = %{version}-%{release} Requires: %{name}-plugin-openldap = %{version}-%{release} +Requires: %{name}-plugin-ovs = %{version}-%{release} +Requires: %{name}-plugin-pcie = %{version}-%{release} Requires: %{name}-plugin-pinba = %{version}-%{release} Requires: %{name}-plugin-postgresql = %{version}-%{release} +Requires: %{name}-plugin-procevent = %{version}-%{release} Requires: %{name}-plugin-python3 = %{version}-%{release} +%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} Requires: %{name}-plugin-sigrok = %{version}-%{release} +%endif Requires: %{name}-plugin-smart = %{version}-%{release} Requires: %{name}-plugin-snmp = %{version}-%{release} +Requires: %{name}-plugin-synproxy = %{version}-%{release} +Requires: %{name}-plugin-sysevent = %{version}-%{release} +Requires: %{name}-plugin-uptime = %{version}-%{release} Requires: %{name}-plugin-virt = %{version}-%{release} +Requires: %{name}-plugin-write_stackdriver = %{version}-%{release} +Requires: %{name}-plugin-write_syslog = %{version}-%{release} Requires: %{name}-web = %{version}-%{release} Requires: %{name}-web-js = %{version}-%{release} %if 0%{?suse_version} >= 1330 @@ -406,18 +529,17 @@ %prep %setup -q -n "collectd-%{version}" -%patch7 -%patch9 -p1 -%patch10 -%patch11 -%patch18 -%patch19 -%patch20 -%patch21 -%patch23 -p1 +%patch1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 +%patch7 -p1 %if 0%{?suse_version} > 1320 -%patch24 -p1 +%patch8 -p1 %endif +%patch11 -p1 sed -i 's|@@VERSION@@|%{version}|g' configure.ac @@ -425,7 +547,6 @@ # unneeded files: rm -fr \ - contrib/fedora \ contrib/solaris-smf \ contrib/redhat \ contrib/sles* @@ -493,7 +614,7 @@ install -D -m 0644 contrib/collection3%{_sysconfdir}/collection.conf \ "%{buildroot}%{_sysconfdir}/collectd/collection-js.conf" -rm -fr contrib/collection3/etc +rm -fr contrib/collection3%{_sysconfdir} install -D -m 0644 "%{SOURCE3}" "%{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}-js.conf" # spamassassin (_must_ be installed _after_ perl_process_packlist) @@ -546,7 +667,7 @@ This package is empty but depends on all collectd plugin subpackages. EOF -install -d -m 0755 "%{buildroot}%{_prefix}/sbin" +install -d -m 0755 "%{buildroot}%{_sbindir}" install -D -m0644 contrib/systemd.collectd.service %{buildroot}%{_unitdir}/collectd.service ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} @@ -567,7 +688,8 @@ %postun -n libcollectdclient1 -p /sbin/ldconfig %files -f plugins.lst -%doc AUTHORS ChangeLog COPYING README +%license COPYING +%doc AUTHORS ChangeLog README %doc contrib %config(noreplace) %{_sysconfdir}/collectd.conf %dir %{_sysconfdir}/collectd @@ -587,19 +709,19 @@ %dir %{perl_vendorlib}/Collectd %{perl_vendorlib}/Collectd/* %{perl_vendorarch}/auto/Collectd -%{_mandir}/man1/collectd.1%{ext_man} -%{_mandir}/man1/collectdctl.1%{ext_man} -%{_mandir}/man1/collectdmon.1%{ext_man} -%{_mandir}/man1/collectd-tg.1%{ext_man} -%{_mandir}/man1/collectd-nagios.1%{ext_man} -%{_mandir}/man1/cussh.1%{ext_man} -%{_mandir}/man5/collectd.conf.5%{ext_man} -%{_mandir}/man5/collectd-email.5%{ext_man} -%{_mandir}/man5/collectd-exec.5%{ext_man} -%{_mandir}/man5/collectd-perl.5%{ext_man} -%{_mandir}/man5/collectd-threshold.5%{ext_man} -%{_mandir}/man5/collectd-unixsock.5%{ext_man} -%{_mandir}/man5/types.db.5%{ext_man} +%{_mandir}/man1/collectd.1%{?ext_man} +%{_mandir}/man1/collectdctl.1%{?ext_man} +%{_mandir}/man1/collectdmon.1%{?ext_man} +%{_mandir}/man1/collectd-tg.1%{?ext_man} +%{_mandir}/man1/collectd-nagios.1%{?ext_man} +%{_mandir}/man1/cussh.1%{?ext_man} +%{_mandir}/man5/collectd.conf.5%{?ext_man} +%{_mandir}/man5/collectd-email.5%{?ext_man} +%{_mandir}/man5/collectd-exec.5%{?ext_man} +%{_mandir}/man5/collectd-perl.5%{?ext_man} +%{_mandir}/man5/collectd-threshold.5%{?ext_man} +%{_mandir}/man5/collectd-unixsock.5%{?ext_man} +%{_mandir}/man5/types.db.5%{?ext_man} %doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}%{ext_man} %dir %{_localstatedir}/lib/collectd %{_unitdir}/collectd.service @@ -629,14 +751,16 @@ %files plugin-snmp %doc _rpmdoc_/snmp/* %{_bindir}/collectd-snmp-probe-host -%{_mandir}/man1/collectd-snmp-probe-host.1%{ext_man} -%{_libdir}/collectd/snmp.so -%{_libdir}/collectd/snmp.la -%{_mandir}/man5/collectd-snmp.5%{ext_man} +%{_mandir}/man1/collectd-snmp-probe-host.1%{?ext_man} +%{_libdir}/collectd/snmp*.so +%{_libdir}/collectd/snmp*.la +%{_mandir}/man5/collectd-snmp.5%{?ext_man} +%if %{?lvm2app} %files plugin-lvm %{_libdir}/collectd/lvm.so %{_libdir}/collectd/lvm.la +%endif %files plugin-pinba %{_libdir}/collectd/pinba.so @@ -646,6 +770,10 @@ %{_libdir}/collectd/mysql.so %{_libdir}/collectd/mysql.la +%files plugin-pcie +%{_libdir}/collectd/pcie_errors.so +%{_libdir}/collectd/pcie_errors.la + %files plugin-postgresql %{_libdir}/collectd/postgresql.so %{_libdir}/collectd/postgresql.la @@ -654,14 +782,14 @@ %files plugin-python3 %{_libdir}/collectd/python.so %{_libdir}/collectd/python.la -%{_mandir}/man5/collectd-python.5%{ext_man} +%{_mandir}/man5/collectd-python.5%{?ext_man} %files plugin-java %doc _rpmdoc_/java/GenericJMX.conf %{_libdir}/collectd/java.so %{_libdir}/collectd/java.la %{_datadir}/collectd/java -%{_mandir}/man5/collectd-java.5%{ext_man} +%{_mandir}/man5/collectd-java.5%{?ext_man} %files plugin-virt %{_libdir}/collectd/virt.so @@ -675,10 +803,18 @@ %{_libdir}/collectd/memcachec.so %{_libdir}/collectd/memcachec.la +%if 0%{?sle_version} < 150000 || 0%{?is_opensuse} + %files plugin-sigrok %{_libdir}/collectd/sigrok.so %{_libdir}/collectd/sigrok.la +%files plugin-gps +%{_libdir}/collectd/gps.so +%{_libdir}/collectd/gps.la + +%endif + %files plugin-smart %{_libdir}/collectd/smart.so %{_libdir}/collectd/smart.la @@ -686,16 +822,48 @@ %files plugin-lua %{_libdir}/collectd/lua.so %{_libdir}/collectd/lua.la -%{_mandir}/man5/collectd-lua.5%{ext_man} - -%files plugin-gps -%{_libdir}/collectd/gps.so -%{_libdir}/collectd/gps.la +%{_mandir}/man5/collectd-lua.5%{?ext_man} %files plugin-openldap %{_libdir}/collectd/openldap.so %{_libdir}/collectd/openldap.la +%files plugin-mcelog +%{_libdir}/collectd/mcelog.so +%{_libdir}/collectd/mcelog.la + +%files plugin-ovs +%{_libdir}/collectd/ovs_*.so +%{_libdir}/collectd/ovs_*.la + +%files plugin-synproxy +%{_libdir}/collectd/synproxy.so +%{_libdir}/collectd/synproxy.la + +%files plugin-write_stackdriver +%{_libdir}/collectd/write_stackdriver.so +%{_libdir}/collectd/write_stackdriver.la + +%files plugin-write_syslog +%{_libdir}/collectd/write_syslog.so +%{_libdir}/collectd/write_syslog.la + +%files plugin-uptime +%{_libdir}/collectd/check_uptime.la +%{_libdir}/collectd/check_uptime.so + +%files plugin-connectivity +%{_libdir}/collectd/connectivity.la +%{_libdir}/collectd/connectivity.so + +%files plugin-procevent +%{_libdir}/collectd/procevent.la +%{_libdir}/collectd/procevent.so + +%files plugin-sysevent +%{_libdir}/collectd/sysevent.la +%{_libdir}/collectd/sysevent.so + %if 0%{?suse_version} >= 1330 %files plugin-nut %{_libdir}/collectd/nut.so ++++++ 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:28.402105116 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:28.402105116 +0100 @@ -14,12 +14,11 @@ configure.ac | 2 +- src/sigrok.c | 51 +++++++++++++++++++++++++++------------------------ 2 files changed, 28 insertions(+), 25 deletions(-) - diff --git a/configure.ac b/configure.ac -index f50df28a6d..6b7aad43ae 100644 +index 5738974..4032d84 100644 --- a/configure.ac +++ b/configure.ac -@@ -5084,7 +5084,7 @@ AC_SUBST([BUILD_WITH_LIBSENSORS_LIBS]) +@@ -5058,7 +5058,7 @@ AC_SUBST([BUILD_WITH_LIBSENSORS_LIBS]) # libsigrok {{{ AC_SUBST([LIBSIGROK_CFLAGS]) AC_SUBST([LIBSIGROK_LIBS]) @@ -29,17 +28,17 @@ [with_libsigrok="no (pkg-config could not find libsigrok)"] ) diff --git a/src/sigrok.c b/src/sigrok.c -index 8a325fe9f0..a44c95e4b8 100644 +index 8a325fe..a44c95e 100644 --- a/src/sigrok.c +++ b/src/sigrok.c @@ -127,22 +127,22 @@ static int sigrok_config(oconfig_item_t *ci) { return 0; } - + -static const char *sigrok_value_type(const struct sr_datafeed_analog *analog) { +static const char *sigrok_value_type(const struct sr_analog_meaning *meaning) { const char *s; - + - if (analog->mq == SR_MQ_VOLTAGE) + if (meaning->mq == SR_MQ_VOLTAGE) s = "voltage"; @@ -71,9 +70,9 @@ + sr_dev_inst_driver_get(sdi)->name); return; } - + @@ -191,11 +191,11 @@ static void sigrok_feed_callback(const struct sr_dev_inst *sdi, - + /* Ignore all but the first sample on the first probe. */ analog = packet->payload; - vl.values = &(value_t){.gauge = analog->data[0]}; @@ -83,39 +82,39 @@ sstrncpy(vl.plugin_instance, cfdev->name, sizeof(vl.plugin_instance)); - sstrncpy(vl.type, sigrok_value_type(analog), sizeof(vl.type)); + sstrncpy(vl.type, sigrok_value_type(&analog->meaning[0]), sizeof(vl.type)); - + plugin_dispatch_values(&vl); cfdev->last_dispatch = cdtime(); @@ -207,6 +207,7 @@ static void sigrok_free_drvopts(struct sr_config *src) { } - + static int sigrok_init_driver(struct config_device *cfdev, + struct sr_session *session, struct sr_dev_driver *drv) { struct sr_config *src; GSList *devlist, *drvopts; -@@ -248,21 +249,22 @@ static int sigrok_init_driver(struct config_device *cfdev, +@@ -248,21 +249,22 @@ cfdev->sdi = devlist->data; g_slist_free(devlist); ssnprintf(hwident, sizeof(hwident), "%s %s %s", - cfdev->sdi->vendor ? cfdev->sdi->vendor : "", - cfdev->sdi->model ? cfdev->sdi->model : "", - cfdev->sdi->version ? cfdev->sdi->version : ""); -+ sr_dev_inst_vendor_get(cfdev->sdi), -+ sr_dev_inst_model_get(cfdev->sdi), -+ sr_dev_inst_version_get(cfdev->sdi)); ++ sr_dev_inst_vendor_get(cfdev->sdi), ++ sr_dev_inst_model_get(cfdev->sdi), ++ sr_dev_inst_version_get(cfdev->sdi)); INFO("sigrok plugin: Device \"%s\" is a %s", cfdev->name, hwident); - + if (sr_dev_open(cfdev->sdi) != SR_OK) return -1; - + - if (sr_session_dev_add(cfdev->sdi) != SR_OK) + if (sr_session_dev_add(session, cfdev->sdi) != SR_OK) return -1; - + return 1; } - + static void *sigrok_read_thread(void *arg __attribute__((unused))) { + struct sr_session *session; struct sr_dev_driver *drv, **drvlist; @@ -124,11 +123,11 @@ @@ -277,11 +279,11 @@ static void *sigrok_read_thread(void *arg __attribute__((unused))) { return NULL; } - + - if (!sr_session_new()) + if (!sr_session_new(sr_ctx, &session)) return NULL; - + num_devices = 0; - drvlist = sr_driver_list(); + drvlist = sr_driver_list(sr_ctx); @@ -138,38 +137,38 @@ @@ -296,7 +298,7 @@ static void *sigrok_read_thread(void *arg __attribute__((unused))) { return NULL; } - + - if ((ret = sigrok_init_driver(cfdev, drv)) < 0) + if ((ret = sigrok_init_driver(cfdev, session, drv)) < 0) /* Error was already logged. */ return NULL; - + @@ -305,21 +307,22 @@ static void *sigrok_read_thread(void *arg __attribute__((unused))) { - + if (num_devices > 0) { /* Do this only when we're sure there's hardware to talk to. */ - if (sr_session_datafeed_callback_add(sigrok_feed_callback, NULL) != SR_OK) + if (sr_session_datafeed_callback_add(session, sigrok_feed_callback, + NULL) != SR_OK) return NULL; - + /* Start acquisition on all devices. */ - if (sr_session_start() != SR_OK) + if (sr_session_start(session) != SR_OK) return NULL; - + /* Main loop, runs forever. */ - sr_session_run(); + sr_session_run(session); - + - sr_session_stop(); - sr_session_dev_remove_all(); + sr_session_stop(session); + sr_session_dev_remove_all(session); } - + - sr_session_destroy(); + sr_session_destroy(session); - + sr_exit(sr_ctx); - + ++++++ avoid-pg-config.patch ++++++ diff --git a/configure.ac b/configure.ac index 4032d84..284192d 100644 --- a/configure.ac +++ b/configure.ac @@ -4272,18 +4272,10 @@ AC_SUBST([PERL_LIBS]) # }}} # --with-libpq {{{ -with_pg_config="pg_config" AC_ARG_WITH([libpq], - [AS_HELP_STRING([--with-libpq@<:@=PREFIX@:>@], [Path to libpq.])], + [AS_HELP_STRING([--with-libpq], [Build using pgsql])], [ - if test "x$withval" = "xno" || test "x$withval" = "xyes"; then - with_libpq="$withval" - else - if test -f "$withval" && test -x "$withval"; then - with_pg_config="$withval" - else if test -x "$withval/bin/pg_config"; then - with_pg_config="$withval/bin/pg_config" - fi; fi + if test "x$withval" != "xno" || test "x$withval" != "xyes"; then with_libpq="yes" fi ], @@ -4291,66 +4283,42 @@ AC_ARG_WITH([libpq], ) if test "x$with_libpq" = "xyes"; then - with_libpq_includedir=`$with_pg_config --includedir 2> /dev/null` - pg_config_status=$? - - if test $pg_config_status -eq 0; then - if test -n "$with_libpq_includedir"; then - for dir in $with_libpq_includedir; do - with_libpq_cppflags="$with_libpq_cppflags -I$dir" - done - fi - else - AC_MSG_WARN([$with_pg_config returned with status $pg_config_status]) + $PKG_CONFIG --exists 'libpq' 2>/dev/null + if test $? -ne 0; then + with_libpq="no (pkg-config doesn't know libpq)" fi - - SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $with_libpq_cppflags" - - AC_CHECK_HEADERS([libpq-fe.h], - [with_libpq="yes"], - [with_libpq="no (libpq-fe.h not found)"] - ) - - CPPFLAGS="$SAVE_CPPFLAGS" fi if test "x$with_libpq" = "xyes"; then - with_libpq_libdir=`$with_pg_config --libdir 2> /dev/null` - pg_config_status=$? - - if test $pg_config_status -eq 0 - then - if test -n "$with_libpq_libdir"; then - for dir in $with_libpq_libdir; do - with_libpq_ldflags="$with_libpq_ldflags -L$dir" - done - fi - else - AC_MSG_WARN([$with_pg_config returned with status $pg_config_status]) - fi + with_libpq_cflags="`$PKG_CONFIG --cflags libpq`" + with_libpq_ldflags="`$PKG_CONFIG --libs-only-L libpq`" + with_libpq_libs="`$PKG_CONFIG --libs libpq`" +fi - SAVE_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $with_libpq_ldflags" +if test "x$with_libpq" = "xyes"; then + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $with_libpq_cflags" - AC_CHECK_LIB([pq], [PQserverVersion], - [with_libpq="yes"], - [with_libpq="no (symbol 'PQserverVersion' not found)"]) + # Look for libpq-fe.h + AC_CHECK_HEADERS([libpq-fe.h pgsql/libpq-fe.h], + [with_libpq="yes"], + [with_libpq="no (libpq-fe.h not found)"] + ) - LDFLAGS="$SAVE_LDFLAGS" + CPPFLAGS="$SAVE_CPPFLAGS" fi if test "x$with_libpq" = "xyes"; then - BUILD_WITH_LIBPQ_CPPFLAGS="$with_libpq_cppflags" + BUILD_WITH_LIBPQ_CPPFLAGS="$with_libpq_cflags" BUILD_WITH_LIBPQ_LDFLAGS="$with_libpq_ldflags" - BUILD_WITH_LIBPQ_LIBS="-lpq" + BUILD_WITH_LIBPQ_LIBS="$with_libpq_libs" fi AC_SUBST([BUILD_WITH_LIBPQ_CPPFLAGS]) -AC_SUBST([BUILD_WITH_LIBPQ_LDFLAGS]) AC_SUBST([BUILD_WITH_LIBPQ_LIBS]) # }}} + # --with-libpqos {{{ AC_ARG_WITH([libpqos], [AS_HELP_STRING([--with-libpqos@<:@=PREFIX@:>@], [Path to libpqos.])], ++++++ collectd-5.7.2.tar.bz2 -> collectd-5.10.0.tar.bz2 ++++++ ++++ 371853 lines of diff (skipped) ++++++ collectd-fix-config.patch ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:31.054110485 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:31.066110510 +0100 @@ -1,6 +1,8 @@ ---- src/collectd.conf.in.orig 2013-06-04 02:22:35.386712789 +0200 -+++ src/collectd.conf.in 2013-06-04 02:24:33.579744915 +0200 -@@ -211,7 +211,7 @@ +Index: src/collectd.conf.in +=================================================================== +--- src/collectd.conf.in.orig ++++ src/collectd.conf.in +@@ -272,7 +272,7 @@ #<Plugin apache> # <Instance "local"> # URL "http://localhost/status?auto"; @@ -9,7 +11,7 @@ # Password "secret" # CACert "/etc/ssl/ca.crt" # </Instance> -@@ -225,7 +225,7 @@ +@@ -291,7 +291,7 @@ #<Plugin ascent> # URL "http://localhost/ascent/status/"; ++++++ collectd-fix_broken_perl-5.10.patch ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:31.174110729 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:31.186110753 +0100 @@ -1,6 +1,8 @@ ---- src/perl.c.orig -+++ src/perl.c -@@ -2504,7 +2504,12 @@ static int perl_config_loadplugin(pTHX_ +diff --git a/src/perl.c b/src/perl.c +index 8df8fd4..94e21d2 100644 +--- a/src/perl.c ++++ b/src/perl.c +@@ -2516,7 +2516,12 @@ static int perl_config_loadplugin(pTHX_ oconfig_item_t *ci) { log_debug("perl_config: Loading Perl plugin \"%s\"", value); load_module(PERL_LOADMOD_NOIMPORT, newSVpv(module_name, strlen(module_name)), ++++++ collectd-fix_collectd_config_path_in_snmp_probe.patch ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:31.306110996 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:31.318111020 +0100 @@ -1,6 +1,8 @@ ---- contrib/snmp-probe-host.px.orig 2009-10-07 22:55:23.000000000 +0200 -+++ contrib/snmp-probe-host.px 2009-10-07 22:57:45.000000000 +0200 -@@ -290,7 +290,7 @@ +diff --git a/contrib/snmp-probe-host.px b/contrib/snmp-probe-host.px +index d1a7a88..bc94e5c 100755 +--- a/contrib/snmp-probe-host.px ++++ b/contrib/snmp-probe-host.px +@@ -320,7 +320,7 @@ This is a bit a hack, but works for now. =cut my $host; ++++++ collectd-fix_collection_cgi.patch ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:31.446111279 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:31.458111303 +0100 @@ -1,6 +1,8 @@ ---- contrib/collection.cgi.orig 2010-04-22 11:30:07.000000000 +0200 -+++ contrib/collection.cgi 2010-05-20 18:23:38.000000000 +0200 -@@ -11,7 +11,7 @@ +diff --git a/contrib/collection.cgi b/contrib/collection.cgi +index 5ff259f..e0848e0 100755 +--- a/contrib/collection.cgi ++++ b/contrib/collection.cgi +@@ -32,7 +32,7 @@ use URI::Escape ('uri_escape'); use RRDs (); use Data::Dumper (); @@ -9,8 +11,10 @@ our @DataDirs = (); our @DontShowTypes = (); our $LibDir; ---- contrib/collection.conf.orig 2010-04-22 11:29:35.000000000 +0200 -+++ contrib/collection.conf 2010-05-20 18:23:38.000000000 +0200 +diff --git a/contrib/collection.conf b/contrib/collection.conf +index e8444f5..063141f 100644 +--- a/contrib/collection.conf ++++ b/contrib/collection.conf @@ -1,3 +1,2 @@ -datadir: "/opt/collectd/var/lib/collectd/rrd/" -libdir: "/opt/collectd/lib/collectd/" ++++++ collectd-js.apache2.conf ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:31.694111782 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:31.706111805 +0100 @@ -3,29 +3,33 @@ # Access control: <Directory "/srv/www/collectd-js"> - Order allow,deny - - # You might want to change this to avoid giving everyone - # access to the collectd statistics, e.g.: - # Allow from all - # Allow from localhost - # Allow from 192.168. - Deny from all + <IfModule mod_authz_core.c> + # Apache 2.4 + <RequireAll> + Require all granted + </RequireAll> + </IfModule> + <IfModule !mod_authz_core.c> + # Apache 2.2 + Order allow,deny + Allow from all + </IfModule> </Directory> <Directory "/srv/www/collectd-js/bin"> Options +ExecCGI AddHandler cgi-script .cgi - - Order allow,deny - - # You might want to change this to give access from - # different hosts to the collectd statistics, e.g.: - # - # Allow from all - # Allow from 192.168. - Allow from localhost - Deny from all + <IfModule mod_authz_core.c> + # Apache 2.4 + <RequireAll> + Require all granted + </RequireAll> + </IfModule> + <IfModule !mod_authz_core.c> + # Apache 2.2 + Order allow,deny + Allow from all + </IfModule> </Directory> </IfModule> ++++++ collectd-perl-vendor.patch ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:31.858112113 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:31.878112154 +0100 @@ -1,7 +1,9 @@ ---- bindings/Makefile.am.orig 2013-06-04 02:26:20.688776802 +0200 -+++ bindings/Makefile.am 2013-06-04 02:26:33.551780804 +0200 -@@ -29,7 +29,7 @@ - +diff --git a/Makefile.am b/Makefile.am +index 2ef2442..145e98c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2000,7 +2000,7 @@ uninstall-hook: + all-local: @PERL_BINDINGS@ install-exec-local: - [ ! -f buildperl/Makefile ] || ( cd buildperl && $(MAKE) install ) ++++++ collectd-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:32.050112502 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:32.074112551 +0100 @@ -7,3 +7,6 @@ #There no fsf address in that file addFilter('incorrect-fsf-address /usr/share/doc/packages/collectd/contrib/network-proxy.py') + +# Can't delete this file in the post section +addFilter('suse-filelist-forbidden-backup-file') ++++++ collectd-version.patch ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:32.218112842 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:32.242112891 +0100 @@ -7,4 +7,4 @@ +AC_INIT([collectd],[@@VERSION@@]) AC_CONFIG_SRCDIR(src/target_set.c) AC_CONFIG_HEADERS(src/config.h) - AC_CONFIG_AUX_DIR([libltdl/config]) + AC_CONFIG_AUX_DIR([build-aux]) ++++++ collectd.apache2.conf ++++++ --- /var/tmp/diff_new_pack.Ko4Oyt/_old 2020-02-21 13:54:32.362113134 +0100 +++ /var/tmp/diff_new_pack.Ko4Oyt/_new 2020-02-21 13:54:32.362113134 +0100 @@ -3,15 +3,17 @@ # Access control: <Directory "/srv/www/collectd"> - Order allow,deny - - # You might want to change this to give access from - # different hosts to the collectd statistics, e.g.: - # - # Allow from all - # Allow from 192.168. - Allow from localhost - Deny from all + <IfModule mod_authz_core.c> + # Apache 2.4 + <RequireAll> + Require all granted + </RequireAll> + </IfModule> + <IfModule !mod_authz_core.c> + # Apache 2.2 + Order allow,deny + Allow from all + </IfModule> </Directory> </IfModule>
