aboutsummaryrefslogtreecommitdiffstats
path: root/main/rsyslog/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'main/rsyslog/APKBUILD')
-rw-r--r--main/rsyslog/APKBUILD60
1 files changed, 40 insertions, 20 deletions
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index 97b12028c73..ff38f87fbfa 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -5,16 +5,21 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Cameron Banta <cbanta@gmail.com>
pkgname=rsyslog
-pkgver=8.1908.0
+pkgver=8.2404.0
pkgrel=0
-pkgdesc="Enhanced multi-threaded syslogd with database support and more."
+pkgdesc="Enhanced multi-threaded syslogd with database support and more"
url="https://www.rsyslog.com/"
arch="all !s390x" # limited by czmq
-license="Apache-2.0 GPL-3.0-or-later LGPL-3.0-or-later"
+license="Apache-2.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later"
options="!check"
makedepends="
+ autoconf
+ automake
+ bsd-compat-headers
+ byacc
curl-dev
czmq-dev
+ flex
gnutls-dev
hiredis-dev
krb5-dev
@@ -26,24 +31,23 @@ makedepends="
liblognorm-dev
libmaxminddb-dev
libnet-dev
- linux-headers
+ libpq-dev
librelp-dev
+ libtool
+ linux-headers
mariadb-connector-c-dev
net-snmp-dev
- postgresql-dev
- py-docutils
+ py3-docutils
rabbitmq-c-dev
util-linux-dev
zlib-dev
"
install="$pkgname.post-upgrade"
subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc"
-source="https://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/rsyslog/rsyslog/archive/v$pkgver.tar.gz
$pkgname.initd
$pkgname.logrotate
$pkgname.conf
- musl-fix.patch
- queue.patch
"
# <subpackage>[:<module>...]
@@ -65,6 +69,7 @@ _plugins="
mmrm1stspace
mmsequence
mmsnmptrapd
+ mmtaghostname
mmutf8fix
mysql:ommysql
pgsql:ompgsql
@@ -79,14 +84,28 @@ _plugins="
udpspoof:omudpspoof
uxsock:omuxsock
zmq:imczmq:omczmq
+ imdocker
+ clickhouse:omclickhouse
"
for _i in $_plugins; do
subpackages="$subpackages $pkgname-${_i%%:*}:_plugin"
done
-build() {
- cd "$builddir"
+# secfixes:
+# 8.2204.1-r0:
+# - CVE-2022-24903
+# 8.1908.0-r1:
+# - CVE-2019-17040
+# - CVE-2019-17041
+# - CVE-2019-17042
+prepare() {
+ default_prepare
+ autoreconf -fi
+}
+
+build() {
+ CFLAGS="$CFLAGS -flto=auto" \
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -103,6 +122,7 @@ build() {
--enable-snmp \
--enable-elasticsearch \
--enable-omhttp \
+ --enable-clickhouse \
--enable-gnutls \
--enable-mail \
--enable-imdiag \
@@ -117,6 +137,7 @@ build() {
--enable-mmdblookup \
--enable-mmfields \
--enable-mmpstrucdata \
+ --enable-mmtaghostname \
--enable-relp \
--enable-imfile \
--enable-imptcp \
@@ -132,13 +153,12 @@ build() {
--enable-omrabbitmq \
--enable-imczmq \
--enable-omczmq \
- --enable-omhiredis
+ --enable-omhiredis \
+ --enable-imdocker
make
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
# Remove lib that is used only for testing.
@@ -152,7 +172,7 @@ package() {
}
_plugin() {
- local name="${subpkgname#$pkgname-}"
+ local name="${subpkgname#"$pkgname"-}"
pkgdesc="$name support for $pkgname"
depends="$pkgname=$pkgver-r$pkgrel"
@@ -171,9 +191,9 @@ _plugin() {
done
}
-sha512sums="66b6755e1f5a610ed8ec3f8fad1ee227f8ff34618a8f2660a801e6f9aa734980190fbffd8144ac30d63f8297a06e86ada65ba838242d8a006bca8e30f56dce80 rsyslog-8.1908.0.tar.gz
+sha512sums="
+e7a615878fad6add84acd5029e0c6df0ad1669b8944771ddbf17ea968e073227fda005794e8d83ecd0c7d262ccdf0830c81dcf3ffff54ced6adbb5431ba96eef rsyslog-8.2404.0.tar.gz
bcd63c8df2ac63b80f3cb51ba7f544988df6cd875f4e81020e762dff30d7537f21b72c95a4b1c08baf15f4ed5f03defbf3f061673aabada5841f45ab9f579374 rsyslog.initd
-b5cbdcfa601ae8e7617289e7805fe71daa17bd03a7a30e1e1aad7a58a4ad4c1d89c9a203228f15816232ab6ab6d7a2752f7bbf4d259bbd5eccbe9728dc7e8aaa rsyslog.logrotate
-9c9913b3367ac4d0b0f998ffa3aaaf136cf939ed4275f13f79d4c7336d0978007af13cb2c6f35d17ef25a53907fb064705f23c3b3a6a6fcd06ae85c3c51c7e38 rsyslog.conf
-ce686b9529cdc74bd633a6fce169c1fdacf5266b4ca6fc731f8cea08080a1106f93dc048af9966cab09947100890170197c59d3f880992001a8ddfd084ffe2aa musl-fix.patch
-ef2e000b1c42cb5beffb26393952c2a692791e78972ee4b6f187ca53e338122b2004cc5216381c042195f12cc58f37f186a04e12a65b5bdfdcdf76b73393efb7 queue.patch"
+acf0679e0aa7d8d28a2426d6744d3d6d857969b4a5307c4934fe1639868497769194b0fed59b85111bda3e2af5e69d99c130245cb149fed34cadba78d93def98 rsyslog.logrotate
+451b861dc82d7a2810e6c9ff8f80b2c5149cc6b440baf5901149e7b6524a1179826787a924c84403c2e9d8fa7d4df2c909e7f0877ac0cd4e6faf2e37cba7c6c1 rsyslog.conf
+"