Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nginx for openSUSE:Factory checked
in at 2025-07-20 15:28:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nginx (Old)
and /work/SRC/openSUSE:Factory/.nginx.new.8875 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nginx"
Sun Jul 20 15:28:27 2025 rev:102 rq:1293972 version:1.29.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/nginx/nginx.changes 2025-06-27
23:01:05.500727634 +0200
+++ /work/SRC/openSUSE:Factory/.nginx.new.8875/nginx.changes 2025-07-20
15:28:50.275488200 +0200
@@ -1,0 +2,12 @@
+Wed Jul 16 22:29:54 UTC 2025 - Илья Индиго <i...@ilya.top>
+
+- Changed nginx.logrotate and nginx-conf.patch files.
+ * Removed hardcoded user and group definitions.
+- Removed ending slashes wherever possible.
+
+-------------------------------------------------------------------
+Wed Jul 16 21:33:02 UTC 2025 - Parag Jain <parag.j...@suse.com>
+
+- Removed root privileges when running logrotate (bsc#1246090).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nginx.spec ++++++
--- /var/tmp/diff_new_pack.8OBPWp/_old 2025-07-20 15:28:51.079521472 +0200
+++ /var/tmp/diff_new_pack.8OBPWp/_new 2025-07-20 15:28:51.079521472 +0200
@@ -100,8 +100,9 @@
%prep
%autosetup -p1
-sed -i 's/\r//g' contrib/geo2nginx.pl
-sed -i -e 's|#LIBDIR#|%{_libdir}|g' -e 's|/var/run|/run|' conf/nginx.conf
+sed -i 's/\r//' contrib/geo2nginx.pl
+sed -i -e 's/USER/%{ngx_user_group}/' -e 's/GROUP/%{ngx_user_group}/'
%{SOURCE4} conf/%{name}.conf
+sed -i -e 's|#LIBDIR#|%{_libdir}|' -e 's|/var/run|/run|' conf/%{name}.conf
sed -i 's/^\(#define NGX_LISTEN_BACKLOG \).*/\1-1/'
src/os/unix/ngx_linux_config.h
%build
@@ -124,12 +125,12 @@
mkdir -p %{buildroot}%{ngx_doc_dir}
cp -av CHANGES* LICENSE %{buildroot}%{ngx_doc_dir}
-mkdir -p %{buildroot}%{_datadir}/%{name}/
-mkdir -p %{buildroot}%{ngx_conf_dir}/vhosts.d/
-mkdir -p %{buildroot}%{ngx_conf_dir}/conf.d/
+mkdir -p %{buildroot}%{_datadir}/%{name}
+mkdir -p %{buildroot}%{ngx_conf_dir}/vhosts.d
+mkdir -p %{buildroot}%{ngx_conf_dir}/conf.d
chmod a+rx contrib/geo2nginx.pl
-cp -av contrib/geo2nginx.pl contrib/unicode2nginx/
%{buildroot}%{_datadir}/%{name}/
+cp -av contrib/geo2nginx.pl contrib/unicode2nginx/
%{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{src_install_dir}
tar -xzf %{SOURCE0} --strip-components=1 -C %{buildroot}%{src_install_dir}
@@ -137,9 +138,9 @@
copydocs() {
subdir=$1;
shift;
- mkdir -p %{buildroot}%{ngx_doc_dir}/$subdir/
+ mkdir -p %{buildroot}%{ngx_doc_dir}/$subdir
pushd $subdir
- cp -av $* %{buildroot}%{ngx_doc_dir}/$subdir/
+ cp -av $* %{buildroot}%{ngx_doc_dir}/$subdir
popd
}
@@ -162,7 +163,7 @@
%service_del_postun %{name}.service
%files
-%dir %{ngx_conf_dir}/
+%dir %{ngx_conf_dir}
%dir %{ngx_conf_dir}/vhosts.d
%dir %{ngx_conf_dir}/conf.d
%config(noreplace) %{ngx_conf_dir}/koi-utf
@@ -171,7 +172,7 @@
%config %{ngx_conf_dir}/fastcgi_params.default
%config(noreplace) %{ngx_conf_dir}/mime.types
%config %{ngx_conf_dir}/mime.types.default
-%config(noreplace) %{ngx_conf_dir}/nginx.conf
+%config(noreplace) %{ngx_conf_dir}/%{name}.conf
%config %{ngx_conf_dir}/%{name}.conf.default
%config(noreplace) %{ngx_conf_dir}/fastcgi.conf
%config %{ngx_conf_dir}/fastcgi.conf.default
@@ -180,11 +181,11 @@
%config %{ngx_conf_dir}/scgi_params.default
%config(noreplace) %{ngx_conf_dir}/uwsgi_params
%config %{ngx_conf_dir}/uwsgi_params.default
-%{perl_vendorarch}/auto/%{name}/
+%{perl_vendorarch}/auto/%{name}
%{perl_vendorarch}/%{name}.pm
%{ngx_sbin_path}
-%dir %{_libdir}/%{name}/
-%dir %{ngx_module_dir}/
+%dir %{_libdir}/%{name}
+%dir %{ngx_module_dir}
%{ngx_module_dir}/ngx_http_image_filter_module.so
%{ngx_module_dir}/ngx_http_perl_module.so
%{ngx_module_dir}/ngx_http_xslt_filter_module.so
@@ -194,8 +195,8 @@
%dir /srv/www
%dir /srv/www/htdocs
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%dir %attr(750,%{ngx_user_group},%{ngx_user_group})
%{_localstatedir}/log/nginx/
-%dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_home}/
+%dir %attr(750,%{ngx_user_group},%{ngx_user_group})
%{_localstatedir}/log/%{name}
+%dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_home}
%dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_tmp_http}
%dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_tmp_proxy}
%dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_tmp_fcgi}
@@ -204,7 +205,7 @@
%doc %{ngx_doc_dir}
%{_unitdir}/%{name}.service
%{_sysusersdir}/%{name}.conf
-%{_datadir}/%{name}/
+%{_datadir}/%{name}
%files source
%{src_install_dir}
++++++ nginx-conf.patch ++++++
--- /var/tmp/diff_new_pack.8OBPWp/_old 2025-07-20 15:28:51.131523624 +0200
+++ /var/tmp/diff_new_pack.8OBPWp/_new 2025-07-20 15:28:51.135523790 +0200
@@ -2,7 +2,7 @@
--- nginx-1.27.4.orig/conf/nginx.conf 2025-02-05 14:06:32.000000000 +0300
+++ nginx-1.27.4/conf/nginx.conf 2025-03-30 05:11:05.303755904 +0300
@@ -1,117 +1,130 @@
-+#user nginx nginx;
++#user USER GROUP;
+#worker_processes 1;
+#pcre_jit off;
++++++ nginx.logrotate ++++++
--- /var/tmp/diff_new_pack.8OBPWp/_old 2025-07-20 15:28:51.175525444 +0200
+++ /var/tmp/diff_new_pack.8OBPWp/_new 2025-07-20 15:28:51.179525611 +0200
@@ -1,4 +1,5 @@
/var/log/nginx/*.log {
+ su USER GROUP
compress
dateext
maxage 365
