From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6D8191382C5 for ; Fri, 9 Feb 2018 23:21:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EEC1E0A00; Fri, 9 Feb 2018 23:21:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B363E0A00 for ; Fri, 9 Feb 2018 23:21:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48C7A335C53 for ; Fri, 9 Feb 2018 23:21:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 968251CD for ; Fri, 9 Feb 2018 23:21:39 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1518218486.cd2e1aa22d7d3e899a09d74030bc785fac170d53.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild X-VCS-Directories: app-admin/rsyslog/ app-admin/rsyslog/files/8-stable/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: cd2e1aa22d7d3e899a09d74030bc785fac170d53 X-VCS-Branch: master Date: Fri, 9 Feb 2018 23:21:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a90381b8-0468-4a81-9f96-9c77e93107d1 X-Archives-Hash: a991a7e93ac2ee4b36df2e584aa23ddd commit: cd2e1aa22d7d3e899a09d74030bc785fac170d53 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Feb 9 23:16:41 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Feb 9 23:21:26 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2e1aa2 app-admin/rsyslog: Fix building without net-misc/curl Previous patch was incomplete and missed a header include. Closes: https://bugs.gentoo.org/646262 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --force ...h => rsyslog-8.32.0-fix-building-without-curl-r3.patch} | 14 ++++++++++++++ .../{rsyslog-8.32.0-r2.ebuild => rsyslog-8.32.0-r3.ebuild} | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch similarity index 93% rename from app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch rename to app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch index 23a189d0309..534183a8ca2 100644 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch @@ -121,3 +121,17 @@ https://github.com/rsyslog/rsyslog/commit/50205ced0fc22e74f26f2a07b557b69c5d30e1 omelasticsearch_la_LDFLAGS = -module -avoid-version omelasticsearch_la_LIBADD = $(CURL_LIBS) $(LIBM) +--- a/grammar/rainerscript.c ++++ b/grammar/rainerscript.c +@@ -36,7 +36,11 @@ + #include + #include + #include ++ ++#ifdef HAVE_LIBCURL + #include ++#endif ++ + #include "rsyslog.h" + #include "rainerscript.h" + #include "conf.h" diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild rename to app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild index 71638d76e21..33668a1674d 100644 --- a/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild +++ b/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild @@ -48,7 +48,7 @@ else doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " - PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r2.patch ) + PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0"