| 1 |
commit: cd2e1aa22d7d3e899a09d74030bc785fac170d53 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 9 23:16:41 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 9 23:21:26 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2e1aa2 |
| 7 |
|
| 8 |
app-admin/rsyslog: Fix building without net-misc/curl |
| 9 |
|
| 10 |
Previous patch was incomplete and missed a header include. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/646262 |
| 13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 14 |
RepoMan-Options: --force |
| 15 |
|
| 16 |
...h => rsyslog-8.32.0-fix-building-without-curl-r3.patch} | 14 ++++++++++++++ |
| 17 |
.../{rsyslog-8.32.0-r2.ebuild => rsyslog-8.32.0-r3.ebuild} | 2 +- |
| 18 |
2 files changed, 15 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
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 |
| 21 |
similarity index 93% |
| 22 |
rename from app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch |
| 23 |
rename to app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch |
| 24 |
index 23a189d0309..534183a8ca2 100644 |
| 25 |
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch |
| 26 |
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch |
| 27 |
@@ -121,3 +121,17 @@ https://github.com/rsyslog/rsyslog/commit/50205ced0fc22e74f26f2a07b557b69c5d30e1 |
| 28 |
omelasticsearch_la_LDFLAGS = -module -avoid-version |
| 29 |
omelasticsearch_la_LIBADD = $(CURL_LIBS) $(LIBM) |
| 30 |
|
| 31 |
+--- a/grammar/rainerscript.c |
| 32 |
++++ b/grammar/rainerscript.c |
| 33 |
+@@ -36,7 +36,11 @@ |
| 34 |
+ #include <sys/types.h> |
| 35 |
+ #include <libestr.h> |
| 36 |
+ #include <time.h> |
| 37 |
++ |
| 38 |
++#ifdef HAVE_LIBCURL |
| 39 |
+ #include <curl/curl.h> |
| 40 |
++#endif |
| 41 |
++ |
| 42 |
+ #include "rsyslog.h" |
| 43 |
+ #include "rainerscript.h" |
| 44 |
+ #include "conf.h" |
| 45 |
|
| 46 |
diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild |
| 47 |
similarity index 99% |
| 48 |
rename from app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild |
| 49 |
rename to app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild |
| 50 |
index 71638d76e21..33668a1674d 100644 |
| 51 |
--- a/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild |
| 52 |
+++ b/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild |
| 53 |
@@ -48,7 +48,7 @@ else |
| 54 |
doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 55 |
" |
| 56 |
|
| 57 |
- PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r2.patch ) |
| 58 |
+ PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch ) |
| 59 |
fi |
| 60 |
|
| 61 |
LICENSE="GPL-3 LGPL-3 Apache-2.0" |
Archives