From acae4d938af27d1ec6391524f4110bd1e81419f5 Mon Sep 17 00:00:00 2001 From: jbu Date: Mon, 29 Jun 2015 23:26:52 +0200 Subject: [PATCH] rsyslog: unbreak musl + remove systemd option + The next update (0.8.11) is coming soon --- srcpkgs/rsyslog/patches/musl-glob.patch | 12 ++++++++++++ srcpkgs/rsyslog/template | 7 ++----- 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/rsyslog/patches/musl-glob.patch diff --git a/srcpkgs/rsyslog/patches/musl-glob.patch b/srcpkgs/rsyslog/patches/musl-glob.patch new file mode 100644 index 0000000000..8577ac5eb6 --- /dev/null +++ b/srcpkgs/rsyslog/patches/musl-glob.patch @@ -0,0 +1,12 @@ +--- plugins/imfile/imfile.c 2015-05-19 10:53:40.000000000 +0200 ++++ plugins/imfile/imfile.c 2015-06-29 23:11:50.984104193 +0200 +@@ -34,6 +34,9 @@ + #include + #include + #include ++#if !defined(GLOB_BRACE) ++#define GLOB_BRACE 0 /* no GLOB_BRACE in musl libc */ ++#endif + #include + #ifdef HAVE_SYS_INOTIFY_H + #include diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 55f4d47a59..7b75ac9339 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,7 +1,7 @@ # Template file for 'rsyslog' pkgname=rsyslog version=8.10.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql --enable-pgsql @@ -9,9 +9,7 @@ configure_args="--sbindir=/usr/bin --enable-imptcp --enable-mmsnmptrapd --enable-impstats --enable-omprog --enable-omstdout --enable-pmlastmsg --enable-pmcisconames --enable-pmaixforwardedfrom - --enable-pmsnare --enable-omuxsock --disable-generate-man-pages - $(vopt_enable systemd imjournal) $(vopt_enable systemd omjournal) - $(vopt_if systemd --with-systemdsystemunitdir=/usr/lib/systemd/system)" + --enable-pmsnare --enable-omuxsock --disable-generate-man-pages" short_desc="An Enhanced multi-threaded syslog daemon" maintainer="Juan RP " license="GPL-3" @@ -20,7 +18,6 @@ distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" checksum=b92df3f367108219e2fffccd463bf49d75cb8ab3ceaa52e9789f85eace066912 build_pie=yes -build_options="systemd" lib32disabled=yes hostmakedepends="pkg-config postgresql-libs-devel" makedepends="json-c-devel gnutls-devel postgresql-libs-devel