From patchwork Wed Jun 15 13:17:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 635863 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rV6XB1Ns0z9t1P for ; Wed, 15 Jun 2016 23:18:18 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=qqHGeJ/U; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 60F8D331D9; Wed, 15 Jun 2016 13:18:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id juH+zFFgiyZa; Wed, 15 Jun 2016 13:18:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AFF3D331D8; Wed, 15 Jun 2016 13:18:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D7F3D1C0D28 for ; Wed, 15 Jun 2016 13:18:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D0066331D7 for ; Wed, 15 Jun 2016 13:18:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CcD10jd6wScF for ; Wed, 15 Jun 2016 13:18:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by silver.osuosl.org (Postfix) with ESMTPS id 5F503331A9 for ; Wed, 15 Jun 2016 13:18:03 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id 187so3969715wmz.1 for ; Wed, 15 Jun 2016 06:18:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7peO+pCb7fdC5ceEENn/xl4aQcPCU46tadv/v9riKkk=; b=qqHGeJ/Uin2dymvdTQim/blxBwaIKlDeSrTw6niCHGRZr8oqyLko8xq8Nrhkbn4/z8 UStY62AavygNClErAr7204YkHvSYQkcJuR8046cUziu4wgJ/leRX7b/CYgL3ovq50RC8 DCzs/rQ9zIVWmfsxejC2f+S9ipnuUu77vbZZix5rlR6RgpIbB/SeAvraGrSEB7C8qwFu 9CliuNsTyYMtosSMJLAvssKLSqWarNw7C6ZRXcjWUmvd3xjvOvXPZAn8KilXsPX1G0id mqMhheAAVWnbIS6xjH/hIrYFogwq4agbCX4b6L61RMf43vcEUq1DFpVHDXBVg0RPVAkW w6Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=7peO+pCb7fdC5ceEENn/xl4aQcPCU46tadv/v9riKkk=; b=jSegUHOP/DaAm6aJ8ygzWK/nCn5ZooCaWUquHayLde3uWyMCpE//MQ+r7qQCCCFnVV 5s8RzbVLmVlge+HSNyxxKG4KhBEE9DVavQ8xj8NFr1aKV4RJEgDuX6Cp3Qj9AziKAMx1 O5MXdcjinTfpsZ8aWmoLcYKj0j0UQCeQYSJenfrRR6IdCfGUycRKS/U5mXXm4EjRp08S Jvk8j9wsngCSn65lU3oegxoI8P6MSmHGnVPLULSFfny4l5nGLiPDhAF2qFb/BkmfzLt2 T03kfU2iepWDa9FSn+RM44htm/KTJp8NxdZ4cFN3L9GUFRWCnVie6kQ1eUrW1fntDz34 ZYSg== X-Gm-Message-State: ALyK8tKE02/r3fT/T5DCrv04C1GEcv1uBR/OVisNroC/xdtjokTw2PYj61uW5Al3LreEvQ== X-Received: by 10.194.81.72 with SMTP id y8mr12147497wjx.83.1465996681933; Wed, 15 Jun 2016 06:18:01 -0700 (PDT) Received: from dell.be.48ers.dk ([91.183.172.93]) by smtp.gmail.com with ESMTPSA id x10sm24816644wjj.14.2016.06.15.06.18.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2016 06:18:01 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.84) (envelope-from ) id 1bDAhk-0001gm-OJ; Wed, 15 Jun 2016 15:18:00 +0200 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 15 Jun 2016 15:17:47 +0200 Message-Id: <1465996668-6444-2-git-send-email-peter@korsgaard.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1465996668-6444-1-git-send-email-peter@korsgaard.com> References: <1465996668-6444-1-git-send-email-peter@korsgaard.com> Subject: [Buildroot] [PATCH 2/3] rsyslog: bump version to 8.19.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" And drop patch now upstream. Rsyslog now uses libfastjson instead of json-c, so adjust dependencies. Signed-off-by: Peter Korsgaard --- package/rsyslog/0001-musl-fcntl-h.patch | 30 ------------------------------ package/rsyslog/Config.in | 4 ++-- package/rsyslog/rsyslog.hash | 2 +- package/rsyslog/rsyslog.mk | 4 ++-- 4 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 package/rsyslog/0001-musl-fcntl-h.patch diff --git a/package/rsyslog/0001-musl-fcntl-h.patch b/package/rsyslog/0001-musl-fcntl-h.patch deleted file mode 100644 index 5c2daee..0000000 --- a/package/rsyslog/0001-musl-fcntl-h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 835571774dc519dd2cff7ab1020cf298cc953a8f Mon Sep 17 00:00:00 2001 -From: Thordur Bjornsson -Date: Tue, 7 Jul 2015 12:34:08 +0200 -Subject: [PATCH] omfile: unconditionally include fcntl.h. - -required for open() flags - -Signed-off-by: Thordur Bjornsson -[Bernd: downloaded from upstream commit: - https://github.com/rsyslog/rsyslog/commit/835571774dc519dd2cff7ab1020cf298cc953a8f -Signed-off-by: Bernd Kuhls ---- - tools/omfile.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/tools/omfile.c b/tools/omfile.c -index 482e723..4444b97 100644 ---- a/tools/omfile.c -+++ b/tools/omfile.c -@@ -48,9 +48,7 @@ - #include - #include - #include --#ifdef OS_SOLARIS --# include --#endif -+#include - #ifdef HAVE_ATOMIC_BUILTINS - # include - #endif diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in index 3599207..241ee2e 100644 --- a/package/rsyslog/Config.in +++ b/package/rsyslog/Config.in @@ -3,11 +3,11 @@ config BR2_PACKAGE_RSYSLOG select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBESTR select BR2_PACKAGE_LIBLOGGING - select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBFASTJSON depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # modules - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libfastjson help Rsyslog is a powerful and flexible syslog implementation diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 5f9e0ed..7dc341a 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,2 +1,2 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc rsyslog-8.9.0.tar.gz +sha256 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e rsyslog-8.19.0.tar.gz diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 5dde924..40e3b33 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,11 +4,11 @@ # ################################################################################ -RSYSLOG_VERSION = 8.9.0 +RSYSLOG_VERSION = 8.19.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPLv3, LGPLv3, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 -RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c host-pkgconf +RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99' RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \