diff --git a/.gitignore b/.gitignore index d17d7e0..68cc2c1 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,5 @@ rsyslog-4.6.3.tar.gz /rsyslog-doc-8.2001.0.tar.gz /rsyslog-8.2002.0.tar.gz /rsyslog-doc-8.2002.0.tar.gz +/rsyslog-8.2008.0.tar.gz +/rsyslog-doc-8.2008.0.tar.gz diff --git a/rsyslog-8.34.0-sd-service.patch b/rsyslog-8.34.0-sd-service.patch deleted file mode 100644 index f1191d4..0000000 --- a/rsyslog-8.34.0-sd-service.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up rsyslog-7.4.1/rsyslog.service.in.orig rsyslog-7.4.1/rsyslog.service.in ---- rsyslog-7.4.1/rsyslog.service.in.orig 2013-06-17 15:28:54.430023493 +0200 -+++ rsyslog-7.4.1/rsyslog.service.in 2013-06-17 15:30:05.874378084 +0200 -@@ -6,7 +6,9 @@ Requires=syslog.socket - - [Service] - Type=notify --ExecStart=@sbindir@/rsyslogd -n -iNONE -+EnvironmentFile=-/etc/sysconfig/rsyslog -+ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS -+UMask=0066 - StandardOutput=null - Restart=on-failure - diff --git a/rsyslog.service b/rsyslog.service new file mode 100644 index 0000000..9c13b1d --- /dev/null +++ b/rsyslog.service @@ -0,0 +1,22 @@ +[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 $SYSLOGD_OPTIONS +ExecReload=/usr/bin/kill -HUP $MAINPID +UMask=0066 +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 950e4d0..23298e8 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -8,8 +8,8 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog -Version: 8.2002.0 -Release: 5%{?dist} +Version: 8.2008.0 +Release: 1%{?dist} License: (GPLv3+ and ASL 2.0) URL: http://www.rsyslog.com/ Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz @@ -17,6 +17,7 @@ Source1: http://www.rsyslog.com/files/download/rsyslog/%{name}-doc-%{version}.ta Source2: rsyslog.conf Source3: rsyslog.sysconfig Source4: rsyslog.log +Source5: rsyslog.service BuildRequires: gcc BuildRequires: autoconf @@ -43,10 +44,6 @@ Requires: bash >= 2.0 Provides: syslog Obsoletes: sysklogd < 1.5-11 -# tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog -Patch0: rsyslog-8.34.0-sd-service.patch -Patch1: service-exec-reload.patch - %package crypto Summary: Encryption support Requires: %name = %version-%release @@ -246,8 +243,6 @@ rm -r LICENSE README.md source build/objects.inv mv build doc # set up rsyslog sources %setup -q -D -%patch0 -p1 -%patch1 -p1 autoreconf -iv @@ -322,6 +317,7 @@ make V=1 DESTDIR=%{buildroot} install install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig install -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d +install -d -m 755 %{buildroot}%{_unitdir} install -d -m 755 %{buildroot}%{_sysconfdir}/rsyslog.d install -d -m 700 %{buildroot}%{rsyslog_statedir} install -d -m 700 %{buildroot}%{rsyslog_pkidir} @@ -330,6 +326,7 @@ install -d -m 755 %{buildroot}%{rsyslog_docdir}/html install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rsyslog.conf install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/rsyslog install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/rsyslog +install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/rsyslog.service install -p -m 644 plugins/ommysql/createDB.sql %{buildroot}%{rsyslog_docdir}/mysql-createDB.sql install -p -m 644 plugins/ompgsql/createDB.sql %{buildroot}%{rsyslog_docdir}/pgsql-createDB.sql dos2unix tools/recover_qi.pl @@ -339,8 +336,6 @@ install -p -m 644 contrib/mmkubernetes/*.rulebase %{buildroot}%{rsyslog_docdir} cp -r doc/* %{buildroot}%{rsyslog_docdir}/html # get rid of libtool libraries rm -f %{buildroot}%{_libdir}/rsyslog/*.la -# get rid of socket activation by default -sed -i '/^Alias/s/^/;/;/^Requires=syslog.socket/s/^/;/' %{buildroot}%{_unitdir}/rsyslog.service # imdiag and liboverride is only used for testing rm -f %{buildroot}%{_libdir}/rsyslog/imdiag.so rm -f %{buildroot}%{_libdir}/rsyslog/liboverride_gethostname.so @@ -489,6 +484,13 @@ done %doc %{rsyslog_docdir}/k8s_container_name.rulebase %changelog +* Thu Sep 17 2020 Attila Lakatos - 8.2008.0-1 +- rebase to upstream version 8.2008.0 + resolves: rhbz#1829092 + resolves: rhbz#1823862 + resolves: rhbz#1876773 +- add service file back(upstream does not ship it anymore) + * Thu Aug 27 2020 Josef Řídký - 8.2002.0-5 - Rebuilt for new net-snmp release diff --git a/service-exec-reload.patch b/service-exec-reload.patch deleted file mode 100644 index f3a0c21..0000000 --- a/service-exec-reload.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up rsyslog-8.2002.0/rsyslog.service.in.orig rsyslog-8.2002.0/rsyslog.service.in ---- rsyslog-8.2002.0/rsyslog.service.in.orig 2020-08-20 14:23:22.358994995 +0200 -+++ rsyslog-8.2002.0/rsyslog.service.in 2020-08-20 14:23:48.345178883 +0200 -@@ -8,6 +8,7 @@ Documentation=https://www.rsyslog.com/do - Type=notify - EnvironmentFile=-/etc/sysconfig/rsyslog - ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS -+ExecReload=/usr/bin/kill -HUP $MAINPID - UMask=0066 - StandardOutput=null - Restart=on-failure diff --git a/sources b/sources index 920af80..86230b8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rsyslog-8.2002.0.tar.gz) = a01bb2f67d21ab6d96dd1302bc351b509892834ef44956983db912a63ba23201653ca1e6b176a574c47568665b4d92579bb8bb0fe6911646bc841a3754c2754f -SHA512 (rsyslog-doc-8.2002.0.tar.gz) = 5d6bd8fe09b49644f000416c87c8600cd3df3facb07845afd85012279df203a44b234e94a7be90ad83709d5f2ad1a2bf8cb51571c5c0cd76383f76f81455945e +SHA512 (rsyslog-8.2008.0.tar.gz) = a077832de7076ac5e7d4c8f33edd044d0c18fd171a697ef68c1cd0f81f1938b3f008cddc1a61084181de512b643c15004744f0e79e6a44e9d239cec3d35f74fe +SHA512 (rsyslog-doc-8.2008.0.tar.gz) = 5b8bed19017c65469eb8ea7725ef162595b30f520605f37447498ab69b5cfe8f939cee7e7915ecbf3c025871408fd7af6d45ba960a83096f83a397df4cefef09