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
johu · Feb 9, 2018 · cd2e1aa · cd2e1aa
1 parent b157b00
commit cd2e1aa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/...8.32.0-fix-building-without-curl-r2.patch → ...8.32.0-fix-building-without-curl-r3.patch b/...8.32.0-fix-building-without-curl-r2.patch → ...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 <sys/types.h>
+ #include <libestr.h>
+ #include <time.h>
++
++#ifdef HAVE_LIBCURL
+ #include <curl/curl.h>
++#endif
++
+ #include "rsyslog.h"
+ #include "rainerscript.h"
+ #include "conf.h"
diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild → app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild → 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"