diff options
Diffstat (limited to 'app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch')
| -rw-r--r-- | app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch | 137 |
1 files changed, 0 insertions, 137 deletions
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch deleted file mode 100644 index 534183a8ca29..000000000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch +++ /dev/null @@ -1,137 +0,0 @@ -https://github.com/rsyslog/rsyslog/commit/d9475f133e3c79875a7c4ccd92038b7123c1f155 -https://github.com/rsyslog/rsyslog/commit/468eeb79b8da91fb71dfef6bfb25476b2a37f446 -https://github.com/rsyslog/rsyslog/commit/50205ced0fc22e74f26f2a07b557b69c5d30e168 - ---- a/grammar/rainerscript.c -+++ b/grammar/rainerscript.c -@@ -1935,6 +1935,7 @@ num2ipv4(struct svar *__restrict__ const sourceVal) { - return(estr); - } - -+#ifdef HAVE_LIBCURL - /* curl callback for doFunc_http_request */ - static size_t - curlResult(void *ptr, size_t size, size_t nmemb, void *userdata) -@@ -2010,6 +2011,7 @@ doFunc_http_request(struct cnffunc *__restrict__ const func, - } - RETiRet; - } -+#endif - - static int ATTR_NONNULL(1,3,4) - doFunc_is_time(const char *__restrict__ const str, -@@ -2513,11 +2515,16 @@ doFuncCall(struct cnffunc *__restrict__ const func, struct svar *__restrict__ co - if(bMustFree2) free(str2); - break; - case CNFFUNC_HTTP_REQUEST: -+#ifdef HAVE_LIBCURL - cnfexprEval(func->expr[0], &r[0], usrptr, pWti); - str = (char*) var2CString(&r[0], &bMustFree); - doFunc_http_request(func, ret, str); - if(bMustFree) free(str); - varFreeMembers(&r[0]); -+#else -+ LogError(0, RS_RET_INTERNAL_ERROR, -+ "rainerscript: internal error: HTTP_Fetch not supported, not built with libcurl support"); -+#endif - break; - default: - if(Debug) { - ---- a/configure.ac -+++ b/configure.ac -@@ -454,6 +454,8 @@ if test "$enable_libcurl" = "yes"; then - ) - fi - -+AM_CONDITIONAL(ENABLE_LIBCURL, test "x${enable_libcurl}" = "xyes") -+ - # klog - AC_ARG_ENABLE(klog, - [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])], - ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -226,7 +226,6 @@ TESTS += \ - rscript_contains.sh \ - rscript_bare_var_root.sh \ - rscript_bare_var_root-empty.sh \ -- rscript_http_request.sh \ - rscript_ipv42num.sh \ - rscript_field.sh \ - rscript_stop.sh \ -@@ -305,7 +304,11 @@ TESTS += \ - lookup_table_rscript_reload.sh \ - lookup_table_rscript_reload_without_stub.sh \ - multiple_lookup_tables.sh --endif -+if ENABLE_LIBCURL -+TESTS += \ -+ rscript_http_request.sh -+endif # ENABLE_LIBCURL -+endif # ENABLE_TESTBENCH2 - - if HAVE_VALGRIND - TESTS += \ -@@ -313,7 +316,6 @@ TESTS += \ - mmexternal-InvldProg-vg.sh \ - internal-errmsg-memleak-vg.sh \ - rscript_set_memleak-vg.sh \ -- rscript_http_request-vg.sh \ - no-parser-vg.sh \ - discard-rptdmsg-vg.sh \ - discard-allmark-vg.sh \ -@@ -338,6 +340,10 @@ TESTS += \ - multiple_lookup_tables-vg.sh \ - fac_local0-vg.sh \ - rscript_trim-vg.sh -+if ENABLE_LIBCURL -+TESTS += \ -+ rscript_http_request-vg.sh -+endif # ENABLE_LIBCURL - endif # HAVE_VALGRIND - - if ENABLE_ROOT_TESTS - ---- a/grammar/Makefile.am -+++ b/grammar/Makefile.am -@@ -12,8 +12,11 @@ libgrammar_la_SOURCES = \ - parserif.h \ - grammar.h - libgrammar_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS) --#libgrammar_la_LIBADD = $(CURL_LIBS) $(RSRT_LIBS) $(SOL_LIBS) --libgrammar_la_LIBADD = $(CURL_LIBS) -+libgrammar_la_LIBADD = -+if ENABLE_LIBCURL -+libgrammar_la_CPPFLAGS += $(CURL_CFLAGS) -+libgrammar_la_LIBADD += $(CURL_LIBS) -+endif - - #testdriver_SOURCES = testdriver.c libgrammar.la - #testdriver_CPPFLAGS = $(RSRT_CFLAGS) - ---- a/plugins/omelasticsearch/Makefile.am -+++ b/plugins/omelasticsearch/Makefile.am -@@ -1,7 +1,7 @@ - pkglib_LTLIBRARIES = omelasticsearch.la - - omelasticsearch_la_SOURCES = omelasticsearch.c --omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) -+omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(CURL_CFLAGS) - 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" |