[PATCH 1/5] functions.pl: pakfir cleanup

[PATCH 1/5] functions.pl: pakfir cleanup

[Adolf Belka]

- I wondered what was supposed to be in the pakfire.log file that has always been empty
   so I had a look around and discovered that it has been commented out since CU30
- So this patch removes that commented out line and the other patches in this set
   remove the creation of the empty pakfire.log file and stop it being restored etc

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 src/pakfire/lib/functions.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 2f172c398..e2c646313 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022   IPFire Team   <info@ipfire.org>                   #
+# Copyright (C) 2007-2025   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -105,7 +105,6 @@ sub message {
 sub logger {
 	my $log = shift;
 	if ($log) {
-		#system("echo \"`date`: $log\" >> /var/log/pakfire.log");
 		system("logger -t pakfire \"$log\"");
 	}
 }
-- 
2.50.0

[PATCH 2/5] pakfire: Remove creation of pakfire.log that is never used

[Adolf Belka]

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/pakfire | 1 -
 lfs/pakfire                     | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/config/rootfiles/common/pakfire b/config/rootfiles/common/pakfire
index b2a10cf37..8fe0f09a4 100644
--- a/config/rootfiles/common/pakfire
+++ b/config/rootfiles/common/pakfire
@@ -17,4 +17,3 @@ opt/pakfire/pakfire
 opt/pakfire/tmp
 var/cache/pakfire
 var/log/pakfire
-var/log/pakfire.log
diff --git a/lfs/pakfire b/lfs/pakfire
index da7a648c8..2e75f7f68 100644
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -58,9 +58,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		> $(DIR_APP)/etc/pakfire.conf
 	chown root.root $(DIR_APP) -R
 	chmod 755 $(DIR_APP)/pakfire
-	touch /var/log/pakfire.log
-	chown root.nobody /var/log/pakfire.log
-	chmod 644 /var/log/pakfire.log
 	ln -sf ../../var/log/pakfire /opt/pakfire/logs
 	ln -sf ../../var/cache/pakfire /opt/pakfire/cache
 	@$(POSTBUILD)
-- 
2.50.0

[PATCH 3/5] backup.pl: Stop restore of the empty pakfire.log file

[Adolf Belka]

- With the removal of the pakfire.log file from the install, this patch stops the empty
   file being restored from old backups

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/backup/backup.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 0b8272266..fe62213e8 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -345,6 +345,11 @@ restore_backup() {
                 /usr/local/bin/ipsecctrl S
         fi
 
+	if [ -e /var/log/pakfire.log ]; then
+		rm /var/log/pakfire.log
+	fi
+
+
 	return 0
 }
 
-- 
2.50.0

[PATCH 4/5] update.sh: Remove pakfire.log file as it is not used

[Adolf Belka]

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/core/196/update.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/rootfiles/core/196/update.sh b/config/rootfiles/core/196/update.sh
index 3b2485f9c..ac5e5baac 100644
--- a/config/rootfiles/core/196/update.sh
+++ b/config/rootfiles/core/196/update.sh
@@ -92,7 +92,8 @@ rm -rfv \
 	/usr/bin/genisoimage \
 	/usr/bin/mkhybrid \
 	/usr/lib/librols.so.* \
-	/usr/lib/libusual.so.*
+	/usr/lib/libusual.so.* \
+	/var/log/pakfire.log
 
 # Extract files
 extract_files
-- 
2.50.0

[PATCH 5/5] core196: Ship pakfire

[Adolf Belka]

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/core/196/filelists/pakfire | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 config/rootfiles/core/196/filelists/pakfire

diff --git a/config/rootfiles/core/196/filelists/pakfire b/config/rootfiles/core/196/filelists/pakfire
new file mode 120000
index 000000000..d5b1d0d03
--- /dev/null
+++ b/config/rootfiles/core/196/filelists/pakfire
@@ -0,0 +1 @@
+../../../common/pakfire
\ No newline at end of file
-- 
2.50.0