diff options
-rw-r--r-- | main/rsyslog/APKBUILD | 18 | ||||
-rw-r--r-- | main/rsyslog/musl-fix.patch | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD index 23caa81ab7a..d2e2bc48944 100644 --- a/main/rsyslog/APKBUILD +++ b/main/rsyslog/APKBUILD @@ -13,8 +13,12 @@ arch="all !s390x" # limited by czmq license="Apache-2.0 GPL-3.0-or-later LGPL-3.0-or-later" options="!check" makedepends=" + autoconf + automake + byacc curl-dev czmq-dev + flex gnutls-dev hiredis-dev krb5-dev @@ -26,8 +30,9 @@ makedepends=" liblognorm-dev libmaxminddb-dev libnet-dev - linux-headers librelp-dev + libtool + linux-headers mariadb-connector-c-dev net-snmp-dev postgresql-dev @@ -38,7 +43,7 @@ makedepends=" " 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 @@ -92,6 +97,11 @@ done # - CVE-2019-17041 # - CVE-2019-17042 +prepare() { + default_prepare + autoreconf -fi +} + build() { ./configure \ --build=$CBUILD \ @@ -177,9 +187,9 @@ _plugin() { done } -sha512sums="a01bb2f67d21ab6d96dd1302bc351b509892834ef44956983db912a63ba23201653ca1e6b176a574c47568665b4d92579bb8bb0fe6911646bc841a3754c2754f rsyslog-8.2002.0.tar.gz +sha512sums="9eac3b4d159a7dcc1a66db9d59a5f57e548d12721393486ae5d22bd4d0ed8642a2d18bba7fc2d74fb8df7f118f1eed30d99bca0441fcd724964d134e78712cd3 rsyslog-8.2002.0.tar.gz bcd63c8df2ac63b80f3cb51ba7f544988df6cd875f4e81020e762dff30d7537f21b72c95a4b1c08baf15f4ed5f03defbf3f061673aabada5841f45ab9f579374 rsyslog.initd b5cbdcfa601ae8e7617289e7805fe71daa17bd03a7a30e1e1aad7a58a4ad4c1d89c9a203228f15816232ab6ab6d7a2752f7bbf4d259bbd5eccbe9728dc7e8aaa rsyslog.logrotate 9c9913b3367ac4d0b0f998ffa3aaaf136cf939ed4275f13f79d4c7336d0978007af13cb2c6f35d17ef25a53907fb064705f23c3b3a6a6fcd06ae85c3c51c7e38 rsyslog.conf -ce686b9529cdc74bd633a6fce169c1fdacf5266b4ca6fc731f8cea08080a1106f93dc048af9966cab09947100890170197c59d3f880992001a8ddfd084ffe2aa musl-fix.patch +15745c8cdb730ae548d038ca4c04f9f48ef55c6e04949a8e86df356877563c0fcb9660445e47d3f9530925092d6dd80b2b2fc3f64a114ee85103d137327524cb musl-fix.patch ef2e000b1c42cb5beffb26393952c2a692791e78972ee4b6f187ca53e338122b2004cc5216381c042195f12cc58f37f186a04e12a65b5bdfdcdf76b73393efb7 queue.patch" diff --git a/main/rsyslog/musl-fix.patch b/main/rsyslog/musl-fix.patch index 13b54f425a3..160a74c7d22 100644 --- a/main/rsyslog/musl-fix.patch +++ b/main/rsyslog/musl-fix.patch @@ -1,6 +1,6 @@ --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h -@@ -777,3 +777,10 @@ +@@ -786,3 +786,10 @@ #endif #endif /* multi-include protection */ |