packages/rsyslog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Package init

Browse Source
This commit is contained in:
dogsheng 2019-12-13 16:07:25 +08:00
parent afc7f67bbf
commit 47ba5d28ba
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsyslog-8.37.0-initialize-variables-and-check-return-value.patch
View File

@ -52,7 +52,7 @@ index 2eb42a6..87c251a 100644
- free(tpmessage); - free(tpmessage);
+ if (tpmessage != NULL) { + if (tpmessage != NULL) {
+ int ret = sprintf(tpmessage,"[%5lu.%06lu] ",monotonic_timestamp/1000000, monotonic_timestamp%1000000); + int ret = sprintf(tpmessage,"[%5lu.%06lu] ",monotonic_timestamp/1000000, monotonic_timestamp%1000000);
+ memcpy(tpmessage+(ret > 30 ? 0 :(ret < 0 ? 0:ret)),message,strlen(message)+1); + memcpy(tpmessage+(ret >= 30 ? 0 :(ret < 0 ? 0:ret)),message,strlen(message)+1);
+ enqMsg((uchar *)tpmessage, (uchar *) sys_iden_help, facility, severity, &tv, json, 0); + enqMsg((uchar *)tpmessage, (uchar *) sys_iden_help, facility, severity, &tv, json, 0);
+ free(tpmessage); + free(tpmessage);
+ } + }

24
rsyslog.spec
View File

@ -4,7 +4,7 @@
Name: rsyslog Name: rsyslog
Version: 8.1907.0 Version: 8.1907.0
Release: 2 Release: 4
Summary: The rocket-fast system for log processing Summary: The rocket-fast system for log processing
License: (GPLv3+ and ASL 2.0) License: (GPLv3+ and ASL 2.0)
URL: http://www.rsyslog.com/ URL: http://www.rsyslog.com/
@ -17,11 +17,17 @@ Source5: os_rotate_and_save_log.sh
Source6: os_check_timezone_for_rsyslog.sh Source6: os_check_timezone_for_rsyslog.sh
Source7: timezone.cron 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
Patch9004: rsyslog-8.37.0-initialize-variables-and-check-return-value.patch
BuildRequires: gcc autoconf automake bison dos2unix flex pkgconfig python3-docutils libtool 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: 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 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 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 mariadb-connector-c-devel Requires: logrotate >= 3.5.2 bash >= 2.0 libdbi
%{?systemd_requires} %{?systemd_requires}
Provides: syslog Provides: syslog
@ -136,7 +142,7 @@ protocol.
rm -r LICENSE README.md source build/objects.inv rm -r LICENSE README.md source build/objects.inv
mv build doc mv build doc
%autosetup -n %{name}-%{version} -D %autosetup -n %{name}-%{version} -D -p1
%build %build
autoreconf -vfi autoreconf -vfi
@ -351,6 +357,18 @@ done
%{_mandir}/man1/rscryutil.1.gz %{_mandir}/man1/rscryutil.1.gz
%changelog %changelog
* Wed Nov 27 2019 chengquan <chengquan3@huawei.com> - 8.1907.0-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:remove useless install dependencies
* Fri Nov 8 2019 chengquan <chengquan3@huawei.com> - 8.1907.0-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add self-study patches
* Fri Oct 18 2019 chengquan <chengquan3@huawei.com> - 8.1907.0-2 * Fri Oct 18 2019 chengquan <chengquan3@huawei.com> - 8.1907.0-2
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA