Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package icingaweb2 for openSUSE:Factory checked in at 2023-05-21 19:08:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icingaweb2 (Old) and /work/SRC/openSUSE:Factory/.icingaweb2.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icingaweb2" Sun May 21 19:08:30 2023 rev:34 rq:1086054 version:2.11.4 Changes: -------- --- /work/SRC/openSUSE:Factory/icingaweb2/icingaweb2.changes 2023-01-28 18:53:39.201454887 +0100 +++ /work/SRC/openSUSE:Factory/.icingaweb2.new.1533/icingaweb2.changes 2023-05-21 19:08:44.790448166 +0200 @@ -1,0 +2,8 @@ +Tue May 9 11:02:10 UTC 2023 - ecsos <ec...@opensuse.org> + +- Add subpackge php-fpm with php-fpm configuration. +- Remove max php version restrictions for suse. +- Fix rights for /etc/icingaweb2/enabledModules directory + as upstream use. + +------------------------------------------------------------------- New: ---- icingaweb2-php-fpm.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icingaweb2.spec ++++++ --- /var/tmp/diff_new_pack.wp7a5Z/_old 2023-05-21 19:08:46.182456112 +0200 +++ /var/tmp/diff_new_pack.wp7a5Z/_new 2023-05-21 19:08:46.186456135 +0200 @@ -28,6 +28,7 @@ URL: https://icinga.com Source0: https://github.com/Icinga/icingaweb2/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}-additions.tar.gz +Source10: %{name}-php-fpm.conf Source90: README.SUSE Source99: %{name}-rpmlintrc BuildArch: noarch @@ -75,12 +76,15 @@ %define wwwconfigdir %{_sysconfdir}/apache2/conf.d %define wwwuser wwwrun %define php php +##%%define php_major_version %%(php -r "echo PHP_MAJOR_VERSION;") +%define php_major_version 8 %define php_runtime mod_php_any %define php_common %{php} %define php_cli %{php} # extra requirements on openSUSE BuildRequires: fdupes BuildRequires: gettext-tools +BuildRequires: php BuildRequires: config(krb5) Requires: %{php}-ldap Requires: %{php}-mysql @@ -97,8 +101,14 @@ %{?suse_version:Requires(pre): pwdutils} Requires: %{php_common} >= %{php_version} +%if 0%{?suse_version} +BuildRequires: php%{php_major_version}-fpm +Requires: (mod_php_any >= %{php_version} or php-fpm) +%else Requires: %{php_runtime} >= %{php_version} Conflicts: %{php_runtime} >= %{php_unsupported_version} +%endif + %if 0%{?suse_version} Requires: apache2 %endif @@ -139,12 +149,23 @@ %{?rhel:Requires(pre): shadow-utils} %{?suse_version:Requires(pre): pwdutils} %if 0%{?suse_version} > 1320 +PreReq: permissions Requires(pre): system-user-wwwrun %endif %description common Common files for Icinga Web 2 and the Icinga CLI. +%package php-fpm +Summary: PHP FPM configuration for %{name} +Group: Productivity/Networking/Web/Utilities +%requires_eq %{php_major_version}-fpm >= %{php_version} +#Requires: %%{name}-apparmor +Requires: %{name} = %{version} + +%description php-fpm +This package contains the PHP FPM configuration file to run %{name} with php-fpm. + %package -n php-Icinga Summary: Icinga Web 2 PHP library License: BSD-3-Clause AND GPL-2.0-or-later AND MIT @@ -283,6 +304,7 @@ %if 0%{?suse_version} # rpmlint find . -type f "(" -name "*.css" -o -name "*.html" -o -name "*.json" -o -name "*.svg" -o -name "*.txt" -o -name "README" ")" -exec chmod -x "{}" "+" +sed -i '1d' library/vendor/JShrink/SOURCE %endif %build @@ -299,7 +321,7 @@ %install rm -rf %{buildroot} -mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules,%{storagedir},%{logdir},%{phpdir},%{wwwconfigdir},%{_datadir}/bash-completion/completions,%{docsdir}} +mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/{enabledModules,modules},%{storagedir},%{logdir},%{phpdir},%{wwwconfigdir},%{_datadir}/bash-completion/completions,%{docsdir}} cp -prv application doc %{buildroot}/%{basedir} cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_datadir}/bash-completion/completions/icingacli cp -prv modules/{monitoring,setup,doc,translation,migrate} %{buildroot}/%{basedir}/modules @@ -331,6 +353,10 @@ #/usr/sbin/hardlink -cv %%{buildroot}%%{_datadir}/selinux %endif %if 0%{?suse_version} +# fpm +mkdir -p %{buildroot}%{_sysconfdir}/php%{php_major_version}/fpm/php-fpm.d +cp -avL %{SOURCE10} %{buildroot}%{_sysconfdir}/php%{php_major_version}/fpm/php-fpm.d/%{name}.conf +# fdupes %fdupes %{buildroot}/%{basedir}/library %endif @@ -364,6 +390,12 @@ fi fi +%verifyscript common +%verify_permissions -e %{configdir}/enabledModules + +%post common +%set_permissions %{configdir}/enabledModules + %files %defattr(-,root,root) %{basedir}/application/controllers @@ -403,6 +435,11 @@ %attr(0770,root,%{icingawebgroup}) %dir %{storagedir} %attr(0770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir} %attr(0770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules +%verify(not mode caps) %attr(2770,root,%{icingawebgroup}) %{configdir}/enabledModules +%attr(2770,root,%{icingawebgroup}) %dir %{configdir}/enabledModules + +%files php-fpm +%config(noreplace) %{_sysconfdir}/php%{php_major_version}/fpm/php-fpm.d/%{name}.conf %files -n php-Icinga %defattr(-,root,root) ++++++ icingaweb2-php-fpm.conf ++++++ [icingaweb2] user = icinga group = icingaweb2 apparmor_hat = icingaweb2 listen = /run/php-fpm/fpm-icingaweb2.socket listen.owner = wwwrun listen.group = www listen.mode = 0660 pm = dynamic pm.max_children = 5 pm.start_servers = 1 pm.min_spare_servers = 1 pm.max_spare_servers = 3 chdir = /srv/www/vhosts/icingaweb2 env[PATH]=/usr/bin:/bin php_admin_value[open_basedir] = /usr/share/icingaweb2:/etc/icingaweb2:/var/log/icingaweb2/ php_admin_value[upload_tmp_dir] = /srv/www/vhosts/icingaweb2/tmp php_admin_value[session.save_path] = /srv/www/vhosts/icingaweb2/sessions ; php_admin_value[opcache.enable]=1 ; php_admin_value[opcache.enable_cli]=1 ; php_admin_value[opcache.interned_strings_buffer]=8 ; php_admin_value[opcache.max_accelerated_files]=10000 ; php_admin_value[opcache.memory_consumption]=128 ; php_admin_value[opcache.save_comments]=1 ; php_admin_value[opcache.revalidate_freq]=1 ; php_admin_value[memory_limit]=512M php_admin_value[upload_max_filesize]=10G php_admin_value[post_max_size]=10G ++++++ icingaweb2-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.wp7a5Z/_old 2023-05-21 19:08:46.282456683 +0200 +++ /var/tmp/diff_new_pack.wp7a5Z/_new 2023-05-21 19:08:46.286456706 +0200 @@ -1,5 +1,4 @@ # wrong fsf-adress -addFilter("description-shorter-than-summary"); addFilter("files-duplicate"); -addFilter("incorrect-fsf-address"); +addFilter("zero-length");
