From 3e03b928cc358e475e43636a9e7cdef0f9108783 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Thu, 16 Jan 2025 18:52:07 +0800
Subject: [PATCH] disable rotate counts from logrotate config

---
 nginx.logrotate |  1 -
 nginx.spec      | 28 ++++++++++++++--------------
 nginx.yaml      |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/nginx.logrotate b/nginx.logrotate
index 353da6e..0145cd2 100644
--- a/nginx.logrotate
+++ b/nginx.logrotate
@@ -1,7 +1,6 @@
 /var/log/nginx/*log {
     create 0664 nginx root
     daily
-    rotate 10
     missingok
     notifempty
     compress
diff --git a/nginx.spec b/nginx.spec
index 68b2d53..3dfebe8 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -17,10 +17,10 @@
 Name:              nginx
 Epoch:             1
 Version:           1.24.0
-Release:           2
+Release:           3
 Summary:           A HTTP server, reverse proxy and mail proxy server
-License:           BSD
-URL:               http://nginx.org/
+License:           BSD-2-Clause
+URL:               https://nginx.org/
 
 Source0:           https://nginx.org/download/nginx-%{version}.tar.gz
 Source10:          nginx.service
@@ -111,7 +111,6 @@ Nginx HTTP image filter module.
 Summary:           HTTP perl module for nginx
 BuildRequires:     perl-devel perl(ExtUtils::Embed)
 Requires:          nginx(abi) = %{version}  perl(constant)
-Requires:          perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description mod-http-perl
 Nginx HTTP perl module.
@@ -157,7 +156,7 @@ Nginx module development
 
 %prep
 %autosetup -n %{name}-%{version} -p1
-cp %{SOURCE200} %{SOURCE210} %{SOURCE10} %{SOURCE12} .
+cp %{S:200} %{S:210} %{S:10} %{S:12} .
 cp -a ../%{name}-%{version} ../%{name}-%{version}-%{release}-src
 mv ../%{name}-%{version}-%{release}-src .
 
@@ -208,7 +207,7 @@ find %{buildroot} -type f -iname '*.so' -exec chmod 0755 '{}' \;
 
 pushd %{buildroot}
 install -p -D -m 0644 %{_builddir}/nginx-%{version}/nginx.service .%{_unitdir}/nginx.service
-install -p -D -m 0644 %{SOURCE11} .%{_sysconfdir}/logrotate.d/nginx
+install -p -D -m 0644 %{S:11} .%{_sysconfdir}/logrotate.d/nginx
 install -p -d -m 0755 .%{_sysconfdir}/systemd/system/nginx.service.d
 install -p -d -m 0755 .%{_unitdir}/nginx.service.d
 install -p -d -m 0755 .%{_sysconfdir}/nginx/conf.d
@@ -220,16 +219,16 @@ install -p -d -m 0755 .%{_datadir}/nginx/html
 install -p -d -m 0755 .%{_datadir}/nginx/modules
 install -p -d -m 0755 .%{_libdir}/nginx/modules
 install -p -m 0644 %{_builddir}/nginx-%{version}/nginx.conf .%{_sysconfdir}/nginx
-install -p -m 0644 %{SOURCE100} .%{_datadir}/nginx/html
-install -p -m 0644 %{SOURCE102} .%{_datadir}/nginx/html
-install -p -m 0644 %{SOURCE103} %{SOURCE104} .%{_datadir}/nginx/html
+install -p -m 0644 %{S:100} .%{_datadir}/nginx/html
+install -p -m 0644 %{S:102} .%{_datadir}/nginx/html
+install -p -m 0644 %{S:103} %{S:104} .%{_datadir}/nginx/html
 
 %if 0%{?with_mailcap_mimetypes}
 rm -f .%{_sysconfdir}/nginx/mime.types
 %endif
 
 install -p -D -m 0644 %{_builddir}/nginx-%{version}/man/nginx.8 .%{_mandir}/man8/nginx.8
-install -p -D -m 0755 %{SOURCE13} .%{_bindir}/nginx-upgrade
+install -p -D -m 0755 %{S:13} .%{_bindir}/nginx-upgrade
 popd
 
 for i in ftdetect indent syntax; do
@@ -262,8 +261,8 @@ sed -e "s|@@NGINX_ABIVERSION@@|%{version}|g" \
     -e "s|@@NGINX_MODDIR@@|%{_libdir}\/nginx\/modules|g" \
     -e "s|@@NGINX_MODCONFDIR@@|%{_datadir}\/nginx\/modules|g" \
     -e "s|@@NGINX_SRCDIR@@|%{_usrsrc}\/%{name}-%{version}-%{release}|g" \
-    %{SOURCE14} > %{buildroot}%{_rpmmacrodir}/macros.nginxmods
-install -Dpm0644 %{SOURCE15} %{buildroot}%{_fileattrsdir}/nginxmods.attr
+    %{S:14} > %{buildroot}%{_rpmmacrodir}/macros.nginxmods
+install -Dpm0644 %{S:15} %{buildroot}%{_fileattrsdir}/nginxmods.attr
 
 %pre filesystem
 getent group %{nginx_user} > /dev/null || groupadd -r %{nginx_user}
@@ -316,7 +315,6 @@ if [ $1 -ge 1 ]; then
 fi
 
 %files
-%defattr(-,root,root)
 %license LICENSE
 %config(noreplace) %{_sysconfdir}/nginx/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/nginx
@@ -383,12 +381,14 @@ fi
 %{_usrsrc}/%{name}-%{version}-%{release}
 
 %files help
-%defattr(-,root,root)
 %doc CHANGES README README.dynamic
 %{_mandir}/man3/nginx.3pm*
 %{_mandir}/man8/nginx.8*
 
 %changelog
+* Thu Sep 12 2024 Funda Wang <fundawang@yeah.net> - 1:1.24.0-3
+- disable rotate counts from logrotate config
+
 * Thu Aug 15 2024 Funda Wang <fundawang@yeah.net> - 1:1.24.0-2
 - fix CVE-2024-7347
 
diff --git a/nginx.yaml b/nginx.yaml
index e0b9c44..81f8793 100644
--- a/nginx.yaml
+++ b/nginx.yaml
@@ -1,4 +1,4 @@
 version_control: github
 src_repo: nginx/nginx
 tag_prefix: release-
-seperator: .
+separator: .
-- 
Gitee