From patchwork Mon Oct 26 00:36:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 535645 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 7FE9C141353 for ; Mon, 26 Oct 2015 11:36:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=EY4tYtii; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CD773874BA; Mon, 26 Oct 2015 00:36:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SOzWipPp0aWf; Mon, 26 Oct 2015 00:36:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6717787355; Mon, 26 Oct 2015 00:36:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 601221C0FD0 for ; Mon, 26 Oct 2015 00:36:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5B0C588373 for ; Mon, 26 Oct 2015 00:36:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m5qcciBarat2 for ; Mon, 26 Oct 2015 00:36:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id 814968AFB0 for ; Mon, 26 Oct 2015 00:36:36 +0000 (UTC) Received: by pasz6 with SMTP id z6so169741026pas.2 for ; Sun, 25 Oct 2015 17:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vDh21Se6UqBIICEcOlMwcf4az4V6PgSFj75HumiBu8U=; b=EY4tYtiiJOdI4yy3h9peI4RExLnkPMjjBpTBYdypDVgwBAq653iClhRHc4UrJZzgCX XLCAxOo6KRP+6HcttisYLdSZLPQXcQUX10ZCoVMg/pCnJpxmgwF4/OkSGXlwfnrmdC/G EBnrRL/8TfD6J+AcrkUMzz3aT9vFzLjZbdXxq5RwomOwBJz4zTUeG91HD7cRRPbF35Rx dwWb0r+JrZJucnfyWW6oSl+o/2eGsl2VyRirZ0hkn1bU7E/ii3ddIYySuKWglJ0Vx704 Y1s2G71FluzEXnmZrTTsRBmu7M6NzpOn4Mrasj+uUOPNT0RT/WEJWNZn7Z2F65HI/uPW eUdg== X-Received: by 10.66.90.231 with SMTP id bz7mr18426937pab.47.1445819796040; Sun, 25 Oct 2015 17:36:36 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc (2-163-36-202-static.alliedtelesis.co.nz. [202.36.163.2]) by smtp.gmail.com with ESMTPSA id ir5sm30439280pbc.13.2015.10.25.17.36.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 25 Oct 2015 17:36:35 -0700 (PDT) From: Chris Packham To: buildroot@buildroot.org Date: Mon, 26 Oct 2015 13:36:16 +1300 Message-Id: <1445819776-7028-2-git-send-email-judge.packham@gmail.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1445819776-7028-1-git-send-email-judge.packham@gmail.com> References: <1445819776-7028-1-git-send-email-judge.packham@gmail.com> Subject: [Buildroot] [PATCH 2/2] syslog-ng: Fix build error 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" Add an upstream patch to fix the following build error. error: redefinition of typedef 'TransportMapperUnix' Fixes: http://autobuild.buildroot.net/results/c9b/c9b31d2de72a4e48a213b5c1d011814566732dfb Signed-off-by: Chris Packham --- package/syslog-ng/syslog-ng.hash | 1 + package/syslog-ng/syslog-ng.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 1c074a5..fed2475 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -5,3 +5,4 @@ sha256 77fcbe7d6df23e710a81d8e065e17ab91b14d580aead65bb292e4f25b4369192 f10941e sha256 4547b44d8241be716f321d2aed225197e517db9912d6aedd8565765b427db6f2 96a633ce3f46ed102f38115000730bad41c4ed65.patch sha256 15cdd963f5cae0e113724fb202baccc0056f8618723d7f7290f15e082f9e16cd 00526014247bb63680e53c35d4a76d0dac989405.patch sha256 ec76ed27ab01f9487a8adf092655bc99167a9e81f6be685a8a45fdb1b07cca32 46b07ecaffc154aa7cc713409196020736fe4f33.patch +sha256 737b34b4457a1fa9cd38be6a98119f131f7d64e82480011880c178d3d2618dea e30fe7c3717a7bda4036448c7777747df1a4e0f9.patch diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 99b2a06..1f51e04 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -19,7 +19,8 @@ SYSLOG_NG_PATCH = \ https://github.com/balabit/syslog-ng/commit/f10941e565d402e032948bb9711bfbab43eadd88.patch \ https://github.com/balabit/syslog-ng/commit/96a633ce3f46ed102f38115000730bad41c4ed65.patch \ https://github.com/balabit/syslog-ng/commit/00526014247bb63680e53c35d4a76d0dac989405.patch \ - https://github.com/balabit/syslog-ng/commit/46b07ecaffc154aa7cc713409196020736fe4f33.patch + https://github.com/balabit/syslog-ng/commit/46b07ecaffc154aa7cc713409196020736fe4f33.patch \ + https://github.com/balabit/syslog-ng/commit/e30fe7c3717a7bda4036448c7777747df1a4e0f9.patch # We override busybox's S01logging init script ifeq ($(BR2_PACKAGE_BUSYBOX),y)