From 2b12a010d7ea97996a3b7accaab0316cb71de515 Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 5 Mar 2022 16:27:17 +0100
Subject: [PATCH] ids-functions.pl: Merge same named rulefiles during extract.

In case a rulestarball contains several same-named rulefiles
they have been overwritten each time and so only contained the content
from the last extracted one.

Now the content of those files will be merged by appending the content
to the first extracted one for each time.

Fixes #12792.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 config/cfgroot/ids-functions.pl | 34 +++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index d15973a38e..79cc369829 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -583,8 +583,38 @@ sub extractruleset ($) {
 				next;
 			}
 
-			# Extract the file to the temporary directory.
-			$tar->extract_file("$packed_file", "$destination");
+			# Check if the destination file exists.
+			unless(-e "$destination") {
+				# Extract the file to the temporary directory.
+				$tar->extract_file("$packed_file", "$destination");
+			} else {
+				# Load perl module to deal with temporary files.
+				use File::Temp;
+
+				# Generate temporary file name, located in the temporary rules directory and a suffix of ".tmp".
+				my $tmp = File::Temp->new( SUFFIX => ".tmp", DIR => "$tmp_rules_directory", UNLINK => 0 );
+				my $tmpfile = $tmp->filename();
+
+				# Extract the file to the new temporary file name.
+				$tar->extract_file("$packed_file", "$tmpfile");
+
+				# Open the the existing file.
+				open(DESTFILE, ">>", "$destination") or die "Could not open $destination. $!\n";
+				open(TMPFILE, "<", "$tmpfile") or die "Could not open $tmpfile. $!\n";
+
+				# Loop through the content of the temporary file.
+				while (<TMPFILE>) {
+					# Append the content line by line to the destination file.
+					print DESTFILE "$_";
+				}
+
+				# Close the file handles.
+				close(TMPFILE);
+				close(DESTFILE);
+
+				# Remove the temporary file.
+				unlink("$tmpfile");
+			}
 		}
 	}
 }
-- 
2.39.2