Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b0446d307b97190889987e1efa31c5dfad3a7207)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b0446d307b97190889987e1efa31c5dfad3a7207)
  • Date: Thu, 1 Mar 2018 12:42:29 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

devel/autoconf-archive/DETAILS | 4 ++--
devel/autoconf-archive/HISTORY | 3 +++
utils/syslog-ng/DETAILS | 4 ++--
utils/syslog-ng/HISTORY | 5 +++++
utils/syslog-ng/PRE_BUILD | 3 ---
utils/syslog-ng/json-c.patch | 33 ---------------------------------
6 files changed, 12 insertions(+), 40 deletions(-)

New commits:
commit b0446d307b97190889987e1efa31c5dfad3a7207
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

syslog-ng: => 3.14.1

commit 7927efff9419d66796a27319d2715b277644669a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

autoconf-archive: => 2017.09.28

diff --git a/devel/autoconf-archive/DETAILS b/devel/autoconf-archive/DETAILS
index 9df6aef..9ecec32 100755
--- a/devel/autoconf-archive/DETAILS
+++ b/devel/autoconf-archive/DETAILS
@@ -1,5 +1,5 @@
SPELL=autoconf-archive
- VERSION=2016.09.16
+ VERSION=2017.09.28
SOURCE=${SPELL}-${VERSION}.tar.xz
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
SOURCE2_IGNORE=signature
DOC_DIRS=""
DOCS="NEWS"
- WEB_SITE=http://www.gnu.org/software/autoconf-archive/
+ WEB_SITE=https://www.gnu.org/software/autoconf-archive/
ENTERED=20161230
LICENSE[0]=GPL
KEYWORDS="devel"
diff --git a/devel/autoconf-archive/HISTORY b/devel/autoconf-archive/HISTORY
index b490ee2..a268684 100644
--- a/devel/autoconf-archive/HISTORY
+++ b/devel/autoconf-archive/HISTORY
@@ -1,2 +1,5 @@
+2018-03-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2017.09.28
+
2016-12-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS: created spell, version 2016.09.16
diff --git a/utils/syslog-ng/DETAILS b/utils/syslog-ng/DETAILS
index 6dede5f..b7a18ed 100755
--- a/utils/syslog-ng/DETAILS
+++ b/utils/syslog-ng/DETAILS
@@ -1,6 +1,6 @@
SPELL=syslog-ng
- VERSION=3.13.2
-
SOURCE_HASH=sha512:e6a1bff45c31962f7de01f5f6400c1b59fbcaa5510081e10dce519c1c56172504d13cff92eea85606170c03959a44509120c53cc529618aecef86ed8d952609a
+ VERSION=3.14.1
+
SOURCE_HASH=sha512:108fb03dd95058ca9c30cbfffb5530cc4465a17605d3580575238f93b6f5a6d111b06ea305991673e1ea59716ce6ab4efd8e03bea7ace42923bafbd16538ba21
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${SPELL}-${VERSION}
SOURCE_URL[0]=https://github.com/balabit/${SPELL}/archive/${SOURCE}
diff --git a/utils/syslog-ng/HISTORY b/utils/syslog-ng/HISTORY
index 17e8ef8..1a6bcc0 100644
--- a/utils/syslog-ng/HISTORY
+++ b/utils/syslog-ng/HISTORY
@@ -1,3 +1,8 @@
+2018-03-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.14.1
+ * PRE_BUILD: adjust
+ * json-c.patch: deleted
+
2018-01-28 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD, json-c.patch: added upstream patch for building with
json-c >= 0.13
diff --git a/utils/syslog-ng/PRE_BUILD b/utils/syslog-ng/PRE_BUILD
index d8e4631..1fa4c90 100755
--- a/utils/syslog-ng/PRE_BUILD
+++ b/utils/syslog-ng/PRE_BUILD
@@ -1,7 +1,4 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-# For json-c >= 0.13
-patch -p1 < "${SPELL_DIRECTORY}/json-c.patch" &&
-
skip_submodules=yes ./autogen.sh
diff --git a/utils/syslog-ng/json-c.patch b/utils/syslog-ng/json-c.patch
deleted file mode 100644
index a30d03f..0000000
--- a/utils/syslog-ng/json-c.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82 AT fedoraproject.org>
-Date: Mon, 11 Dec 2017 15:46:06 +0100
-Subject: [PATCH] modules/json: Adaptions for json-c v0.13
-
----
- modules/json/json-parser.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
-index 0368ed8f7f..356df48b9f 100644
---- a/modules/json/json-parser.c
-+++ b/modules/json/json-parser.c
-@@ -20,6 +20,8 @@
- * COPYING for details.
- */
-
-+#define JSON_C_VER_013 (13 << 8)
-+
- #include "json-parser.h"
- #include "dot-notation.h"
- #include "scratch-buffers.h"
-@@ -28,7 +30,10 @@
- #include <ctype.h>
-
- #include <json.h>
-+
-+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
- #include <json_object_private.h>
-+#endif
-
- typedef struct _JSONParser
- {



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b0446d307b97190889987e1efa31c5dfad3a7207), Treeve Jelbert, 03/01/2018

Archive powered by MHonArc 2.6.24.

Top of Page