diff --git a/rsyslog-8.2002.0.tar.gz b/rsyslog-8.2002.0.tar.gz deleted file mode 100644 index adf0e322214353c587f89b87d7dd59e79a70f3fa..0000000000000000000000000000000000000000 Binary files a/rsyslog-8.2002.0.tar.gz and /dev/null differ diff --git a/rsyslog-8.2006.0.tar.gz b/rsyslog-8.2006.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..aa1c6b23bf8557c494ea242fd513c0801a2fccf4 Binary files /dev/null and b/rsyslog-8.2006.0.tar.gz differ diff --git a/uvp-security-rsyslog-8.24.0-set-permission-of-syslogd-dot-pid-to-0644.patch b/rsyslog-8.24.0-set-permission-of-syslogd-dot-pid-to-0644.patch similarity index 100% rename from uvp-security-rsyslog-8.24.0-set-permission-of-syslogd-dot-pid-to-0644.patch rename to rsyslog-8.24.0-set-permission-of-syslogd-dot-pid-to-0644.patch diff --git a/rsyslog-doc-8.2002.0.tar.gz b/rsyslog-doc-8.2002.0.tar.gz deleted file mode 100644 index 7e5a33180ff98ff5b954630e0481f20ffcf9ed30..0000000000000000000000000000000000000000 Binary files a/rsyslog-doc-8.2002.0.tar.gz and /dev/null differ diff --git a/rsyslog-doc-8.2006.0.tar.gz b/rsyslog-doc-8.2006.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..12fa131905f4ae12374aa438a3c4a978a901d2db Binary files /dev/null and b/rsyslog-doc-8.2006.0.tar.gz differ diff --git a/rsyslog.spec b/rsyslog.spec index c7d3150d5de8801d64b8fbffbb7ac91118a3336f..27bb9cab98462711c3f6c39c75193070b397a3c2 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -3,7 +3,7 @@ %define rsyslog_docdir %{_docdir}/rsyslog Name: rsyslog -Version: 8.2002.0 +Version: 8.2006.0 Release: 1 Summary: The rocket-fast system for log processing License: (GPLv3+ and ASL 2.0) @@ -20,12 +20,12 @@ Source7: timezone.cron Patch9000: rsyslog-8.24.0-ensure-parent-dir-exists-when-writting-log-file.patch Patch9001: bugfix-rsyslog-7.4.7-imjournal-add-monotonic-timestamp.patch Patch9002: bugfix-rsyslog-7.4.7-add-configuration-to-avoid-memory-leak.patch -Patch9003: uvp-security-rsyslog-8.24.0-set-permission-of-syslogd-dot-pid-to-0644.patch +Patch9003: rsyslog-8.24.0-set-permission-of-syslogd-dot-pid-to-0644.patch Patch9004: rsyslog-8.37.0-initialize-variables-and-check-return-value.patch BuildRequires: gcc autoconf automake bison dos2unix flex pkgconfig python3-docutils libtool BuildRequires: libgcrypt-devel libuuid-devel zlib-devel krb5-devel libnet-devel gnutls-devel -BuildRequires: libfastjson-devel >= 0.99.8 libestr-devel >= 0.1.9 systemd-devel >= 204-8 python-sphinx +BuildRequires: libfastjson-devel >= 0.99.8 libestr-devel >= 0.1.9 systemd-devel >= 204-8 BuildRequires: libdbi-devel mariadb-connector-c-devel net-snmp-devel qpid-proton-c-devel libcurl-devel Requires: logrotate >= 3.5.2 bash >= 2.0 libdbi %{?systemd_requires} @@ -139,11 +139,7 @@ protocol. %prep %setup -q -a 1 -T -c -cd %{name}-doc-%{version} -sphinx-build -b html source build -rm -r LICENSE README.md source -cd - -mv %{name}-doc-%{version}/build doc +mv build doc %autosetup -n %{name}-%{version} -D -p1 @@ -361,6 +357,12 @@ done %{_mandir}/man1/rscryutil.1.gz %changelog +* Fri Jul 31 2020 zhuguodong - 8.2006.0-1 +- Type: bugfix +- ID:NA +- SUG:restart +- DESC: upgrade rsyslog to 8.2006.0 + * Thu Apr 16 2020 Shouping Wang - 8.2002.0-1 - Type: bugfix - ID:NA