collectd/collectd-fix_broken_perl-5.10.patch

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)),
-              Nullsv);
+#if PERL_VERSION >= 10
+              newSViv(0)
+#else
+              Nullsv
+#endif
+              );
   return 0;
 } /* static int perl_config_loadplugin (oconfig_item_it *) */
Accepting request 694073 from home:cgiboudeaux:branches:server:monitoring Update to 5.8.1 Add patch to fix the psql detection on Factory builds. OBS-URL: https://build.opensuse.org/request/show/694073 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=154 2019-04-27 12:18:32 +02:00			`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) {`
Accepting request 59758 from YaST:Web Accepted submit request 59758 from user schubi2 OBS-URL: https://build.opensuse.org/request/show/59758 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=1 2011-02-03 02:08:32 +01:00
Accepting request 493297 from home:benoit_monin:branches:server:monitoring - update to version 5.7.1 - refresh patches: * collectd-fix_broken_perl-5.10.patch * collectd-split_README.patch * collectd-version.patch - drop patch collectd-5.5.2-exec-no-output.diff: fixed upstream - remove plugin write_riemann: not built anymore - add new plugins chrony, cpusleep, hugepages, notify_nagios - add lua-devel as BuildRequires and create a sub-package for the lua plugin - add gpsd-devel as BuildRequires and create a sub-package for the gps plugin OBS-URL: https://build.opensuse.org/request/show/493297 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=142 2017-05-18 00:05:22 +02:00			`log_debug("perl_config: Loading Perl plugin \"%s\"", value);`
			`load_module(PERL_LOADMOD_NOIMPORT, newSVpv(module_name, strlen(module_name)),`
			`- Nullsv);`
Accepting request 59758 from YaST:Web Accepted submit request 59758 from user schubi2 OBS-URL: https://build.opensuse.org/request/show/59758 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=1 2011-02-03 02:08:32 +01:00			`+#if PERL_VERSION >= 10`
Accepting request 493297 from home:benoit_monin:branches:server:monitoring - update to version 5.7.1 - refresh patches: * collectd-fix_broken_perl-5.10.patch * collectd-split_README.patch * collectd-version.patch - drop patch collectd-5.5.2-exec-no-output.diff: fixed upstream - remove plugin write_riemann: not built anymore - add new plugins chrony, cpusleep, hugepages, notify_nagios - add lua-devel as BuildRequires and create a sub-package for the lua plugin - add gpsd-devel as BuildRequires and create a sub-package for the gps plugin OBS-URL: https://build.opensuse.org/request/show/493297 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=142 2017-05-18 00:05:22 +02:00			`+ newSViv(0)`
Accepting request 59758 from YaST:Web Accepted submit request 59758 from user schubi2 OBS-URL: https://build.opensuse.org/request/show/59758 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=1 2011-02-03 02:08:32 +01:00			`+#else`
Accepting request 493297 from home:benoit_monin:branches:server:monitoring - update to version 5.7.1 - refresh patches: * collectd-fix_broken_perl-5.10.patch * collectd-split_README.patch * collectd-version.patch - drop patch collectd-5.5.2-exec-no-output.diff: fixed upstream - remove plugin write_riemann: not built anymore - add new plugins chrony, cpusleep, hugepages, notify_nagios - add lua-devel as BuildRequires and create a sub-package for the lua plugin - add gpsd-devel as BuildRequires and create a sub-package for the gps plugin OBS-URL: https://build.opensuse.org/request/show/493297 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=142 2017-05-18 00:05:22 +02:00			`+ Nullsv`
Accepting request 59758 from YaST:Web Accepted submit request 59758 from user schubi2 OBS-URL: https://build.opensuse.org/request/show/59758 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=1 2011-02-03 02:08:32 +01:00			`+#endif`
Accepting request 493297 from home:benoit_monin:branches:server:monitoring - update to version 5.7.1 - refresh patches: * collectd-fix_broken_perl-5.10.patch * collectd-split_README.patch * collectd-version.patch - drop patch collectd-5.5.2-exec-no-output.diff: fixed upstream - remove plugin write_riemann: not built anymore - add new plugins chrony, cpusleep, hugepages, notify_nagios - add lua-devel as BuildRequires and create a sub-package for the lua plugin - add gpsd-devel as BuildRequires and create a sub-package for the gps plugin OBS-URL: https://build.opensuse.org/request/show/493297 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=142 2017-05-18 00:05:22 +02:00			`+ );`
			`return 0;`
Accepting request 59758 from YaST:Web Accepted submit request 59758 from user schubi2 OBS-URL: https://build.opensuse.org/request/show/59758 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=1 2011-02-03 02:08:32 +01:00			`} /* static int perl_config_loadplugin (oconfig_item_it ) /`