[packages/collectd] - rel 5; fix python build

arekm arekm at pld-linux.org
Tue Jul 3 19:56:10 CEST 2018


commit b0bf0ed7c8280e7890a1057e0dad51e59d866bf5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Jul 3 19:56:02 2018 +0200

    - rel 5; fix python build

 collectd-python.patch | 11 +++++++++++
 collectd.spec         |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/collectd.spec b/collectd.spec
index a95ecb3..6a4b73d 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -136,7 +136,7 @@ Summary:	Collects system information in RRD files
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
 Version:	5.8.0
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.bz2
@@ -149,6 +149,7 @@ Source5:	%{name}-apache.conf
 Source10:	%{name}-df.conf
 Source11:	%{name}-rrdtool.conf
 Patch0:		%{name}-collection.patch
+Patch1:		%{name}-python.patch
 Patch2:		noquote.patch
 URL:		http://collectd.org/
 %{?with_ipmi:BuildRequires:	OpenIPMI-devel >= 2.0.14-3}
@@ -1314,6 +1315,7 @@ Perl files from Collectd package
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 
 %build
diff --git a/collectd-python.patch b/collectd-python.patch
new file mode 100644
index 0000000..8992c54
--- /dev/null
+++ b/collectd-python.patch
@@ -0,0 +1,11 @@
+--- collectd-5.8.0/src/python.c~	2017-11-18 10:03:27.000000000 +0100
++++ collectd-5.8.0/src/python.c	2018-07-03 19:31:41.523756509 +0200
+@@ -1136,7 +1136,7 @@ static void *cpy_interactive(void *pipef
+     cpy_log_exception("interactive session init");
+   }
+   cur_sig = PyOS_setsig(SIGINT, python_sigint_handler);
+-  PyOS_AfterFork();
++  PyOS_AfterFork_Child();
+   PyEval_InitThreads();
+   close(*(int *)pipefd);
+   PyRun_InteractiveLoop(stdin, "<stdin>");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/collectd.git/commitdiff/b0bf0ed7c8280e7890a1057e0dad51e59d866bf5



More information about the pld-cvs-commit mailing list