diff options
author | Mariusz `shd` Gliwiński <shd@nawia.net> | 2015-10-28 13:35:09 +0100 |
---|---|---|
committer | Mariusz `shd` Gliwiński <shd@nawia.net> | 2015-10-28 13:35:09 +0100 |
commit | 6783f8dd7b197a4dc02de33a24f07d229063e339 (patch) | |
tree | a74929a3b17159403be7468a4737a6276c5ed1db /pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch | |
parent | 51ca02f95fce5cbe1021e66047206841b84d7075 (diff) | |
download | nixlib-6783f8dd7b197a4dc02de33a24f07d229063e339.tar nixlib-6783f8dd7b197a4dc02de33a24f07d229063e339.tar.gz nixlib-6783f8dd7b197a4dc02de33a24f07d229063e339.tar.bz2 nixlib-6783f8dd7b197a4dc02de33a24f07d229063e339.tar.lz nixlib-6783f8dd7b197a4dc02de33a24f07d229063e339.tar.xz nixlib-6783f8dd7b197a4dc02de33a24f07d229063e339.tar.zst nixlib-6783f8dd7b197a4dc02de33a24f07d229063e339.zip |
ntopng: 1.2.1 -> 2.0.0
Diffstat (limited to 'pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch')
-rw-r--r-- | pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch b/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch index 99467c371264..50ed1daebd48 100644 --- a/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch +++ b/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch @@ -1,29 +1,14 @@ -From d77b42003d13e2775be3255a26f380d6ccda8042 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com> -Date: Tue, 3 Dec 2013 21:10:06 +0000 -Subject: [PATCH 2/2] Remove requirement to have writeable callback dir - -* ntopng doesn't write anything to the callback dir -* it seems to be a copy-paste leftover error from data_dir a couple of - lines above ---- - Ntop.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Ntop.cpp b/Ntop.cpp -index 2fb027b..0b4881b 100644 ---- a/Ntop.cpp -+++ b/Ntop.cpp -@@ -114,8 +114,7 @@ void Ntop::registerPrefs(Prefs *_prefs) { +diff --git a/src/Ntop.cpp b/src/Ntop.cpp +index 8de92a9..510418f 100644 +--- a/src/Ntop.cpp ++++ b/src/Ntop.cpp +@@ -197,8 +197,7 @@ void Ntop::registerPrefs(Prefs *_prefs) { } if(stat(prefs->get_callbacks_dir(), &statbuf) -- || (!(statbuf.st_mode & S_IFDIR)) /* It's not a directory */ +- || (!(statbuf.st_mode & S_IFDIR)) /* It's not a directory */ - || (!(statbuf.st_mode & S_IWRITE)) /* It's not writable */) { -+ || (!(statbuf.st_mode & S_IFDIR))) { /* It's not a directory */ ++ || (!(statbuf.st_mode & S_IFDIR)) /* It's not a directory */) { ntop->getTrace()->traceEvent(TRACE_ERROR, "Invalid directory %s specified", prefs->get_callbacks_dir()); - exit(-1); --- -1.8.4.3 - + _exit(-1); |