Merge "refactor syslog-ng"
This commit is contained in:
Zuul
Gerrit Code Review
commit
efd96cd34c
@ -213,10 +213,6 @@ logrotate-config
|
||||
# pam
|
||||
pam
|
||||
|
||||
# syslog-ng
|
||||
syslog-ng
|
||||
syslog-ng-libdbi
|
||||
|
||||
# novnc
|
||||
novnc
|
||||
|
||||
@ -227,6 +223,7 @@ sudo
|
||||
sudo-config
|
||||
shadow-utils-config
|
||||
ntp-config
|
||||
syslog-ng-config
|
||||
|
||||
# net-snmp
|
||||
net-snmp-utils
|
||||
|
||||
@ -31,7 +31,6 @@ utilities/nova-utils
|
||||
base/pam
|
||||
security/shim-unsigned
|
||||
security/shim-signed
|
||||
logging/syslog-ng
|
||||
base/sudo
|
||||
virt/cloud-init
|
||||
base/watchdog
|
||||
@ -108,6 +107,7 @@ config-files/memcached-custom
|
||||
config-files/audit-config
|
||||
config-files/shadow-utils-config
|
||||
config-files/ntp-config
|
||||
config-files/syslog-ng-config
|
||||
tools/collector
|
||||
grub/grubby
|
||||
utilities/platform-util
|
||||
|
||||
2
config-files/syslog-ng-config/centos/build_srpm.data
Normal file
2
config-files/syslog-ng-config/centos/build_srpm.data
Normal file
@ -0,0 +1,2 @@
|
||||
SRC_DIR="files"
|
||||
TIS_PATCH_VER=0
|
||||
64
config-files/syslog-ng-config/centos/syslog-ng-config.spec
Normal file
64
config-files/syslog-ng-config/centos/syslog-ng-config.spec
Normal file
@ -0,0 +1,64 @@
|
||||
Summary: StarlingX syslog-ng Configuration File
|
||||
Name: syslog-ng-config
|
||||
Version: 1.0
|
||||
Release: %{tis_patch_ver}%{?_tis_dist}
|
||||
License: Apache-2.0
|
||||
Group: config-files
|
||||
Packager: StarlingX
|
||||
URL: unknown
|
||||
Source: %name-%version.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
# systemd provides %{_unitdir}
|
||||
BuildRequires: systemd
|
||||
Requires: syslog-ng
|
||||
Requires: syslog-ng-libdbi
|
||||
|
||||
%define debug_package %{nil}
|
||||
|
||||
%description
|
||||
StarlingX syslog-ng configuration file
|
||||
|
||||
%prep
|
||||
|
||||
%setup
|
||||
|
||||
%build
|
||||
|
||||
%install
|
||||
install -d %{buildroot}%{_datadir}/starlingx
|
||||
install -D -m644 syslog-ng.conf %{buildroot}%{_datadir}/starlingx/syslog-ng.conf
|
||||
install -D -m644 syslog-ng.logrotate %{buildroot}%{_datadir}/starlingx/syslog-ng.logrotate
|
||||
install -D -m644 remotelogging.conf %{buildroot}%{_sysconfdir}/syslog-ng/remotelogging.conf
|
||||
install -d %{buildroot}%{_sbindir}
|
||||
install -D -m700 fm_event_syslogger %{buildroot}%{_sbindir}/fm_event_syslogger
|
||||
install -D -m644 syslog-ng.service %{buildroot}%{_datadir}/starlingx/syslog-ng.service
|
||||
|
||||
%post
|
||||
if [ $1 -eq 1 ] ; then
|
||||
cp -f %{_datadir}/starlingx/syslog-ng.conf %{_sysconfdir}/syslog-ng/syslog-ng.conf
|
||||
chmod 644 %{_sysconfdir}/syslog-ng/syslog-ng.conf
|
||||
cp -f %{_datadir}/starlingx/syslog-ng.logrotate %{_sysconfdir}/logrotate.d/syslog
|
||||
chmod 644 %{_sysconfdir}/logrotate.d/syslog
|
||||
cp -f %{_datadir}/starlingx/syslog-ng.service %{_unitdir}/syslog-ng.service
|
||||
chmod 644 %{_unitdir}/syslog-ng.service
|
||||
fi
|
||||
ldconfig
|
||||
%systemd_post syslog-ng.service
|
||||
|
||||
%preun
|
||||
%systemd_preun syslog-ng.service
|
||||
|
||||
%postun
|
||||
ldconfig
|
||||
%systemd_postun_with_restart syslog-ng.service
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license LICENSE
|
||||
%config(noreplace) %{_sysconfdir}/syslog-ng/remotelogging.conf
|
||||
%{_datadir}/starlingx/syslog-ng.conf
|
||||
%{_datadir}/starlingx/syslog-ng.logrotate
|
||||
%{_datadir}/starlingx/syslog-ng.service
|
||||
%{_sbindir}/fm_event_syslogger
|
||||
202
config-files/syslog-ng-config/files/LICENSE
Normal file
202
config-files/syslog-ng-config/files/LICENSE
Normal file
@ -0,0 +1,202 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
16
config-files/syslog-ng-config/files/syslog-ng.service
Normal file
16
config-files/syslog-ng-config/files/syslog-ng.service
Normal file
@ -0,0 +1,16 @@
|
||||
[Unit]
|
||||
Description=System Logger Daemon
|
||||
Documentation=man:syslog-ng(8)
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
Sockets=syslog.socket
|
||||
ExecStartPre=-/usr/bin/mkdir -p /var/run/syslog-ng/
|
||||
ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslog-ng/syslog-ng.pid
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
StandardOutput=null
|
||||
Restart=on-failure
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Alias=syslog.service
|
||||
@ -1,2 +0,0 @@
|
||||
COPY_LIST="$PKG_BASE/centos/files/*"
|
||||
TIS_PATCH_VER=20
|
||||
@ -1,25 +0,0 @@
|
||||
From 79edbd7d065ea0d6f18807722d4d8bfc193c2a15 Mon Sep 17 00:00:00 2001
|
||||
From: Don Penney <don.penney@windriver.com>
|
||||
Date: Tue, 27 Sep 2016 10:54:33 -0400
|
||||
Subject: [PATCH] Update package versioning for TIS format
|
||||
|
||||
---
|
||||
SPECS/syslog-ng.spec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/syslog-ng.spec b/SPECS/syslog-ng.spec
|
||||
index 39c8d79..a9c0914 100644
|
||||
--- a/SPECS/syslog-ng.spec
|
||||
+++ b/SPECS/syslog-ng.spec
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
Name: syslog-ng
|
||||
Version: 3.5.6
|
||||
-Release: 3%{?dist}
|
||||
+Release: 3.el7%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Next-generation syslog server
|
||||
|
||||
Group: System Environment/Daemons
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From cb258865db8bd9c37e22e45181b5dd3c9b3fee85 Mon Sep 17 00:00:00 2001
|
||||
From: Don Penney <don.penney@windriver.com>
|
||||
Date: Tue, 7 Mar 2017 13:38:12 -0500
|
||||
Subject: [PATCH] Add TIS content
|
||||
|
||||
---
|
||||
SPECS/syslog-ng.spec | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/SPECS/syslog-ng.spec b/SPECS/syslog-ng.spec
|
||||
index b54632c..a6d3f68 100644
|
||||
--- a/SPECS/syslog-ng.spec
|
||||
+++ b/SPECS/syslog-ng.spec
|
||||
@@ -12,10 +12,12 @@ URL: http://www.balabit.com/network-security/syslog-ng
|
||||
Source0: http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
|
||||
Source1: syslog-ng.conf
|
||||
Source2: syslog-ng.logrotate
|
||||
+Source3: remotelogging.conf
|
||||
|
||||
Patch0: syslog-ng-3.5.0-syslog-ng.service.patch
|
||||
Patch1: syslog-ng-3.4.0beta1-tests-functional-control.py.patch
|
||||
Patch2: syslog-ng-3.3.6-tests-functional-sql-test.patch
|
||||
+Patch3: syslog-ng-service-pid-file-pmond.patch
|
||||
|
||||
BuildRequires: systemd-units
|
||||
BuildRequires: pkgconfig
|
||||
@@ -148,6 +150,7 @@ developing applications that use %{name}.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
+%patch3 -p1
|
||||
|
||||
# fix perl path
|
||||
%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
|
||||
@@ -203,6 +206,7 @@ make DESTDIR=%{buildroot} install
|
||||
|
||||
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/conf.d
|
||||
%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf
|
||||
+%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/remotelogging.conf
|
||||
|
||||
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
|
||||
%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
|
||||
@@ -284,6 +288,7 @@ fi
|
||||
%dir %{_sysconfdir}/%{name}/conf.d
|
||||
%dir %{_sysconfdir}/%{name}/patterndb.d
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
|
||||
+%config(noreplace) %{_sysconfdir}/%{name}/remotelogging.conf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/scl.conf
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
|
||||
%{_unitdir}/%{name}.service
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
From e361372a2eb4f61f19c59f641b26dc9f109bf800 Mon Sep 17 00:00:00 2001
|
||||
From: Kam Nasim <kam.nasim@windriver.com>
|
||||
Date: Fri, 13 Oct 2017 12:18:48 -0400
|
||||
Subject: [PATCH] add FM Event Syslogger to be called from as a "program"
|
||||
destination from syslog-ng
|
||||
|
||||
---
|
||||
SPECS/syslog-ng.spec | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/SPECS/syslog-ng.spec b/SPECS/syslog-ng.spec
|
||||
index a6d3f68..a75e393 100644
|
||||
--- a/SPECS/syslog-ng.spec
|
||||
+++ b/SPECS/syslog-ng.spec
|
||||
@@ -13,6 +13,7 @@ Source0: http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{
|
||||
Source1: syslog-ng.conf
|
||||
Source2: syslog-ng.logrotate
|
||||
Source3: remotelogging.conf
|
||||
+Source4: fm_event_syslogger
|
||||
|
||||
Patch0: syslog-ng-3.5.0-syslog-ng.service.patch
|
||||
Patch1: syslog-ng-3.4.0beta1-tests-functional-control.py.patch
|
||||
@@ -208,6 +209,9 @@ make DESTDIR=%{buildroot} install
|
||||
%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf
|
||||
%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/remotelogging.conf
|
||||
|
||||
+%{__install} -d %{buildroot}%{_sbindir}
|
||||
+%{__install} -p -m 0700 %{SOURCE4} %{buildroot}%{_sbindir}/fm_event_syslogger
|
||||
+
|
||||
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
|
||||
%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
|
||||
|
||||
@@ -296,6 +300,7 @@ fi
|
||||
%dir %{_sharedstatedir}/%{name}
|
||||
%{_sbindir}/%{name}
|
||||
%{_sbindir}/syslog-ng-ctl
|
||||
+%{_sbindir}/fm_event_syslogger
|
||||
%{_bindir}/loggen
|
||||
%{_bindir}/pdbtool
|
||||
%{_bindir}/update-patterndb
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 90355b3a4f4169bba307427b747766d5a569be8b Mon Sep 17 00:00:00 2001
|
||||
From: slin14 <shuicheng.lin@intel.com>
|
||||
Date: Thu, 30 Aug 2018 18:06:39 +0800
|
||||
Subject: [PATCH] add patch to skip crypto test
|
||||
|
||||
Signed-off-by: slin14 <shuicheng.lin@intel.com>
|
||||
---
|
||||
SPECS/syslog-ng.spec | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/SPECS/syslog-ng.spec b/SPECS/syslog-ng.spec
|
||||
index a75e393..b3eb3ca 100644
|
||||
--- a/SPECS/syslog-ng.spec
|
||||
+++ b/SPECS/syslog-ng.spec
|
||||
@@ -19,6 +19,7 @@ Patch0: syslog-ng-3.5.0-syslog-ng.service.patch
|
||||
Patch1: syslog-ng-3.4.0beta1-tests-functional-control.py.patch
|
||||
Patch2: syslog-ng-3.3.6-tests-functional-sql-test.patch
|
||||
Patch3: syslog-ng-service-pid-file-pmond.patch
|
||||
+Patch4: skip-crypto-test-due-to-it-cause-build-failure.patch
|
||||
|
||||
BuildRequires: systemd-units
|
||||
BuildRequires: pkgconfig
|
||||
@@ -152,6 +153,7 @@ developing applications that use %{name}.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
+%patch4 -p1
|
||||
|
||||
# fix perl path
|
||||
%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
0001-Update-package-versioning-for-TIS-format.patch
|
||||
0002-Add-TIS-content.patch
|
||||
0003-add-fm-event-syslogger.patch
|
||||
0004-add-patch-to-skip-crypto-test.patch
|
||||
@ -1,32 +0,0 @@
|
||||
From f04b558f552aefa9e770026f1dd944756f2f4bbf Mon Sep 17 00:00:00 2001
|
||||
From: slin14 <shuicheng.lin@intel.com>
|
||||
Date: Thu, 30 Aug 2018 18:04:30 +0800
|
||||
Subject: [PATCH] skip crypto test due to it cause build failure
|
||||
|
||||
Signed-off-by: slin14 <shuicheng.lin@intel.com>
|
||||
---
|
||||
modules/cryptofuncs/tests/test_cryptofuncs.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/modules/cryptofuncs/tests/test_cryptofuncs.c b/modules/cryptofuncs/tests/test_cryptofuncs.c
|
||||
index 755660c..8ee67a6 100644
|
||||
--- a/modules/cryptofuncs/tests/test_cryptofuncs.c
|
||||
+++ b/modules/cryptofuncs/tests/test_cryptofuncs.c
|
||||
@@ -17,7 +17,9 @@ test_hash(void)
|
||||
assert_template_format("$(sha1 --length 5 foo)", "0beec");
|
||||
assert_template_format("$(sha1 -l 5 foo)", "0beec");
|
||||
assert_template_failure("$(sha1 --length 5)", "$(hash) parsing failed, invalid number of arguments");
|
||||
+#if 0
|
||||
assert_template_failure("$(sha1 --length invalid_length_specification foo)", "Cannot parse integer value 'invalid_length_specification' for --length");
|
||||
+#endif
|
||||
assert_template_format("$(sha1 --length 99999 foo)", "0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33");
|
||||
assert_template_format("$(sha1 foo bar)", "8843d7f92416211de9ebb963ff4ce28125932878");
|
||||
assert_template_format("$(sha1 \"foo bar\")", "3773dea65156909838fa6c22825cafe090ff8030");
|
||||
@@ -37,3 +39,4 @@ main(int argc G_GNUC_UNUSED, char *argv[] G_GNUC_UNUSED)
|
||||
deinit_template_tests();
|
||||
app_shutdown();
|
||||
}
|
||||
+
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
syslog-ng.service: pid file location to match pmon.d
|
||||
|
||||
pmon.d expects syslog-ng pid file to be at location
|
||||
/var/run/syslog-ng/syslog-ng.pid.
|
||||
|
||||
diff --git a/contrib/systemd/syslog-ng.service b/contrib/systemd/syslog-ng.service
|
||||
index e724363..606a967 100644
|
||||
--- a/contrib/systemd/syslog-ng.service
|
||||
+++ b/contrib/systemd/syslog-ng.service
|
||||
@@ -5,7 +5,8 @@ Documentation=man:syslog-ng(8)
|
||||
[Service]
|
||||
Type=notify
|
||||
Sockets=syslog.socket
|
||||
-ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslogd.pid
|
||||
+ExecStartPre=-/usr/bin/mkdir -p /var/run/syslog-ng/
|
||||
+ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslog-ng/syslog-ng.pid
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
StandardOutput=null
|
||||
Restart=on-failure
|
||||
@ -1 +0,0 @@
|
||||
mirror:Source/syslog-ng-3.5.6-3.el7.src.rpm
|
||||
Loading…
Reference in New Issue
Block a user