Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sagan/files/
Date: Fri, 01 Jul 2016 08:02:48
Message-Id: 1467358463.58cff433633244d936dc2d2f02fe492c8d060ed7.monsieurp@gentoo
1 commit: 58cff433633244d936dc2d2f02fe492c8d060ed7
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Jun 29 20:10:22 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 1 07:34:23 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58cff433
7
8 app-admin/sagan: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/1796
11
12 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
13
14 app-admin/sagan/files/json_header_location.patch | 26 ------------------------
15 1 file changed, 26 deletions(-)
16
17 diff --git a/app-admin/sagan/files/json_header_location.patch b/app-admin/sagan/files/json_header_location.patch
18 deleted file mode 100644
19 index 78a3488..0000000
20 --- a/app-admin/sagan/files/json_header_location.patch
21 +++ /dev/null
22 @@ -1,26 +0,0 @@
23 -diff --git a/configure.ac b/configure.ac
24 ---- a/configure.ac
25 -+++ b/configure.ac
26 -@@ -194,7 +194,7 @@
27 - if test "$LOGNORM" = "yes"; then
28 - AC_MSG_RESULT([------- liblognorm support is enabled -------])
29 - AC_CHECK_HEADER([liblognorm.h])
30 -- AC_CHECK_HEADERS([json/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable.
31 -+ AC_CHECK_HEADERS([json-c/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable.
32 - This library is important for the correlation aspects of Sagan! Please see
33 - https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
34 - use the --disable-lognorm flag.])])
35 -diff --git a/src/sagan-liblognorm.c b/src/sagan-liblognorm.c
36 ---- a/src/sagan-liblognorm.c
37 -+++ b/src/sagan-liblognorm.c
38 -@@ -40,9 +40,7 @@
39 - #include <lognorm.h>
40 -
41 - #if defined(HAVE_JSON_JSON_H)
42 --# include <json/json.h>
43 --#else
44 --# include <json.h>
45 -+# include <json-c/json.h>
46 - #endif
47 -
48 - #include "sagan.h"