From: Naveen Albert <asterisk@phreaknet.org>
Date: Thu, 18 May 2023 16:55:45 +0000 (+0000)
Subject: logrotate: Fix duplicate log entries.
X-Git-Tag: 21.0.0-pre1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2159ec853275b53ac12ed697506cf44637504b17;p=thirdparty%2Fasterisk.git

logrotate: Fix duplicate log entries.

The Asterisk logrotate script contains explicit
references to files with the .log extension,
which are also included when *log is expanded.
This causes issues with newer versions of logrotate.
This fixes this by ensuring that a log file cannot
be referenced multiple times after expansion occurs.

Resolves: #96
ASTERISK-30442
Reported by: EN Barnett
Tested by: EN Barnett
---

diff --git a/contrib/scripts/asterisk.logrotate b/contrib/scripts/asterisk.logrotate
index f774446803..dc0bb16efd 100644
--- a/contrib/scripts/asterisk.logrotate
+++ b/contrib/scripts/asterisk.logrotate
@@ -1,13 +1,13 @@
-__LOGDIR__/debug.log __LOGDIR__/console __LOGDIR__/full.log __LOGDIR__/messages.log __LOGDIR__/*log {
+__LOGDIR__/*.log __LOGDIR__/queue_log __LOGDIR__/mmlog {
 	weekly
 	missingok
 	rotate 52
 	compress
 	delaycompress
 	notifempty
-	create 640 root root 
+	create 640 root root
 	sharedscripts
 	postrotate
-		__SBINDIR__/asterisk -rx 'logger reload' > /dev/null 2> /dev/null	
+		__SBINDIR__/asterisk -rx 'logger reload' > /dev/null 2> /dev/null
 	endscript
-} 
+}