diff options
| -rw-r--r-- | main/rsyslog/APKBUILD | 6 | ||||
| -rw-r--r-- | main/rsyslog/queue.patch | 28 |
2 files changed, 27 insertions, 7 deletions
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD index 74a9c10f83c..d8974373ca1 100644 --- a/main/rsyslog/APKBUILD +++ b/main/rsyslog/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Ashley Sommer <ashleysommer@gmail.com> # Maintainer: Cameron Banta <cbanta@gmail.com> pkgname=rsyslog -pkgver=8.25.0 +pkgver=8.26.0 pkgrel=0 pkgdesc="Enhanced multi-threaded syslogd with database support and more." url="http://www.rsyslog.com/" @@ -105,10 +105,10 @@ snmp() { "$subpkgdir"/usr/lib/rsyslog/ || return 1 } -sha512sums="0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f rsyslog-8.25.0.tar.gz +sha512sums="96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19 rsyslog-8.26.0.tar.gz 9a4b184076a82e0899da79ab3749e1c67eac03f36c4460d34ed0385f4a3ffad53681a1cc25dd514e835c9399a9abd01c235743535ad549d5be7f66d9e127b9dc rsyslog.initd a4d969671800227129be870b0318961b79d16365663754111a136734bbf7005abd4da24853dfdc07b3b6691ab5a7b215f0ac6c19022b4c5c8dab06165a42431b rsyslog.confd d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f rsyslog.logrotate 3bcd58b222eb7f4d8a42a0643cacb6ab44790f90c9bd550678e002bc19863d5d6a7341e5e5ba0b9292f85c6c04cd5cc42d174acdc63e8ba22022620db10f2b9b rsyslog.conf 20967235e8233588210071a7157a81fe02a1e88d7c7f55855fcc2fe34295269a6e3e3bfccb3d4dd83a6a48da28948c92d6ce47a0c5d817f6b6a4030635f4f896 musl-fix.patch -de8b82781af2dfef67b2215782721cca2ee5db9d08ed3260f4e3390353a59bf4bd76701df682c4bf537ce817eabf79b062c4b2a3e20e4175e7d77ca08c5a700f queue.patch" +7be105f9a30d23b48ee46e19d31ba37ec30477935a9f7ba3929666a9abe175313dbb7caf55fbb1c6579dd5d25fe037eea84cae9065fe3f765f23569344bce5d7 queue.patch" diff --git a/main/rsyslog/queue.patch b/main/rsyslog/queue.patch index 863fbd24f2d..ce1221562af 100644 --- a/main/rsyslog/queue.patch +++ b/main/rsyslog/queue.patch @@ -1,6 +1,19 @@ ---- rsyslog-8.18.0/plugins/imptcp/imptcp.c -+++ rsyslog-8.18.0-b/plugins/imptcp/imptcp.c -@@ -50,13 +50,13 @@ +From 444b2739a06c3995a47d37a193f579fdf2d1086a Mon Sep 17 00:00:00 2001 +From: Leonardo Arena <rnalrd@alpinelinux.org> +Date: Tue, 2 May 2017 07:25:35 +0000 +Subject: [PATCH] queue + +--- + plugins/imptcp/imptcp.c | 2 +- + plugins/imptcp/queue.h | 574 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 575 insertions(+), 1 deletion(-) + create mode 100644 plugins/imptcp/queue.h + +diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c +index f50d513..8a6874e 100644 +--- a/plugins/imptcp/imptcp.c ++++ b/plugins/imptcp/imptcp.c +@@ -50,7 +50,6 @@ #include <sys/socket.h> #include <sys/un.h> #include <sys/epoll.h> @@ -8,6 +21,7 @@ #include <netinet/tcp.h> #include <stdint.h> #include <zlib.h> +@@ -58,6 +57,7 @@ #if HAVE_FCNTL_H #include <fcntl.h> #endif @@ -15,8 +29,11 @@ #include "rsyslog.h" #include "cfsysline.h" #include "prop.h" +diff --git a/plugins/imptcp/queue.h b/plugins/imptcp/queue.h +new file mode 100644 +index 0000000..daf4553 --- /dev/null -+++ rsyslog-8.18.0-b/plugins/imptcp/queue.h ++++ b/plugins/imptcp/queue.h @@ -0,0 +1,574 @@ +/* + * Copyright (c) 1991, 1993 @@ -592,3 +609,6 @@ + : (elm->field.cqe_prev)) + +#endif /* sys/queue.h */ +-- +2.12.2 + |