- updated to 8.2008.0

- systemd patch replaced by rsyslog.service file (upstream dropped systemd service)
- added tirpc patch (fix build with glibc 2.32 + libtirpc)

diff --git a/rsyslog-systemd.patch b/rsyslog-systemd.patch
deleted file mode 100644 (file)
index bdc6516..0000000
--- a/rsyslog-systemd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- rsyslog-8.2004.0/rsyslog.service.in.orig   2020-05-25 19:16:32.596418569 +0200
-+++ rsyslog-8.2004.0/rsyslog.service.in        2020-05-25 19:27:44.329446146 +0200
-@@ -6,7 +6,8 @@
- 
- [Service]
- Type=notify
--ExecStart=@sbindir@/rsyslogd -n -iNONE
-+EnvironmentFile=-/etc/sysconfig/rsyslog
-+ExecStart=@sbindir@/rsyslogd -n -iNONE $SYSLOGD_OPTIONS
- StandardOutput=null
- Restart=on-failure
- 

diff --git a/rsyslog-tirpc.patch b/rsyslog-tirpc.patch
new file mode 100644 (file)
index 0000000..5a54354
--- /dev/null
+++ b/rsyslog-tirpc.patch
@@ -0,0 +1,24 @@
+--- rsyslog-8.2008.0/configure.ac.orig 2020-08-25 10:39:08.000000000 +0200
++++ rsyslog-8.2008.0/configure.ac      2020-10-13 07:15:01.274384785 +0200
+@@ -93,6 +93,8 @@
+ 
+ PKG_CHECK_MODULES([LIBFASTJSON], [libfastjson >= 0.99.8],,)
+ 
++PKG_CHECK_MODULES([LIBTIRPC], [libtirpc])
++
+ AC_DEFINE_UNQUOTED([PLATFORM_ID], ["${host}"], [platform id for display purposes])
+ # we don't mind if we don't have the lsb_release utility. But if we have, it's
+ # nice to have the extra information.
+--- rsyslog-8.2008.0/contrib/mmgrok/Makefile.am.orig   2020-03-30 11:33:29.000000000 +0200
++++ rsyslog-8.2008.0/contrib/mmgrok/Makefile.am        2020-10-13 07:15:27.987573401 +0200
+@@ -1,8 +1,8 @@
+ pkglib_LTLIBRARIES = mmgrok.la
+ 
+ mmgrok_la_SOURCES = mmgrok.c
+-mmgrok_la_CPPFLAGS = $(GLIB_CFLAGS) $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
++mmgrok_la_CPPFLAGS = $(GLIB_CFLAGS) $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(LIBTIRPC_CFLAGS)
+ mmgrok_la_LDFLAGS = -module -avoid-version
+-mmgrok_la_LIBADD = $(GLIB_LIBS) -lgrok $(LIBFASTJSON_LIBS)
++mmgrok_la_LIBADD = $(GLIB_LIBS) -lgrok $(LIBFASTJSON_LIBS) $(LIBTIRPC_LIBS)
+ 
+ EXTRA_DIST = 

diff --git a/rsyslog.service b/rsyslog.service
new file mode 100644 (file)
index 0000000..e461671
--- /dev/null
+++ b/rsyslog.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=System Logging Service
+Requires=syslog.socket
+Documentation=man:rsyslogd(8)
+Documentation=https://www.rsyslog.com/doc/
+
+[Service]
+Type=notify
+EnvironmentFile=-/etc/sysconfig/rsyslog
+ExecStart=/usr/sbin/rsyslogd -n -iNONE $SYSLOGD_OPTIONS
+StandardOutput=null
+Restart=on-failure
+
+# Increase the default a bit in order to allow many simultaneous
+# files to be monitored, we might need a lot of fds.
+LimitNOFILE=16384
+
+[Install]
+WantedBy=multi-user.target
+Alias=syslog.service

diff --git a/rsyslog.spec b/rsyslog.spec
index 70f9112feeed965a305c8bc07b79a88f81757e1b..e398323efb9bcc6ce797359b1431791458c14d5f 100644 (file)
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -33,19 +33,22 @@ Summary(pl.UTF-8):  Programy logujące zdarzenia w systemie i jądrze Linuksa
 Summary(pt_BR.UTF-8):  Registrador de log do sistema linux
 Summary(tr.UTF-8):     Linux sistem ve çekirdek kayıt süreci
 Name:          rsyslog
-Version:       8.2004.0
-Release:       3
+Version:       8.2008.0
+Release:       1
 License:       GPL v3+
 Group:         Daemons
 #Source0Download: https://www.rsyslog.com/downloads/download-v8-stable/
 Source0:       https://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
-# Source0-md5: 375a60ab0f461367f84f07a5dbda6de2
+# Source0-md5: 9b6ae1a517231764ad4fbd68181cc23e
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.sysconfig
 Source4:       %{name}.logrotate
-Patch0:                rsyslog-systemd.patch
+Source5:       %{name}.service
+Patch0:                %{name}-tirpc.patch
 URL:           https://www.rsyslog.com/
+BuildRequires: autoconf >= 2.61
+BuildRequires: automake
 %{?with_zeromq:BuildRequires:  czmq-devel >= 3.0.2}
 %{?with_grok:BuildRequires:    glib2-devel >= 2.0}
 BuildRequires: gnutls-devel >= 1.4.0
@@ -64,6 +67,8 @@ BuildRequires:        liblogging-stdlog-devel >= 1.0.3
 BuildRequires: libnet-devel >= 1:1.1
 %{?with_kafka:BuildRequires:   librdkafka-devel >= 0.9.1}
 %{?with_relp:BuildRequires:    librelp-devel >= 1.2.14}
+BuildRequires: libtirpc-devel
+BuildRequires: libtool
 BuildRequires: libuuid-devel
 %{?with_mongodb:BuildRequires: mongo-c-driver-devel >= 1.0}
 %{?with_mysql:BuildRequires:   mysql-devel}
@@ -441,6 +446,11 @@ naprzemiennie z pewnej liczby portów źródłowych.
 %{__mv} plugins/omelasticsearch/README{,.omelasticsearch}
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --disable-silent-rules \
        %{?with_curl:--enable-clickhouse} \
@@ -519,7 +529,7 @@ naprzemiennie z pewnej liczby portów źródłowych.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d,logrotate.d,rsyslog.d} \
-       $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},%{_bindir}} \
+       $RPM_BUILD_ROOT{%{systemdunitdir},%{_sbindir},%{_mandir}/man{5,8},%{_bindir}} \
        $RPM_BUILD_ROOT/{dev,var/log}
 
 %{__make} install \
@@ -529,6 +539,7 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/rsyslog
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rsyslog
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/rsyslog
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}
 
 for n in cron daemon debug kernel lpr maillog messages secure spooler syslog user; do
        > $RPM_BUILD_ROOT/var/log/$n