diff --git a/srcpkgs/rsyslog/patches/runtime-statsobj-fix-for-non-atomic-builtins-64.patch b/srcpkgs/rsyslog/patches/runtime-statsobj-fix-for-non-atomic-builtins-64.patch new file mode 100644 index 0000000000..fe0a9ddf15 --- /dev/null +++ b/srcpkgs/rsyslog/patches/runtime-statsobj-fix-for-non-atomic-builtins-64.patch @@ -0,0 +1,11 @@ +--- runtime/statsobj.h.orig ++++ runtime/statsobj.h +@@ -139,7 +139,7 @@ PROTOTYPEObj(statsobj); + */ + #define STATSCOUNTER_DEF(ctr, mut) \ + intctr_t ctr; \ +- DEF_ATOMIC_HELPER_MUT64(mut) ++ DEF_ATOMIC_HELPER_MUT64(mut); + + #define STATSCOUNTER_INIT(ctr, mut) \ + INIT_ATOMIC_HELPER_MUT64(mut); \ diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index e45c265d1b..0b2aae2c71 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,22 +1,23 @@ # Template file for 'rsyslog' pkgname=rsyslog -version=7.6.3 -revision=3 +version=7.6.4 +revision=1 build_style=gnu-configure configure_args="--enable-gnutls --enable-mysql --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-gssapi-krb5 - --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-zlib - --enable-imptcp --enable-imttcp --enable-mmsnmptrapd + --enable-zlib --enable-imptcp --enable-imttcp --enable-mmsnmptrapd --enable-impstats --enable-omprog --enable-omstdout --enable-pmlastmsg --enable-pmcisconames --enable-pmaixforwardedfrom --enable-pmsnare --enable-pmrfc3164sd --enable-omuxsock - --enable-cached-man-pages" + --disable-generate-man-pages + $(vopt_enable systemd imjournal) $(vopt_enable systemd omjournal) + $(vopt_if systemd --with-systemdsystemunitdir=/usr/lib/systemd/system)" short_desc="An Enhanced multi-threaded syslog daemon" maintainer="Juan RP " license="GPL-3" homepage="http://www.rsyslog.com" distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" -checksum=013359035f8b6e5a4328edaffbda1120974accaba36ddc5de66a582fa588f5ec +checksum=72b595c9e06b58cd7e10f59e7385a25471136fca0a1257afe4eb8a38e10a3feb lib32disabled=yes hostmakedepends="pkg-config" @@ -43,10 +44,7 @@ fi build_options="systemd" if [ "$build_option_systemd" ]; then - configure_args+=" --enable-imjournal --enable-omjournal" makedepends+=" systemd-devel" -else - configure_args+=" --disable-imjournal --disable-omjournal" fi post_configure() {