From 3e0c08eab0b0b08e23be4f0afb164d70d7d9e9a6 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 17 Jan 2018 12:43:47 +0100 Subject: [PATCH 01/18] Update spec file for new library names --- icinga2.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index 1a85ea0..eade601 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -633,8 +633,8 @@ fi %files libs %defattr(-,root,root,-) %doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md -%exclude %{_libdir}/%{name}/libdb_ido_mysql* -%exclude %{_libdir}/%{name}/libdb_ido_pgsql* +%exclude %{_libdir}/%{name}/libmysql_shim* +%exclude %{_libdir}/%{name}/libpgsql_shim* %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so* @@ -699,14 +699,14 @@ fi %defattr(-,root,root,-) %doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-mysql.conf -%{_libdir}/%{name}/libdb_ido_mysql* +%{_libdir}/%{name}/libmysql_shim* %{_datadir}/icinga2-ido-mysql %files ido-pgsql %defattr(-,root,root,-) %doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-pgsql.conf -%{_libdir}/%{name}/libdb_ido_pgsql* +%{_libdir}/%{name}/libpgsql_shim* %{_datadir}/icinga2-ido-pgsql %if 0%{?use_selinux} From a3ec2fec46d20bfad4a85a8e87ddef90e1e4f39e Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 22 Jan 2018 08:30:06 +0100 Subject: [PATCH 02/18] Add libsystemd as a dependency for RPM builds --- icinga2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icinga2.spec b/icinga2.spec index eade601..8de3e72 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -149,7 +149,7 @@ BuildRequires: boost-devel >= 1.48 %endif %if 0%{?use_systemd} -BuildRequires: systemd +BuildRequires: systemd-devel Requires: systemd %endif From b309067e37d4761eb56728af909557d4f8ba3b26 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Mon, 29 Jan 2018 14:58:00 +0100 Subject: [PATCH 03/18] icinga2: Add Provides tag for user and groups (#66) * Add Provides tag for user and groups Following the guide https://en.opensuse.org/openSUSE:Packaging_guidelines#Users_and_Groups as requested by our security team. --- icinga2.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/icinga2.spec b/icinga2.spec index 8de3e72..8b50d55 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -139,6 +139,12 @@ BuildRequires: boost153-devel # sles 11 sp3 requires packages.icinga.com BuildRequires: boost153-devel %else +%if "%{_vendor}" == "suse" && 0%{?suse_version} > 1320 +BuildRequires: libboost_thread-devel >= 1.48 +BuildRequires: libboost_program_options-devel >= 1.48 +BuildRequires: libboost_regex-devel >= 1.48 +BuildRequires: libboost_system-devel >= 1.48 +%else %if (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") # Requires EPEL repository BuildRequires: boost148-devel >= 1.48 @@ -147,6 +153,7 @@ BuildRequires: boost-devel >= 1.48 %endif %endif %endif +%endif %if 0%{?use_systemd} BuildRequires: systemd-devel @@ -168,6 +175,9 @@ Requires(post): shadow-utils %endif BuildRequires: logrotate %if "%{_vendor}" == "suse" +Provides: user(%{icinga_user}) +Provides: group(%{icinga_group}) +Provides: group(%{icingacmd_group}) Requires(pre): shadow Requires(post): shadow # Coreutils is added because of autoyast problems reported From bd7b8a5ea3086e3c155fbab1b683bd14f6cdd008 Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Tue, 6 Feb 2018 15:16:36 +0100 Subject: [PATCH 04/18] Remove icinga2-studio package --- icinga2.spec | 44 +++++--------------------------------------- 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index 8b50d55..6a4ddf9 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -211,7 +211,7 @@ Group: System/Libraries Requires: %{name}-common = %{version}-%{release} %description libs -This subpackage provides the internal libraries for the daemon or studio. +This subpackage provides the internal libraries for the daemon. %package ido-mysql @@ -265,18 +265,6 @@ SELinux policy module supporting icinga2 %endif -%if 0%{?fedora} -%package studio -Summary: Studio for Icinga 2 -Group: System/Monitoring -Requires: %{name}-libs = %{version}-%{release} -Requires: wxGTK3 - -%description studio -Provides a GUI for the Icinga 2 API. -%endif - - %package -n vim-icinga2 Summary: Vim syntax highlighting for icinga2 Group: Productivity/Text/Editors @@ -410,24 +398,6 @@ cd - #/usr/sbin/hardlink -cv %%{buildroot}%%{_datadir}/selinux %endif -%if 0%{?fedora} -mkdir -p "%{buildroot}%{_datadir}/icinga2-studio" -install -p -m 644 icinga-studio/icinga.ico %{buildroot}%{_datadir}/icinga2-studio - -mkdir -p "%{buildroot}%{_datadir}/applications" -echo "[Desktop Entry] -Name=Icinga 2 Studio -Comment=API viewer for Icinga 2 -TryExec=icinga-studio -Exec=icinga-studio -Icon=/usr/share/icinga2-studio/icinga.ico -StartupNotify=true -Terminal=false -Type=Application -Categories=GTK;Utility; -Keywords=Monitoring;" > %{buildroot}%{_datadir}/applications/icinga2-studio.desktop -%endif - %if "%{_vendor}" == "suse" install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/site/syntax/%{name}.vim install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir}/vim/site/ftdetect/%{name}.vim @@ -726,14 +696,6 @@ fi %{_datadir}/selinux/*/%{selinux_modulename}.pp %endif -%if 0%{?fedora} -%files studio -%defattr(-,root,root,-) -%{_bindir}/icinga-studio -%{_datadir}/icinga2-studio -%{_datadir}/applications/icinga2-studio.desktop -%endif - %files -n vim-icinga2 %defattr(-,root,root,-) %if "%{_vendor}" == "suse" @@ -752,6 +714,10 @@ fi %{_datadir}/nano/%{name}.nanorc %changelog +* Tue Feb 06 2018 Markus Frosch 2.9.0-0 +- Preparing snapshot update to 2.9.0 +- Remove icinga2-studio + * Wed Jan 17 2018 Gunnar Beutner 2.8.1-1 - Update to 2.8.1 From d79cfb907ed4e1b38142070d4e49f5bb72bd8e62 Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Tue, 6 Feb 2018 15:31:02 +0100 Subject: [PATCH 05/18] Remove BuildRequires for icinga2-studio --- icinga2.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index 6a4ddf9..c0601a8 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -127,9 +127,6 @@ BuildRequires: cmake BuildRequires: flex >= 2.5.35 BuildRequires: bison BuildRequires: make -%if 0%{?fedora} -BuildRequires: wxGTK3-devel -%endif %if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") # el5 and el6 require packages.icinga.com From 0d8a1af253d61e4175954bab374279cf506f8205 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Thu, 15 Feb 2018 15:03:20 +0100 Subject: [PATCH 06/18] Align icinga2.spec file consistently --- icinga2.spec | 183 ++++++++++++++++++++++++++------------------------- 1 file changed, 92 insertions(+), 91 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index c0601a8..a5d337c 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -77,95 +77,95 @@ %define logmsg logger -t %{name}/rpm -Summary: Network monitoring application -Name: icinga2 -Version: 2.8.1 -Release: %{revision}%{?dist} -License: GPLv2+ -URL: https://www.icinga.com/ -Group: System/Monitoring -Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz +Summary: Network monitoring application +Name: icinga2 +Version: 2.8.1 +Release: %{revision}%{?dist} +License: GPLv2+ +Url: https://www.icinga.com/ +Group: System/Monitoring +Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: %{name}-bin = %{version}-%{release} +Requires: %{name}-bin = %{version}-%{release} %description Meta package for Icinga 2 Core, DB IDO and Web. %package bin -Summary: Icinga 2 binaries and libraries -Group: System/Monitoring +Summary: Icinga 2 binaries and libraries +Group: System/Monitoring %if "%{_vendor}" == "suse" -PreReq: permissions -Provides: monitoring_daemon -Recommends: monitoring-plugins +PreReq: permissions +Provides: monitoring_daemon +Recommends: monitoring-plugins %if 0%{?suse_version} >= 1310 -BuildRequires: libyajl-devel +BuildRequires: libyajl-devel %endif %endif -BuildRequires: libedit-devel -BuildRequires: ncurses-devel +BuildRequires: libedit-devel +BuildRequires: ncurses-devel %if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 -BuildRequires: gcc48-c++ -BuildRequires: libstdc++48-devel -BuildRequires: libopenssl1-devel +BuildRequires: gcc48-c++ +BuildRequires: libopenssl1-devel +BuildRequires: libstdc++48-devel %else %if "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") # Requires devtoolset-2 scl -BuildRequires: devtoolset-2-gcc-c++ -BuildRequires: devtoolset-2-libstdc++-devel -BuildRequires: devtoolset-2-binutils +BuildRequires: devtoolset-2-binutils +BuildRequires: devtoolset-2-gcc-c++ +BuildRequires: devtoolset-2-libstdc++-devel %define scl_enable scl enable devtoolset-2 -- %else -BuildRequires: gcc-c++ -BuildRequires: libstdc++-devel +BuildRequires: gcc-c++ +BuildRequires: libstdc++-devel %endif -BuildRequires: openssl-devel +BuildRequires: openssl-devel %endif -BuildRequires: cmake -BuildRequires: flex >= 2.5.35 -BuildRequires: bison -BuildRequires: make +BuildRequires: bison +BuildRequires: cmake +BuildRequires: flex >= 2.5.35 +BuildRequires: make %if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") # el5 and el6 require packages.icinga.com -BuildRequires: boost153-devel +BuildRequires: boost153-devel %else %if 0%{?build_icinga_org} && "%{_vendor}" == "suse" && 0%{?suse_version} < 1310 # sles 11 sp3 requires packages.icinga.com -BuildRequires: boost153-devel +BuildRequires: boost153-devel %else %if "%{_vendor}" == "suse" && 0%{?suse_version} > 1320 -BuildRequires: libboost_thread-devel >= 1.48 -BuildRequires: libboost_program_options-devel >= 1.48 -BuildRequires: libboost_regex-devel >= 1.48 -BuildRequires: libboost_system-devel >= 1.48 +BuildRequires: libboost_program_options-devel >= 1.48 +BuildRequires: libboost_regex-devel >= 1.48 +BuildRequires: libboost_system-devel >= 1.48 +BuildRequires: libboost_thread-devel >= 1.48 %else %if (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") # Requires EPEL repository -BuildRequires: boost148-devel >= 1.48 +BuildRequires: boost148-devel >= 1.48 %else -BuildRequires: boost-devel >= 1.48 +BuildRequires: boost-devel >= 1.48 %endif %endif %endif %endif %if 0%{?use_systemd} -BuildRequires: systemd-devel -Requires: systemd +BuildRequires: systemd-devel +Requires: systemd %endif -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description bin Icinga 2 is a general-purpose network monitoring application. This subpackage provides the binaries for Icinga 2 Core. %package common -Summary: Common Icinga 2 configuration -Group: System/Monitoring +Summary: Common Icinga 2 configuration +Group: System/Monitoring %if (0%{?amzn} || 0%{?fedora} || 0%{?rhel}) Requires(pre): shadow-utils Requires(post): shadow-utils @@ -195,36 +195,36 @@ among Icinga 2 related packages. %package doc -Summary: Documentation for Icinga 2 -Group: Documentation/Other +Summary: Documentation for Icinga 2 +Group: Documentation/Other %description doc This subpackage provides documentation for Icinga 2. %package libs -Summary: Libraries for Icinga 2 -Group: System/Libraries -Requires: %{name}-common = %{version}-%{release} +Summary: Libraries for Icinga 2 +Group: System/Libraries +Requires: %{name}-common = %{version}-%{release} %description libs This subpackage provides the internal libraries for the daemon. %package ido-mysql -Summary: IDO MySQL database backend for Icinga 2 -Group: System/Monitoring +Summary: IDO MySQL database backend for Icinga 2 +Group: System/Monitoring %if "%{_vendor}" == "suse" -BuildRequires: libmysqlclient-devel +BuildRequires: libmysqlclient-devel %if 0%{?suse_version} >= 1310 -BuildRequires: mysql-devel +BuildRequires: mysql-devel %endif %else -BuildRequires: mysql-devel +BuildRequires: mysql-devel %endif #suse -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description ido-mysql Icinga 2 IDO mysql database backend. Compatible with Icinga 1.x @@ -232,14 +232,14 @@ IDOUtils schema >= 1.12 %package ido-pgsql -Summary: IDO PostgreSQL database backend for Icinga 2 -Group: System/Monitoring +Summary: IDO PostgreSQL database backend for Icinga 2 +Group: System/Monitoring %if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 -BuildRequires: postgresql-devel >= 8.4 +BuildRequires: postgresql-devel >= 8.4 %else -BuildRequires: postgresql-devel +BuildRequires: postgresql-devel %endif -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description ido-pgsql Icinga 2 IDO PostgreSQL database backend. Compatible with Icinga 1.x @@ -252,7 +252,9 @@ IDOUtils schema >= 1.12 %package selinux Summary: SELinux policy module supporting icinga2 Group: System/Base -BuildRequires: checkpolicy, selinux-policy-devel, hardlink +BuildRequires: checkpolicy +BuildRequires: hardlink +BuildRequires: selinux-policy-devel Requires: %{name} = %{version}-%{release} Requires(post): policycoreutils-python Requires(postun): policycoreutils-python @@ -261,15 +263,14 @@ Requires(postun): policycoreutils-python SELinux policy module supporting icinga2 %endif - %package -n vim-icinga2 -Summary: Vim syntax highlighting for icinga2 -Group: Productivity/Text/Editors +Summary: Vim syntax highlighting for icinga2 +Group: Productivity/Text/Editors %if "%{_vendor}" == "suse" -BuildRequires: vim -Requires: vim +BuildRequires: vim +Requires: vim %else -Requires: vim-filesystem +Requires: vim-filesystem %endif %description -n vim-icinga2 @@ -277,9 +278,9 @@ Vim syntax highlighting for icinga2 %package -n nano-icinga2 -Summary: Nano syntax highlighting for icinga2 -Group: Productivity/Text/Editors -Requires: nano +Summary: Nano syntax highlighting for icinga2 +Group: Productivity/Text/Editors +Requires: nano %description -n nano-icinga2 Nano syntax highlighting for icinga2 @@ -359,7 +360,7 @@ cd - %install make install \ - DESTDIR="%{buildroot}" + DESTDIR="%{buildroot}" # install custom limits.conf for systemd %if 0%{?configure_systemd_limits} @@ -444,10 +445,10 @@ getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /s if [ ${1:-0} -eq 1 ] then - # initial installation, enable default features - for feature in checker notification mainlog; do - ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf - done + # initial installation, enable default features + for feature in checker notification mainlog; do + ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf + done fi exit 0 @@ -463,10 +464,10 @@ exit 0 if [ ${1:-0} -eq 1 ] then - # initial installation, enable default features - for feature in checker notification mainlog; do - ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf - done + # initial installation, enable default features + for feature in checker notification mainlog; do + ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf + done fi exit 0 @@ -491,7 +492,7 @@ exit 0 %systemd_postun_with_restart %{name}.service %else if [ "$1" -ge "1" ]; then - /sbin/service %{name} condrestart >/dev/null 2>&1 || : + /sbin/service %{name} condrestart >/dev/null 2>&1 || : fi %endif @@ -499,8 +500,8 @@ fi # suse / rhel if [ "$1" = "0" ]; then - # deinstallation of the package - remove enabled features - rm -rf %{_sysconfdir}/%{name}/features-enabled + # deinstallation of the package - remove enabled features + rm -rf %{_sysconfdir}/%{name}/features-enabled fi exit 0 @@ -524,8 +525,8 @@ exit 0 %systemd_preun %{name}.service %else if [ "$1" = "0" ]; then - /sbin/service %{name} stop > /dev/null 2>&1 || : - /sbin/chkconfig --del %{name} || : + /sbin/service %{name} stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name} || : fi %endif @@ -537,16 +538,16 @@ exit 0 %post ido-mysql if [ ${1:-0} -eq 1 ] then - # initial installation, enable ido-mysql feature - ln -sf ../features-available/ido-mysql.conf %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf + # initial installation, enable ido-mysql feature + ln -sf ../features-available/ido-mysql.conf %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf fi exit 0 %postun ido-mysql if [ "$1" = "0" ]; then - # deinstallation of the package - remove feature - rm -f %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf + # deinstallation of the package - remove feature + rm -f %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf fi exit 0 @@ -554,16 +555,16 @@ exit 0 %post ido-pgsql if [ ${1:-0} -eq 1 ] then - # initial installation, enable ido-pgsql feature - ln -sf ../features-available/ido-pgsql.conf %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf + # initial installation, enable ido-pgsql feature + ln -sf ../features-available/ido-pgsql.conf %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf fi exit 0 %postun ido-pgsql if [ "$1" = "0" ]; then - # deinstallation of the package - remove feature - rm -f %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf + # deinstallation of the package - remove feature + rm -f %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf fi exit 0 From 6f9f78244a4329199d860ec7d6517ce5cc7f5095 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Thu, 15 Feb 2018 15:06:20 +0100 Subject: [PATCH 07/18] Change naming style of license according to SPDX https://spdx.org/licenses/ --- icinga2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icinga2.spec b/icinga2.spec index a5d337c..7e3a71f 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -81,7 +81,7 @@ Summary: Network monitoring application Name: icinga2 Version: 2.8.1 Release: %{revision}%{?dist} -License: GPLv2+ +License: GPL-2.0+ Url: https://www.icinga.com/ Group: System/Monitoring Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz From c64e13a8f4d8da4ffeee8cd33e29a19fc29a22f3 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Thu, 15 Feb 2018 15:08:08 +0100 Subject: [PATCH 08/18] Improve package descriptions --- icinga2.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index 7e3a71f..69ed43c 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -260,7 +260,7 @@ Requires(post): policycoreutils-python Requires(postun): policycoreutils-python %description selinux -SELinux policy module supporting icinga2 +SELinux policy module supporting icinga2. %endif %package -n vim-icinga2 @@ -274,7 +274,7 @@ Requires: vim-filesystem %endif %description -n vim-icinga2 -Vim syntax highlighting for icinga2 +Provides Vim syntax highlighting for icinga2. %package -n nano-icinga2 @@ -283,7 +283,7 @@ Group: Productivity/Text/Editors Requires: nano %description -n nano-icinga2 -Nano syntax highlighting for icinga2 +Provides Nano syntax highlighting for icinga2. %prep %setup -q -n %{name}-%{version} From ac6f710f2e848af05cd71fc9a2686d8b3a408bf6 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Tue, 6 Feb 2018 13:55:50 +0100 Subject: [PATCH 09/18] Use correct fillupdir on SUSE --- icinga2.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/icinga2.spec b/icinga2.spec index 69ed43c..02c49d5 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -378,9 +378,14 @@ rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf %else ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}" %endif +%if ( 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || 0%{?suse_version} > 1500 +mkdir -p "%{buildroot}%{_fillupdir}/" +mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_fillupdir}/sysconfig.%{name}" +%else mkdir -p "%{buildroot}%{_localstatedir}/adm/fillup-templates/" mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}" %endif +%endif %if 0%{?use_selinux} cd tools/selinux @@ -632,7 +637,11 @@ fi %endif %if "%{_vendor}" == "suse" %{_sbindir}/rc%{name} +%if ( 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || 0%{?suse_version} > 1500 +%{_fillupdir}/sysconfig.%{name} +%else %{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +%endif %else %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %endif From b14b4b2958957991990b8af6fb6b31f430467a41 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Tue, 6 Feb 2018 13:56:38 +0100 Subject: [PATCH 10/18] Use /bin/bash instead of env --- icinga2.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/icinga2.spec b/icinga2.spec index 02c49d5..e3ebaeb 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -287,6 +287,10 @@ Provides Nano syntax highlighting for icinga2. %prep %setup -q -n %{name}-%{version} +# use absolute shebang instead of env on SUSE distributions +%if "%{_vendor}" == "suse" +find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \; +%endif %build CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ From 900b7cf3d9bba8e8c0d3fb38405a14ffe392a919 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Thu, 15 Feb 2018 15:43:25 +0100 Subject: [PATCH 11/18] Fix duplication in file lists --- icinga2.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index e3ebaeb..4db4826 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -673,13 +673,12 @@ fi %attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat %attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat/archives %attr(0750,%{icinga_user},%{icinga_group}) %{_localstatedir}/lib/%{name} -%attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name} +%attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %dir %{_rundir}/%{name} %attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name} %attr(0770,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/tmp -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include -%{_datadir}/%{name}/include +%attr(0750,%{icinga_user},%{icinga_group}) %{_datadir}/%{name}/include %files doc %defattr(-,root,root,-) From d8c8777b243f69743abf6680474953b4ec639552 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Mon, 19 Feb 2018 18:05:21 +0100 Subject: [PATCH 12/18] Fix regression in include file list The issue was introduced by the commit 900b7cf3d9bba8e8c0d3fb38405a14ffe392a919 The preceding attr was marking not only the directory but also the files as executable. --- icinga2.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/icinga2.spec b/icinga2.spec index 4db4826..1d86f70 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -678,7 +678,8 @@ fi %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name} %attr(0770,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/tmp -%attr(0750,%{icinga_user},%{icinga_group}) %{_datadir}/%{name}/include +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include +%{_datadir}/%{name}/include/* %files doc %defattr(-,root,root,-) From 6c09a2c5e7a5908f1b34a9bed4ca7a0f9eb88263 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Mon, 19 Feb 2018 19:19:43 +0100 Subject: [PATCH 13/18] Fix permission issues on SUSE distributions The icinga/cmd file was moved from the bin package to common. --- icinga2.spec | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index 4db4826..f2088ff 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -97,7 +97,6 @@ Summary: Icinga 2 binaries and libraries Group: System/Monitoring %if "%{_vendor}" == "suse" -PreReq: permissions Provides: monitoring_daemon Recommends: monitoring-plugins %if 0%{?suse_version} >= 1310 @@ -172,6 +171,7 @@ Requires(post): shadow-utils %endif BuildRequires: logrotate %if "%{_vendor}" == "suse" +PreReq: permissions Provides: user(%{icinga_user}) Provides: group(%{icinga_group}) Provides: group(%{icingacmd_group}) @@ -424,27 +424,18 @@ getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /s %if 0%{?use_systemd} %service_add_pre %{name}.service %endif -%endif -%if "%{_vendor}" == "suse" -%verifyscript bin +%verifyscript common %verify_permissions -e %{_rundir}/%{name}/cmd %endif -%post bin - -# suse -%if "%{_vendor}" == "suse" - -%if 0%{?suse_version} >= 1310 -%set_permissions %{_rundir}/%{name}/cmd -%endif - -%endif #suse/rhel - %post common # suse %if "%{_vendor}" == "suse" +%if 0%{?suse_version} >= 1310 +%set_permissions %{_rundir}/%{name}/cmd +%endif + %if 0%{?use_systemd} %fillup_only %{name} %service_add_post %{name}.service From 5678af8541cbbed53412289ccad2c6b2a3caa70d Mon Sep 17 00:00:00 2001 From: Jean Flach Date: Thu, 22 Feb 2018 10:08:15 +0100 Subject: [PATCH 14/18] Remove init.conf --- icinga2.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/icinga2.spec b/icinga2.spec index 4db4826..fefef70 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -657,7 +657,6 @@ fi %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/scripts %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/zones.d %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/%{name}.conf -%config(noreplace) %attr(0640,root,%{icinga_group}) %{_sysconfdir}/%{name}/init.conf %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/constants.conf %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.conf %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/*.conf From 2391b095bcd363772cec1833c81e72090e2b5785 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 19 Apr 2018 08:47:08 +0200 Subject: [PATCH 15/18] Explicitly set ICINGA2_SYSCONFIGFILE in package builds refs icinga/icinga2#6215 --- icinga2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/icinga2.spec b/icinga2.spec index 1c31385..281217a 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -302,6 +302,7 @@ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ -DBoost_NO_BOOST_CMAKE=ON \ -DICINGA2_PLUGINDIR=%{plugindir} \ -DICINGA2_RUNDIR=%{_rundir} \ + -DICINGA2_SYSCONFIGFILE=/etc/sysconfig/icinga2 \ -DICINGA2_USER=%{icinga_user} \ -DICINGA2_GROUP=%{icinga_group} \ -DICINGA2_COMMAND_GROUP=%{icingacmd_group}" From c879f17b78d4c61a9521d7ebc842309fbd313f65 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 3 May 2018 09:34:33 +0200 Subject: [PATCH 16/18] Update license This drops COPYING.Exceptions which has been moved with icinga/icinga2#6283 --- icinga2.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index 281217a..8221519 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -600,7 +600,7 @@ fi %files bin %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md %{_sbindir}/%{name} %dir %{_libdir}/%{name}/sbin %{_libdir}/%{name}/sbin/%{name} @@ -611,7 +611,7 @@ fi %files libs %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md +%doc COPYING Exceptions README.md NEWS AUTHORS CHANGELOG.md %exclude %{_libdir}/%{name}/libmysql_shim* %exclude %{_libdir}/%{name}/libpgsql_shim* %dir %{_libdir}/%{name} @@ -619,7 +619,7 @@ fi %files common %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md tools/syntax +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md tools/syntax %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_sysconfdir}/bash_completion.d/%{name} %if 0%{?use_systemd} @@ -679,14 +679,14 @@ fi %files ido-mysql %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-mysql.conf %{_libdir}/%{name}/libmysql_shim* %{_datadir}/icinga2-ido-mysql %files ido-pgsql %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-pgsql.conf %{_libdir}/%{name}/libpgsql_shim* %{_datadir}/icinga2-ido-pgsql From d0f51d5ec7ced424df0f57828d21b2ccb82db23b Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Fri, 4 May 2018 15:43:16 +0200 Subject: [PATCH 17/18] Fix commit from PR #6 --- icinga2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icinga2.spec b/icinga2.spec index 8221519..a487c70 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -611,7 +611,7 @@ fi %files libs %defattr(-,root,root,-) -%doc COPYING Exceptions README.md NEWS AUTHORS CHANGELOG.md +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md %exclude %{_libdir}/%{name}/libmysql_shim* %exclude %{_libdir}/%{name}/libpgsql_shim* %dir %{_libdir}/%{name} From bd9548fb8a51d080fdc9b8df427e6e6ed2e64ff5 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Tue, 17 Jul 2018 14:43:51 +0200 Subject: [PATCH 18/18] Release 2.9.0 --- icinga2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/icinga2.spec b/icinga2.spec index a487c70..ed07714 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -79,7 +79,7 @@ Summary: Network monitoring application Name: icinga2 -Version: 2.8.1 +Version: 2.9.0 Release: %{revision}%{?dist} License: GPL-2.0+ Url: https://www.icinga.com/ @@ -716,6 +716,9 @@ fi %{_datadir}/nano/%{name}.nanorc %changelog +* Tue Jul 17 2018 Michael Friedrich 2.9.0-1 +- Update to 2.9.0 + * Tue Feb 06 2018 Markus Frosch 2.9.0-0 - Preparing snapshot update to 2.9.0 - Remove icinga2-studio