diff --git a/Manifest b/Manifest
index 1e8dceb504f1..61a5a9492e0d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 28853 BLAKE2B c560f2dbf9fe3a440e8e9ae6a46cf19ccaefd0fe4c63a745a90ee430e5388322f6f567ec482f789d4c2ce8b0208fb9939dd0c09b6e89aa8656281c8e75af2da9 SHA512 ab93c368cc92c74dd99ee988334c2ee7d0a816a7432f4bddad8e500ab663dce5c3eba76cff0133ad1b7fa3af46ac5393a95a7812acdf22b4c0fab8f111ca39df
-TIMESTAMP 2018-01-11T13:09:36Z
+MANIFEST Manifest.files.gz 28862 BLAKE2B e534ed235032ee3445a1add218e64ec06ea8d50e8f99efe1e19371af80aac035211d8535738df976f13dc25710c33b92d9c229b964fc83375629bcc50cd6bc7e SHA512 954fbb326b3d77cad021996de336fdb1b3887be1d0242c67070b6f20cd3e73ca6cdbe932ab2304c7fcc205d90b464067246eb133f09b28856081f3b016f40ebf
+TIMESTAMP 2018-01-11T21:09:37Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpXYhBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpX0pFfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBxCBAArcmBkS+OI1DpOdwEa2zEVeGUimOEQrP/Ss53djbxnKmVwIUnxDFuxlOC
-Ifd2oHk2G0xmDdK5YHi5mATd8C9mMYH0zeAfO317T5nXKr2Ev7P5nIUxrX51JIJM
-LoAkV2mEbdXxPo6jv7iArKLgb/DO/a4G8T96voI4EV69+TG9A9snCU/pgGe0Mu9h
-7qCLesm9sWLPGFYxm5ufDBmt+MgQ8sEp8u/0d5rshCGdHTZUBLnfCs+7dmOjBUbV
-Jsyxk3Gmt6r3EQqnBUUdEGW2WsI8uSHk2eqWuCtALMx3fTI9Vhk0DOrLExjSbc0w
-ue7vGwkiCFubeDCDctEr9Qsg+uOeArPTavhAmW8ITTIEtu/kqvJhvyd01Q0RzBuL
-XsaynGfwOrRs+gP0OwJWVkQ6qDUapYTWxVhqqRn/FnAPVqkwCqu+gNrmxpatqd7X
-ZnY1B4Wsy3qqWmE5a/maJCosVdlKW1pe+AfZCC3+a0THHnkkLTw/ArBUPKp4C5xy
-2KN4P4N/H5cS7xjBg3gDjJhcigDjtz94i8AR28v+hM3oSlLj2YlCd0k4alwbVe22
-IH57tZNSQRGI2E1u0p69JA2bplkWmj/IMwJzhghjaeZbgHXTR6OsPiFnuS0uMr7j
-3YuGxPLqJykd82AMWpn8sn2kSELpGy59/xFPMebH5Lq+FcZO/ho=
-=QTiD
+klBfJQ/+KG1b+S/wFpizzzHkAMH28aAjRhdO+JuuDXBShe/WsIpsaS8vr5xxbR6G
+WEB7vTpjZ8rT0So1FhvXaSp9hjvfEIcfLDBDgAzAn8wOXjYbUEWV98a0MJTpYe2M
+ILB+KnDzqNVU1xiYEONZwkC7bO7kaAdRx0PxDr3+mZbERisRTpE2I5oNvmU6IAqU
+qGrR0GFjx8g/hknDkTsF/RhilbrRzkhI/d88p6d4Nv8B2w2tsExmqpJuehwhv5LS
+tYj22VK535lkaa7HxBP0IyT/RrRtbJR2E7CHnpbY/zLp/i7lPxlxVVHG20lxJVw5
+zZ+WqXYqVb/KaC3RSuW1KdYuVDoib2XWsL3rAbiQ5BtGNKonhTYM1MCjgypXYBbD
+oljAC3zMA/sXCWmUrVigPgL9poU+H5FlPi6ZKeeRJ5XiOpU5x3sz2SAQ7fpJcuTD
+xSeoFri4+esFdu7YtCh6GQSJF4kD+qDmc/jBh8Ab0LGTbUwsk9KHr4vEL+il1abj
+MOcaLmbmJgWcippuEdSxzoYUwoaeOpycH4OBZunzQvUEiMRDicizYlK8XUfHqEKH
+QhiLUyzDHD55WLLw9u9dbisHMQrm2FxgR8mn/mb4NJXphMCL3hCf6U7sbKYpAomP
+hZGujcEniW4uMEocBrumrDzRRYkiqs4pIIopNwbjhZH3JwBfbvg=
+=IUV7
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 185c8cfb7f0c..bc584d735155 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e786eb174b5f..bfaa42ca664a 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index b0abcd05c66c..92c00fde9da5 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -7,6 +7,7 @@ AUX 8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
AUX 8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch 1556 BLAKE2B b8a7d1ccb3854f91a676b57332d4a944f5c781b82451b2d36f19e4237226da44cb41fc220260b1fd8bb2b46b62cbb81a4d392a1f116d31d50224ca781bb3b10f SHA512 374de4fb9a4e3c3b9e28ff2e5eca48b7744afc9a5ba222508661fdfa30037967b6a2497d0e82266010de27c1a540ebb300c15bf6049a1af9dcf019353c04acdc
AUX 8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch 509 BLAKE2B e50fd76f239be9fe15a0a7c8dd2b5984af69487c5ffe5a4f12e415f9c4040e600c5552dbe66c32879729c0f497bf74f1f63730b2f4c6a9a658fd385cb684cf05 SHA512 70bfe4f95b23e4e88e5b7535a1b86742a02438f2eadc6fd2e82c66ebdc9d59d983c1ded7d4902dd5d7ef9413847398c1318df82bace3b7e5b1ca8bd23ca9e8e4
AUX 8-stable/rsyslog-8.30.0-fix-kerberos.patch 736 BLAKE2B fb404b5435d861934c70677baec2c552ba576c989996431650df1f55d1a172d9e78fda6d74fc59c32c918a43affc4dec991a8e2808d41bc37f898ae7bdd08615 SHA512 8d72cad0106afdf953ce0cf8a5dd0ecfb7daf63c3e274c26e3283ac486de1fc4ce10a450019f1a11f067d320d299dc2b350e4cd5eda283c3b514864e924465a9
+AUX 8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch 2348 BLAKE2B ba570065c25253ead7e0a166fa897a9df38dc1f7030f00da2bb59105ed65c3a591fc6fd34286ce73e24b6b97698fd21acdf3cd5362f512206f85056349c780fe SHA512 19c4b36cde7fe3be3b98efd1a9dce34516c84349ac5c23d21394e1b0486f8e140fac3f7c0aa4627615657d6f030855d34e6f71c865dd228d80470330edf2dca9
AUX 8-stable/rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
AUX 8-stable/rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
AUX 8-stable/rsyslog.initd-r1 1758 BLAKE2B 1af0e2371067ac2c51bff7b9c4442abba8d8a14714b7604e2f49d244fb08bef7614e73cbad201e6f4902504abd78ab32fdd093acb5714d53238353c8a9bd977e SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265
@@ -20,6 +21,7 @@ DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d8
DIST rsyslog-8.29.0.tar.gz 2447907 BLAKE2B dd3a34e4c1b4edc989d58369933b94b11d89c044ca81715062cebaacae5003463ed233f26358418651f63643bd6d7cdfb4f3192324d59d596c87480e37f40493 SHA512 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952
DIST rsyslog-8.30.0.tar.gz 2468224 BLAKE2B 3c5c94661abc2e34d688ca08d6dea0d2bcca9f287f45328a0d1b240bcb1b9223800207ce8759da823fa3acd974fcc70f01565f95fbcec108f8f71c7cb14a2409 SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0
DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7
+DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac
DIST rsyslog-docs-8.19.0.tar.gz 4271094 BLAKE2B c866f66fc1ae9ef8c227a2e03bab4a815e408ccaafe9da97f8b6b6f6b89bb33d0c8a9e004552d5a1287a19bc8f3677517259a4f9bcebffbbeff506d80454945b SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
DIST rsyslog-docs-8.24.0.tar.gz 4344877 BLAKE2B a3d9ea90580c3e24e3c40c07f871740cdf33ad4206627586bfb42523a758cbd18f5303f35f2fa036e492dece9a83d9c151b60023aed99f63c42ed8f9bf7da9f1 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
DIST rsyslog-docs-8.25.0.tar.gz 4359583 BLAKE2B 349e057d3c94ca6fc92753459f8fca011927e82a787cc50685ebe1c5a40a624e4f74764b04cf00f5c250cd65eb6e2862d7225790cc029cd7256c072d63db1726 SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71
@@ -29,6 +31,7 @@ DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bb
DIST rsyslog-docs-8.29.0.tar.gz 4473644 BLAKE2B 18fc4aea0551f1ad770cd882aaf512424f8d4fc9f00ba6c4c8e9bbbcb0ea4d4da4ba31c53bad23e28ed761e27e6378657b085cb0d72cebdc233ba25160023daa SHA512 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc
DIST rsyslog-docs-8.30.0.tar.gz 4487378 BLAKE2B 7d39fc7642ec2122f254dd6660a13efa4b214ee669fe5772b4d68a8ce94ed5ac3ca2500c23b5752924b5befca2a66c228b6f2bb48c7b9f72a2a4b98e2a14810b SHA512 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d
DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa
+DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce
EBUILD rsyslog-8.19.0.ebuild 12240 BLAKE2B c5de14a1f8dd0b12bb2e2b90707d86647766fcb3df54bc1a8c7428781248a5a1617b57990953037c3e6c8bc24751cc245e7a6faae520571a0fbef40b30828ce0 SHA512 7363c435c65394abda4a4f576e8433d8038a6e420534f3bb0419477ab3b4e3ab179f53bae016b372522884ac12eab467d3ece7db15303b3cc33d954f963fda8b
EBUILD rsyslog-8.24.0-r2.ebuild 12396 BLAKE2B 0c0456e8d54b24a02e0d07e0672f81156afce8deff1094e9644bcc3dcee3aab0bd7c43ea70957504308563bb51419c9a24436fff36a1be450e1e0078ec23d739 SHA512 2acbc370ca468dcfc021b66a31b2617dc5093b518c5c486487e306548445c1bb472dd48458a3171a99f1bc82276bed39ccaff5be31603191d261d11c2cd521c9
EBUILD rsyslog-8.25.0-r2.ebuild 12487 BLAKE2B 3e2715a63afe272a18b172ac7d67d2ad738d18d3c6f469cbc8642e4f75a5679f627f1dd768fb7301e1a37be4434f8f51fb1709217a5165dff99fbe218b3d84f5 SHA512 1a73a37139e8af1017f7cc53bbd35238130cfa30a7e3236f304a4d079931d0304fbde4f026254a951253c4060bcb6e774b6643f42ad14ef431b697833450f521
@@ -38,4 +41,5 @@ EBUILD rsyslog-8.28.0.ebuild 12504 BLAKE2B 7fbd8ed2298fce7926f40963571d4b38c03a3
EBUILD rsyslog-8.29.0.ebuild 12527 BLAKE2B c992fcb0783af6c15d89f8455ff47dc11248f5245b1a682f62b468150d814c672715d853acf31d3f551cb8c97dec1a02f9a676737033fe3e128d39a4b7412d71 SHA512 8f7593cca44eaa50929e03978dd9f066cc73aa9f725ce36585d274da925e0cc9a6a8791ab199c38b496e857335b8359c8cf19cc9ea3fae2ced4267ae69b05ef8
EBUILD rsyslog-8.30.0.ebuild 12518 BLAKE2B d50e7a8dbeb492e8339d2b6f6fc237554059db89b0b9593bfc34111d1ffbef1cc518282f0b1b3c90dd04828fba7639dffab49c50e2ba779b4e4009886d5a2ce1 SHA512 aade46a36a893585f63d11a6030f6ad1ec0529e6cd79650ed96278a1a12f943d1710a1c853bcf54d528cff34dc8a706ab6d69823cab861f8a5c3f2f58b8f588f
EBUILD rsyslog-8.31.0.ebuild 12565 BLAKE2B 29ca871aa60781bacec26e4809b8b3710958120011a5b3c7f31867c992faaab2f6b66707e013e855563e875104bb7e9fb93dac60836903c1a2f031600f2083fc SHA512 cb044ac578f29e7332191af95113882b2973870e37994b216eeb54b816e05cb42dae6e492c53b18d54dcac7425f6228aa1ac805f267dd6bf4fa344019c2b121f
-MISC metadata.xml 3335 BLAKE2B 329673f518b01762c932716aa569de4c2e0521000d8b9fa122b0ce659f31640316c126732043b11bf4a8f11e981810f7cf4f335b119ce5bedf508edf99f46e9b SHA512 bfa3a8fbb502f6fdc110e8aa6b7394449329c29a63fc71c615317c97deb4e48f6e9f952bf492cc96be15fffb514f281a0d19de697bfddab4d4c7acf3c535c6a1
+EBUILD rsyslog-8.32.0-r1.ebuild 12705 BLAKE2B eb7ef755e3bfda708d4f6668ad187b92fab410dc9d12781f64ab4cccd3af0c3a9caeb8081f3debd9a27f7c7db7f4df7d3f2c87b311123d438e369bb82933aba5 SHA512 60d7b0c6801502f6bd4e6def6f737226626c1eac04c12d7d7961bfa31da4b88786a62e5e1cd2088966c3033ca6c980cba62e66c1428b47b80926e9182e1223c1
+MISC metadata.xml 3397 BLAKE2B 368cc15a6a51952b0aeed7314e0d8cf4be6a82f0bb5275f87f09b8707353543d26d839be016e7ae9523e8594e2ddf85f2f26e36ce2332b95131729f4da959a90 SHA512 8d5f78dafe981b3874fe60a54d3f041ab163e3e94a5f3ceb943bfe075e55dbdc260aa2dd035c7d241708f21b8f8f1f9d268ffd65538b0fc5b36c43a59f5a0f27
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch
new file mode 100644
index 000000000000..2706b4b581a0
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch
@@ -0,0 +1,90 @@
+https://github.com/rsyslog/rsyslog/pull/2378
+
+--- 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/grammar/rainerscript.c
++++ b/grammar/rainerscript.c
+@@ -1935,6 +1935,7 @@ done:
+ 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 @@ finalize_it:
+ }
+ 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/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
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 855ee265e268..2b738f08d63d 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -4,9 +4,9 @@
whissi@gentoo.org
Thomas Deutschmann
- Primary Maintainer