Packages update on Centos 8 and Fedora

This commit is contained in:
2023-05-19 12:32:37 +02:00
parent 3194e5f5f8
commit ad2956964c
6 changed files with 69 additions and 22 deletions

View File

@@ -21,8 +21,8 @@
Name: nginx
Epoch: 1
Version: 1.22.1
Release: 11%{?dist}
Version: 1.24.0
Release: 99%{?dist}
Summary: A high performance web server and reverse proxy server
Group: System Environment/Daemons
@@ -54,8 +54,8 @@ Source210: UPGRADE-NOTES-1.6-to-1.10
# removes -Werror in upstream build scripts. -Werror conflicts with
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
Patch0: nginx-auto-cc-gcc.patch
#Patch1: ngx_user_crypt.patch
Patch 0: nginx-auto-cc-gcc.patch
#Patch 1: ngx_user_crypt.patch
%if 0%{?with_gperftools}
BuildRequires: gperftools-devel
@@ -89,6 +89,18 @@ Nginx is a web server and a reverse proxy server for HTTP, SMTP, POP3 and
IMAP protocols, with a strong focus on high concurrency, performance and low
memory usage.
%package core
Summary: nginx minimal core
%if 0%{?with_mailcap_mimetypes}
Requires: nginx-mimetypes
%endif
Requires: openssl%{?openssl_pkgversion}-libs
Requires(pre): nginx-filesystem
Conflicts: nginx < 1:1.20.2-4
%description core
nginx minimal core
%package all-modules
Group: System Environment/Daemons
Summary: A meta package that installs all available Nginx modules
@@ -243,9 +255,9 @@ Modsecurity module for nginx
%setup -q -b 2 -n modsecurity-nginx-%{modsecver}
%endif
%setup -q
%patch0 -p0
%patch 0 -p0
#%if 0%{?fedora} > 27
#%patch1 -p1
#%patch 1 -p1
#%endif
cp %{SOURCE200} %{SOURCE210} %{SOURCE10} %{SOURCE12} .
@@ -261,6 +273,8 @@ sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' nginx.conf
# to error out. This is is also the reason for the DESTDIR environment
# variable.
export DESTDIR=%{buildroot}
# So the perl module finds its symbols:
nginx_ldopts="$RPM_LD_FLAGS -Wl,-E"
./configure \
--prefix=%{_datadir}/nginx \
--sbin-path=%{_sbindir}/nginx \
@@ -277,6 +291,8 @@ export DESTDIR=%{buildroot}
--lock-path=/run/lock/subsys/nginx \
--user=%{nginx_user} \
--group=%{nginx_user} \
--with-compat \
--with-debug \
%if 0%{?with_aio}
--with-file-aio \
%endif
@@ -341,6 +357,8 @@ install -p -D -m 0644 ./nginx.service \
install -p -D -m 0644 %{SOURCE11} \
%{buildroot}%{_sysconfdir}/logrotate.d/nginx
install -d %{buildroot}%{_sysconfdir}/systemd/system/nginx.service.d
install -d %{buildroot}%{_unitdir}/nginx.service.d
install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nginx/conf.d
install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nginx/default.d
@@ -502,14 +520,11 @@ if [ $1 -ge 1 ]; then
fi
%files
%license LICENSE
%doc CHANGES README README.dynamic
%if 0%{?rhel} == 7
%doc UPGRADE-NOTES-1.6-to-1.10
%endif
%{_datadir}/nginx/html/*
%{_bindir}/nginx-upgrade
%{_sbindir}/nginx
%{_datadir}/vim/vimfiles/ftdetect/nginx.vim
%{_datadir}/vim/vimfiles/syntax/nginx.vim
%{_datadir}/vim/vimfiles/indent/nginx.vim
@@ -517,6 +532,11 @@ fi
%{_mandir}/man8/nginx.8*
%{_mandir}/man8/nginx-upgrade.8*
%{_unitdir}/nginx.service
%files core
%license LICENSE
%doc CHANGES README README.dynamic
%{_sbindir}/nginx
%config(noreplace) %{_sysconfdir}/nginx/fastcgi.conf
%config(noreplace) %{_sysconfdir}/nginx/fastcgi.conf.default
%config(noreplace) %{_sysconfdir}/nginx/fastcgi_params
@@ -535,10 +555,13 @@ fi
%config(noreplace) %{_sysconfdir}/nginx/uwsgi_params.default
%config(noreplace) %{_sysconfdir}/nginx/win-utf
%config(noreplace) %{_sysconfdir}/logrotate.d/nginx
%attr(700,%{nginx_user},%{nginx_user}) %dir %{_localstatedir}/lib/nginx
%attr(700,%{nginx_user},%{nginx_user}) %dir %{_localstatedir}/lib/nginx/tmp
%attr(700,%{nginx_user},%{nginx_user}) %dir %{_localstatedir}/log/nginx
%dir %{_libdir}/nginx/modules
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx/tmp
%attr(711,root,root) %dir %{_localstatedir}/log/nginx
%ghost %attr(640,%{nginx_user},root) %{_localstatedir}/log/nginx/access.log
%ghost %attr(640,%{nginx_user},root) %{_localstatedir}/log/nginx/error.log
#%dir %{nginx_moduledir}
#%dir %{nginx_moduleconfdir}
%files all-modules
@@ -548,6 +571,8 @@ fi
%dir %{_sysconfdir}/nginx
%dir %{_sysconfdir}/nginx/conf.d
%dir %{_sysconfdir}/nginx/default.d
%dir %{_sysconfdir}/systemd/system/nginx.service.d
%dir %{_unitdir}/nginx.service.d
%files mod-http-geoip
%{_datadir}/nginx/modules/mod-http-geoip.conf
@@ -610,6 +635,10 @@ fi
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
%changelog
* Thu May 11 2023 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Nginx updated to 1.24.0 version.
- First build on Fedora 38.
* Fri Nov 11 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
- ngx_fancyindex module added.