[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9f4e560dc6e3af3740743580208c74ad3efc45fb

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9f4e560dc6e3af3740743580208c74ad3efc45fb

[git]

[-- Attachment #1: Type: text/plain, Size: 5182 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  9f4e560dc6e3af3740743580208c74ad3efc45fb (commit)
       via  26e1ec80f97e1b178836c3ea731b09a97dd8b9c8 (commit)
      from  83a5eb26574a09dc234e4df2ffcde3a28ce9284a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f4e560dc6e3af3740743580208c74ad3efc45fb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Sep 5 10:42:58 2016 +0200

    python-rrdtool: Update to version 0.1.5
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 26e1ec80f97e1b178836c3ea731b09a97dd8b9c8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Sep 5 10:41:29 2016 +0200

    quagga: Pre-create PID directory with correct permissions
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 .../patches/python-rrdtool-fix-SEGV.patch          | 47 ----------------------
 python-rrdtool/python-rrdtool.nm                   |  4 +-
 quagga/quagga.nm                                   | 12 +++++-
 3 files changed, 13 insertions(+), 50 deletions(-)
 delete mode 100644 python-rrdtool/patches/python-rrdtool-fix-SEGV.patch

Difference in files:
diff --git a/python-rrdtool/patches/python-rrdtool-fix-SEGV.patch b/python-rrdtool/patches/python-rrdtool-fix-SEGV.patch
deleted file mode 100644
index c45316d..0000000
--- a/python-rrdtool/patches/python-rrdtool-fix-SEGV.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a45ed2ad6f92730a479522c46febb1b56b442aba Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer(a)ipfire.org>
-Date: Mon, 23 Nov 2015 02:15:33 +0000
-Subject: [PATCH] Fix crash in lastupdate() method
-
-When a RRD database contains floating point values, the
-PyRRD_Int_FromString function returns NULL, which will then be tried
-to be put into a dictionary.
-This operation fails as PyDict_SetItemString does not handle NULL
-and the program crashes with SEGV.
-
-This patch parses the value as a floating point number
-and will add that instead. If the value could not be parsed,
-None will be added instead.
-
-Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
----
- rrdtoolmodule.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/rrdtoolmodule.c b/rrdtoolmodule.c
-index dead4ff..4713850 100644
---- a/rrdtoolmodule.c
-+++ b/rrdtoolmodule.c
-@@ -880,9 +880,19 @@ _rrdtool_lastupdate(PyObject *self, PyObject *args)
-         PyDict_SetItemString(ret, "ds", ds_dict);
- 
-         for (i = 0; i < ds_cnt; i++) {
--            PyDict_SetItemString(ds_dict,
--                ds_names[i],
--                PyRRD_Int_FromString(last_ds[i], NULL, 10));
-+            PyObject* val = Py_None;
-+
-+            double num;
-+            if (sscanf(last_ds[i], "%lf", &num) == 1) {
-+                val = PyFloat_FromDouble(num);
-+            }
-+
-+            if (!val)
-+                return NULL;
-+
-+            PyDict_SetItemString(ds_dict, ds_names[i], val);
-+            Py_DECREF(val);
-+
-             free(last_ds[i]);
-             free(ds_names[i]);
-         }
diff --git a/python-rrdtool/python-rrdtool.nm b/python-rrdtool/python-rrdtool.nm
index 7fa8b8b..68045f0 100644
--- a/python-rrdtool/python-rrdtool.nm
+++ b/python-rrdtool/python-rrdtool.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = python-rrdtool
-version    = 0.1.2
+version    = 0.1.5
 release    = 1
 
 groups     = System/Libraries
@@ -17,7 +17,7 @@ description
 	object-oriented way to work with Round Robin Databases.
 end
 
-source_dl  = https://pypi.python.org/packages/source/r/rrdtool/
+source_dl  = https://github.com/commx/python-rrdtool/archive/v%{version}.tar.gz#/
 
 build
 	requires
diff --git a/quagga/quagga.nm b/quagga/quagga.nm
index 33b2530..57965a3 100644
--- a/quagga/quagga.nm
+++ b/quagga/quagga.nm
@@ -5,7 +5,7 @@
 
 name       = quagga
 version    = 1.0.20160315
-release    = 1
+release    = 2
 
 groups     = Networking/Routing
 url        = http://www.quagga.net/
@@ -31,8 +31,13 @@ build
 		systemd-units
 	end
 
+	prepare_cmds
+		%{create_user}
+	end
+
 	configure_options += \
 		--sysconfdir=/etc/quagga \
+		--localstatedir=%{localstatedir}/run/quagga \
 		--disable-static \
 		--disable-watchquagga \
 		--enable-multipath=64 \
@@ -40,6 +45,11 @@ build
 		--disable-pimd \
 		--disable-ripd \
 		--disable-ripngd
+
+	install_cmds
+		mkdir -pv %{localstatedir}/run/quagga
+		chown -v quagga.quagga %{localstatedir}/run/quagga
+	end
 end
 
 create_user


hooks/post-receive
--
IPFire 3.x development tree