diff --git a/0001-satisfy-gcc-flag-fno-common.patch b/0001-satisfy-gcc-flag-fno-common.patch deleted file mode 100644 index a3cf709..0000000 --- a/0001-satisfy-gcc-flag-fno-common.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4cacfc34e8f90d40313897a3ef66f0547895cbe6 Mon Sep 17 00:00:00 2001 -From: Thomas Blume -Date: Thu, 9 Jan 2020 09:37:54 +0100 -Subject: [PATCH] satisfy-gcc-flag-fno-common - -Porting advice for gcc 10: - -A common mistake in C is omitting extern when declaring a global -variable in a header file. If the header is included by several files it -results in multiple definitions of the same variable. In previous GCC versions -this error is ignored. GCC 10 defaults to -fno-common, which -means a linker error will now be reported. To fix this, use extern -in header files when declaring global variables, and ensure each global is -defined in exactly one C file. As a workaround, legacy C code can be compiled -with -fcommon. ---- - tools/omfile.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/omfile.h b/tools/omfile.h -index ee55de3d9..dc7298d28 100644 ---- a/tools/omfile.h -+++ b/tools/omfile.h -@@ -32,7 +32,7 @@ rsRetVal modInitFile(int iIFVersRequested __attribute__((unused)), int *ipIFVers - * other way to have the functionality (well, one way would be to go through the - * globals, but that seems not yet justified. -- rgerhards, 2010-03-01 - */ --uchar *pszFileDfltTplName; -+extern uchar *pszFileDfltTplName; - #endif /* #ifndef OMFILE_H_INCLUDED */ - /* vi:set ai: - */ --- -2.16.4 - diff --git a/rsyslog-8.2008.0.tar.gz b/rsyslog-8.2008.0.tar.gz new file mode 100644 index 0000000..552aa0e --- /dev/null +++ b/rsyslog-8.2008.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09d2b6c8bc2f016598aed2bb719e03f822bb01d720c61e4d6e725e00dca1b650 +size 3051049 diff --git a/rsyslog-8.39.0.tar.gz b/rsyslog-8.39.0.tar.gz deleted file mode 100644 index c5763b4..0000000 --- a/rsyslog-8.39.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c71f96fed6538de397df25da602384f6ee2cb67329d9f3362af2a18508616ab4 -size 2721560 diff --git a/rsyslog-doc-8.2008.0.tar.gz b/rsyslog-doc-8.2008.0.tar.gz new file mode 100644 index 0000000..92eb0da --- /dev/null +++ b/rsyslog-doc-8.2008.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b804900b3240e7ebc369a9628ae0c1c12f32df2c2b6b5d36dd6650cd62f1d59d +size 8378149 diff --git a/rsyslog-doc-8.39.0.tar.gz b/rsyslog-doc-8.39.0.tar.gz deleted file mode 100644 index 22af649..0000000 --- a/rsyslog-doc-8.39.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa320eaf17f26eed05be67b982f2707c07693fe541a99723a9140dd19ef924c7 -size 7674833 diff --git a/rsyslog-pgsql-pkg-config.patch b/rsyslog-pgsql-pkg-config.patch deleted file mode 100644 index 05cea02..0000000 --- a/rsyslog-pgsql-pkg-config.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: rsyslog-8.39.0/configure.ac -=================================================================== ---- rsyslog-8.39.0.orig/configure.ac -+++ rsyslog-8.39.0/configure.ac -@@ -794,24 +794,7 @@ AC_ARG_ENABLE(pgsql, - [enable_pgsql=no] - ) - if test "x$enable_pgsql" = "xyes"; then -- AC_CHECK_PROG( -- [PG_CONFIG], -- [pg_config], -- [pg_config], -- [no],,, -- ) -- if test "x${PG_CONFIG}" = "xno"; then -- AC_MSG_FAILURE([pg_config not found]) -- fi -- AC_CHECK_LIB( -- [pq], -- [PQconnectdb], -- [PGSQL_CFLAGS="-I`$PG_CONFIG --includedir`" -- PGSQL_LIBS="-L`$PG_CONFIG --libdir` -lpq" -- ], -- [AC_MSG_FAILURE([PgSQL library is missing])], -- [-L`$PG_CONFIG --libdir`] -- ) -+ PKG_CHECK_MODULES([PGSQL], [libpq]) - fi - AM_CONDITIONAL(ENABLE_PGSQL, test x$enable_pgsql = xyes) - AC_SUBST(PGSQL_CFLAGS) diff --git a/rsyslog-unit.patch b/rsyslog-unit.patch deleted file mode 100644 index 7228930..0000000 --- a/rsyslog-unit.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- rsyslog-8.36.0.orig/rsyslog.service.in 2018-06-25 17:20:38.000000000 +0200 -+++ rsyslog-8.36.0/rsyslog.service.in 2018-06-26 21:03:46.788972908 +0200 -@@ -1,14 +1,21 @@ - [Unit] - Description=System Logging Service - Requires=syslog.socket -+Requires=var-run.mount -+After=var-run.mount -+Conflicts=syslog-ng.service syslogd.service - Documentation=man:rsyslogd(8) - Documentation=http://www.rsyslog.com/doc/ - - [Service] - Type=notify --ExecStart=@sbindir@/rsyslogd -n -iNONE -+Environment=RSYSLOGD_PARAMS= -+EnvironmentFile=-/etc/sysconfig/syslog -+ExecStartPre=@sbindir@/rsyslog-service-prepare -+ExecStart=@sbindir@/rsyslogd -n -iNONE $RSYSLOGD_PARAMS -+ExecReload=/bin/kill -HUP $MAINPID - StandardOutput=null --Restart=on-failure -+Restart=on-abort - - # Increase the default a bit in order to allow many simultaneous - # files to be monitored, we might need a lot of fds. diff --git a/rsyslog.changes b/rsyslog.changes index 6d1577a..1a3b5a3 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Aug 29 13:23:05 UTC 2020 - Michael Ströder + +- Upgrade to rsyslog 8.2008.0 + Way too many changes since 8.39.0 to be listed here. +- Added custom unit file rsyslog.service because + systemd service file was removed from upstream project +- Removed obsolete patches: + * 0001-satisfy-gcc-flag-fno-common.patch + * rsyslog-pgsql-pkg-config.patch + * rsyslog-unit.patch + ------------------------------------------------------------------- Sat Jul 11 05:22:59 UTC 2020 - Thorsten Kukuk diff --git a/rsyslog.service b/rsyslog.service new file mode 100644 index 0000000..8429064 --- /dev/null +++ b/rsyslog.service @@ -0,0 +1,26 @@ +[Unit] +Description=System Logging Service +Requires=syslog.socket +Requires=var-run.mount +After=var-run.mount +Conflicts=syslog-ng.service syslogd.service +Documentation=man:rsyslogd(8) +Documentation=http://www.rsyslog.com/doc/ + +[Service] +Type=notify +Environment=RSYSLOGD_PARAMS= +EnvironmentFile=-/etc/sysconfig/syslog +ExecStartPre=/usr/sbin/rsyslog-service-prepare +ExecStart=/usr/sbin/rsyslogd -n -iNONE $RSYSLOGD_PARAMS +ExecReload=/bin/kill -HUP $MAINPID +StandardOutput=null +Restart=on-abort + +# 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 80ce0d6..4623eef 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -25,7 +25,7 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix License: (GPL-3.0-or-later AND Apache-2.0) Group: System/Daemons -Version: 8.39.0 +Version: 8.2008.0 Release: 0 %if 0%{?suse_version} >= 1210 %bcond_without systemd @@ -85,7 +85,7 @@ Release: 0 %define rsyslog_module_dir_withdeps %{_libdir}/rsyslog/ URL: http://www.rsyslog.com/ # Upstream library deprecated and we want to support migration -Obsoletes: %{name}-module-guardtime +Obsoletes: %{name}-module-guardtime <= 8.38.0 %if %{with systemd} Provides: syslog Provides: sysvinit(syslog) @@ -227,6 +227,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.rsyslog.com/files/download/%{name}/%{name}-%{version}.tar.gz Source1: rsyslog.sysconfig Source2: rsyslog.conf.in +Source3: rsyslog.service Source4: rsyslog.d.remote.conf.in Source5: rsyslog-service-prepare.in Source6: usr.sbin.rsyslogd @@ -239,11 +240,6 @@ Source17: acpid.frule Source18: firewall.frule Source19: NetworkManager.frule -# PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs. -Patch0: rsyslog-unit.patch -Patch1: rsyslog-pgsql-pkg-config.patch -Patch2: 0001-satisfy-gcc-flag-fno-common.patch - # this is a dirty hack since % dir does only work for the specified directory and nothing above # but I want to be able to switch this to /etc/apparmor.d once the profiles received more testing %define APPARMOR_PROFILE_PATH /usr/share/apparmor/extra-profiles @@ -588,9 +584,6 @@ This module provides an output module for TCL. %prep %setup -q -a 14 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 # %if %{with systemd} for file in rsyslog-service-prepare; do @@ -847,6 +840,8 @@ install -m644 plugins/ompgsql/createDB.sql \ %{buildroot}%{rsyslogdocdir}/pgsql-createDB.sql %endif %if %{with systemd} +install -d -m0755 %{buildroot}%{_unitdir} +install -m644 %{SOURCE3} %{buildroot}%{_unitdir}/ install -d -m0755 %{buildroot}%{_sysconfdir}/systemd/journald.conf.d install -m644 %{SOURCE16} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/rsyslog.conf %endif