[dev] Add additional functionality and provides statements to rsyslog (#1166)

This commit is contained in:
Thomas Crain 2021-07-21 10:23:24 -07:00 коммит произвёл GitHub
Родитель 4ac255ee79
Коммит 94a2cc2195
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 306 добавлений и 42 удалений

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -73,6 +73,7 @@
"libisoburn",
"libisofs",
"libkcapi",
"liblognorm",
"libpciaccess",
"libpwquality",
"libstoragemgmt",

Просмотреть файл

@ -0,0 +1,5 @@
{
"Signatures": {
"liblognorm-2.0.3.tar.gz": "a0c670b1f4ad0cb79dba0a4c16d9c3e8109596b5cdd744990e2924b79fd3dab3"
}
}

Просмотреть файл

@ -0,0 +1,178 @@
%define htmldir %{_docdir}/liblognorm/html
Summary: Fast samples-based log normalization library
Name: liblognorm
Version: 2.0.3
Release: 11%{?dist}
License: LGPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
URL: https://www.liblognorm.com
Source0: https://www.liblognorm.com/files/download/%{name}-%{version}.tar.gz
BuildRequires: chrpath
BuildRequires: gcc
BuildRequires: libestr-devel
BuildRequires: libfastjson-devel
BuildRequires: pcre-devel
BuildRequires: python3-sphinx
%description
Briefly described, liblognorm is a tool to normalize log data.
People who need to take a look at logs often have a common problem. Logs from
different machines (from different vendors) usually have different formats for
their logs. Even if it is the same type of log (e.g. from firewalls), the log
entries are so different, that it is pretty hard to read these. This is where
liblognorm comes into the game. With this tool you can normalize all your logs.
All you need is liblognorm and its dependencies and a sample database that fits
the logs you want to normalize.
%package devel
Summary: Development tools for programs using liblognorm library
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: json-c-devel%{?_isa}
Requires: libestr-devel%{?_isa}
%description devel
The liblognorm-devel package includes header files, libraries necessary for
developing programs which use liblognorm library.
%package doc
Summary: HTML documentation for liblognorm
%description doc
This sub-package contains documentation for liblognorm in a HTML form.
%package utils
Summary: Lognormalizer utility for normalizing log files
Requires: %{name}%{?_isa} = %{version}-%{release}
%description utils
The lognormalizer is the core of liblognorm, it is a utility for normalizing
log files.
%prep
%autosetup
%build
%configure \
--enable-regexp \
--enable-docs \
--docdir=%{htmldir} \
--includedir=%{_includedir}/%{name}/
%install
%make_install INSTALL="install -p"
rm -f %{buildroot}/%{_libdir}/*.{a,la}
chrpath -d %{buildroot}%{_bindir}/lognormalizer
chrpath -d %{buildroot}%{_libdir}/liblognorm.so
rm %{buildroot}%{htmldir}/{objects.inv,.buildinfo}
%ldconfig_scriptlets
%files
%license COPYING
%doc AUTHORS ChangeLog README
%exclude %{htmldir}
%{_libdir}/lib*.so.*
%files devel
%{_libdir}/lib*.so
%{_includedir}/%{name}/*.h
%{_libdir}/pkgconfig/*.pc
%files doc
%doc %{htmldir}
%files utils
%{_bindir}/lognormalizer
%changelog
* Tue Jul 20 2021 Thomas Crain <thcrain@microsoft.com> - 2.0.3-11
- License verified
- Spec linted
* Tue Jan 12 2021 Joe Schmitt <joschmit@microsoft.com> - 2.0.3-10
- Initial CBL-Mariner import from Fedora 32 (license: MIT)
- Explicit require python3-sphinx instead of unversioned.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Oct 12 2017 Marek Tamaskovic <mtamasko@redhat.com> - 2.0.3-4
- Fix header files location
- resolves rhbz#1113573
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Wed Mar 29 2017 Radovan Sroka <rsroka@redhat.com> - 2.0.2-1
- rebase to 2.0.3
* Thu Feb 9 2017 Radovan Sroka <rsroka@redhat.com> - 2.0.2-2
- removed forgoten commented line
* Thu Feb 9 2017 Radovan Sroka <rsroka@redhat.com> - 2.0.2-1
- rebase to 2.0.2
* Tue Oct 4 2016 Radovan Sroka <rsroka@redhat.com> - 2.0.1-1
- rebase to 2.0.1
* Tue Mar 15 2016 Radovan Sroka <rsroka@redhat.com> - 1.1.3-1
- rebase to v1.1.3
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Mar 15 2015 Tomas Heinrich <theinric@redhat.com> - 1.1.1-1
- rebase to 1.1.1 (soname bump)
- drop liblognorm-0.3.4-pc-file.patch, not needed anymore
- update dependencies for the new version
- add a new subpackage for documentation
- enable support for reqular expressions
- make build more verbose
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Jul 31 2013 Tomas Heinrich <theinric@redhat.com> - 0.3.7-1
- rebase to 0.3.7
* Wed Dec 12 2012 Mahaveer Darade <mah.darade@gmail.com> - 0.3.5-1
- upgrade to upstream version 0.3.5
- drop patch0, merged upstream
liblognorm-0.3.4-rename-to-lognormalizer.patch
- remove trailing whitespace
* Fri Oct 05 2012 mdarade <mdarade@redhat.com> - 0.3.4-4
- Modified description of main & util package
* Thu Sep 20 2012 Mahaveer Darade <mdarade@redhat.com> - 0.3.4-3
- Renamed normalizer binary to lognormalizer
- Updated pc file to exclude lee and lestr
* Mon Aug 27 2012 mdarade <mdarade@redhat.com> - 0.3.4-2
- Updated BuildRequires to contain libestr-devel
* Wed Aug 1 2012 Milan Bartos <mbartos@redhat.com> - 0.3.4-1
- initial port

Просмотреть файл

@ -2,6 +2,7 @@
"Signatures": {
"50-rsyslog-journald.conf": "c4c875396276951b491e799e9cdb5a090b2ca82a754967c7f310888373e51c40",
"rsyslog-8.37.0.tar.gz": "9e8125951375e5a37cd360a30e6b952edd69e691f7f3f56e52695cb71f894bfd",
"rsyslog-doc-8.37.0.tar.gz": "9ff5a6ecb93f2e4544b5d96a2ff9c47681a9946c02b351ec1f9363bd6eb688a7",
"rsyslog.conf": "f2d5b52fb527306452cdebb4a5fe549d89136063a65cc06d862dcf55c3489baf",
"rsyslog.service": "df62c9fa758079016e3b73f39d3b5952dce1e0c14a063c7a776b86eeba405153"
}

Просмотреть файл

@ -2,7 +2,7 @@
Summary: Rocket-fast system for log processing
Name: rsyslog
Version: 8.37.0
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv3+ AND ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
@ -12,6 +12,7 @@ Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}
Source1: rsyslog.service
Source2: 50-rsyslog-journald.conf
Source3: rsyslog.conf
Source4: http://www.rsyslog.com/files/download/rsyslog/%{name}-doc-%{version}.tar.gz
BuildRequires: autogen
BuildRequires: curl-devel
BuildRequires: gnutls-devel
@ -19,53 +20,109 @@ BuildRequires: krb5-devel
BuildRequires: libestr-devel
BuildRequires: libfastjson-devel
BuildRequires: libgcrypt-devel
BuildRequires: liblognorm-devel
BuildRequires: librdkafka-devel
BuildRequires: librelp-devel
BuildRequires: net-snmp-devel
BuildRequires: postgresql-devel
BuildRequires: systemd-devel
BuildRequires: zlib-devel
Requires: gnutls
Requires: libestr
Requires: libfastjson
Requires: libgcrypt
Requires: librelp
Requires: systemd
Provides: %{name}-crypto = %{version}-%{release}
Provides: %{name}-elasticsearch = %{version}-%{release}
Provides: %{name}-gnutls = %{version}-%{release}
Provides: %{name}-gssapi = %{version}-%{release}
Provides: %{name}-kafka = %{version}-%{release}
Provides: %{name}-mmaudit = %{version}-%{release}
Provides: %{name}-mmjsonparse = %{version}-%{release}
Provides: %{name}-mmkubernetes = %{version}-%{release}
Provides: %{name}-mmnormalize = %{version}-%{release}
Provides: %{name}-mmsnmptrapd = %{version}-%{release}
Provides: %{name}-pgsql = %{version}-%{release}
Provides: %{name}-relp = %{version}-%{release}
Provides: %{name}-snmp = %{version}-%{release}
%description
RSYSLOG is the rocket-fast system for log processing.
It offers high-performance, great security features and a modular design. While it started as a regular syslogd, rsyslog has evolved into a kind of swiss army knife of logging, being able to accept inputs from a wide variety of sources, transform them, and output to the results to diverse destinations.
%package doc
Summary: Documentation files for %{name}
BuildArch: noarch
%description doc
HTML documentation for %{name}
%prep
# Unpack the code source tarball
%setup -q
# Unpack the documentation tarball in the folder created above
%setup -q -a 4 -T -D
# Remove documentation sources
rm -rf sources
# Move prebuilt documentation files to a documentation folder
mv build docs
autoreconf -fvi
%build
sed -i 's/libsystemd-journal/libsystemd/' configure
./configure \
--prefix=%{_prefix} \
--enable-relp \
%configure \
--disable-static \
--enable-elasticsearch \
--enable-gnutls\
--enable-gssapi-krb5 \
--enable-imfile \
--enable-imjournal \
--enable-imkafka \
--enable-impstats \
--enable-imptcp \
--enable-relp
--enable-imptcp \
--enable-mail \
--enable-mmanon \
--enable-mmaudit \
--enable-mmcount \
--enable-mmjsonparse \
--enable-mmkubernetes \
--enable-mmnormalize \
--enable-mmsnmptrapd \
--enable-mmutf8fix \
--enable-omjournal \
--enable-omkafka \
--enable-omprog \
--enable-omstdout \
--enable-omuxsock \
--enable-pgsql \
--enable-pmaixforwardedfrom \
--enable-pmcisconames \
--enable-pmlastmsg \
--enable-pmsnare \
--enable-relp \
--enable-snmp \
--enable-unlimited-select \
--enable-usertools
make %{?_smp_mflags}
%make_build
%install
make DESTDIR=%{buildroot} install
%make_install
install -vd %{buildroot}%{_libdir}/systemd/system/
install -vd %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/
install -vd %{buildroot}%{_docdir}/%{name}/html
rm -f %{buildroot}/lib/systemd/system/rsyslog.service
install -p -m 644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/
install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/
install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rsyslog.conf
cp -r docs/* %{buildroot}%{_docdir}/%{name}/html
find %{buildroot} -type f -name "*.la" -delete -print
%check
make %{?_smp_mflags} check
%make_build check
%post
/sbin/ldconfig
@ -81,6 +138,7 @@ make %{?_smp_mflags} check
%files
%defattr(-,root,root)
%license COPYING
%{_bindir}/rscryutil
%{_sbindir}/*
%{_libdir}/rsyslog/*.so
%{_mandir}/man5/*
@ -88,57 +146,68 @@ make %{?_smp_mflags} check
%{_libdir}/systemd/system/rsyslog.service
%{_sysconfdir}/systemd/journald.conf.d/*
%{_sysconfdir}/rsyslog.conf
%files doc
%doc %{_docdir}/%{name}/html
%changelog
* Mon Jul 19 2021 Thomas Crain <thcrain@microsoft.com> - 8.37.0-6
- Add html documentation subpackage from upstream-provided tarball
- Enable various features and add the corresponding provides for subpackages from other distros:
- crypto, elasticsearch, kafka, mmaudit, mmjson, mmkubernetes,
- mmnormalize, mmsnmptrapd, pgsql, snmp
- License verified
* Tue Jan 12 2021 Ruying Chen <v-ruyche@microsoft.com> - 8.37.0-5
- Build with gssapi, relp support and add explicit provides.
* Sat May 09 00:21:21 PST 2020 Nick Samson <nisamson@microsoft.com> - 8.37.0-4
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 8.37.0-4
- Added %%license line automatically
* Thu Apr 09 2020 Nicolas Ontiveros <niontive@microsoft.com> 8.37.0-3
- Remove liblogging from requires.
* Thu Apr 09 2020 Nicolas Ontiveros <niontive@microsoft.com> - 8.37.0-3
- Remove liblogging from requires.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 8.37.0-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> - 8.37.0-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Mon Sep 10 2018 Keerthana K <keerthanak@vmware.com> 8.37.0-1
- Updated to version 8.37.0
* Mon Sep 10 2018 Keerthana K <keerthanak@vmware.com> - 8.37.0-1
- Updated to version 8.37.0
* Thu Apr 12 2018 Xiaolin Li <xiaolinl@vmware.com> 8.26.0-5
- Add $IncludeConfig /etc/rsyslog.d/ to rsyslog.conf
* Thu Apr 12 2018 Xiaolin Li <xiaolinl@vmware.com> - 8.26.0-5
- Add $IncludeConfig /etc/rsyslog.d/ to rsyslog.conf
* Fri Dec 15 2017 Anish Swaminathan <anishs@vmware.com> 8.26.0-4
- Remove kill SIGHUP from service file
* Fri Dec 15 2017 Anish Swaminathan <anishs@vmware.com> - 8.26.0-4
- Remove kill SIGHUP from service file
* Mon Nov 13 2017 Xiaolin Li <xiaolinl@vmware.com> 8.26.0-3
- Add a default rsyslog.conf.
* Mon Nov 13 2017 Xiaolin Li <xiaolinl@vmware.com> - 8.26.0-3
- Add a default rsyslog.conf.
* Tue Aug 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 8.26.0-2
- Fix CVE-2017-12588
* Tue Aug 15 2017 Dheeraj Shetty <dheerajs@vmware.com> - 8.26.0-2
- Fix CVE-2017-12588
* Mon Apr 24 2017 Siju Maliakkal <smaliakkal@vmware.com> 8.26.0-1
- Update to latest
* Mon Apr 24 2017 Siju Maliakkal <smaliakkal@vmware.com> - 8.26.0-1
- Update to latest
* Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com> 8.15.0-7
- Change systemd dependency
* Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com> - 8.15.0-7
- Change systemd dependency
* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 8.15.0-6
- Modified %check
* Wed Oct 05 2016 ChangLee <changlee@vmware.com> - 8.15.0-6
- Modified %check
* Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 8.15.0-5
- Fixed logic to restart the active services after upgrade
* Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> - 8.15.0-5
- Fixed logic to restart the active services after upgrade
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-4
- GA - Bump release of all rpms
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> - 8.15.0-4
- GA - Bump release of all rpms
* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-3
- Use systemd macros for post, preun and postun to respect upgrades
* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> - 8.15.0-3
- Use systemd macros for post, preun and postun to respect upgrades
* Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com> 8.15.0-2
- Add journald conf and new service file.
* Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com> - 8.15.0-2
- Add journald conf and new service file.
* Mon Jan 11 2016 Xiaolin Li <xiaolinl@vmware.com> 8.15.0-1
- Update rsyslog to 8.15.0
* Mon Jan 11 2016 Xiaolin Li <xiaolinl@vmware.com> - 8.15.0-1
- Update rsyslog to 8.15.0
* Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> 8.10.0-1
- Initial build. First version
* Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> - 8.10.0-1
- Initial build. First version

Просмотреть файл

@ -2950,6 +2950,16 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "liblognorm",
"version": "2.0.3",
"downloadUrl": "https://www.liblognorm.com/files/download/liblognorm-2.0.3.tar.gz"
}
}
},
{
"component": {
"type": "other",