From: Adolf Belka <adolf.belka@ipfire.org>
Date: Fri, 18 Feb 2022 14:32:37 +0000 (+0100)
Subject: squid-accounting: Rename to proxy-accounting - bug#12772
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adb4174fa459d8102c674e8b6b7c9aeac17c8da2;p=people%2Fstevee%2Fipfire-2.x.git

squid-accounting: Rename to proxy-accounting - bug#12772

- Rename lfs, rootfile and paks directory
- Change name in make.sh
- Tested out in a vm system and worked

Fixes: Bug#12772
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---

diff --git a/config/rootfiles/packages/squid-accounting b/config/rootfiles/packages/proxy-accounting
similarity index 90%
rename from config/rootfiles/packages/squid-accounting
rename to config/rootfiles/packages/proxy-accounting
index 82b171e334..0c142ea5c9 100644
--- a/config/rootfiles/packages/squid-accounting
+++ b/config/rootfiles/packages/proxy-accounting
@@ -11,6 +11,6 @@ var/ipfire/addon-lang/acct.de.pl
 var/ipfire/addon-lang/acct.en.pl
 var/ipfire/addon-lang/acct.fr.pl
 var/ipfire/addon-lang/acct.tr.pl
-var/ipfire/backup/addons/includes/squid-accounting
+var/ipfire/backup/addons/includes/proxy-accounting
 var/ipfire/menu.d/EX-squid-accounting.menu
 var/log/accounting.log
diff --git a/lfs/squid-accounting b/lfs/proxy-accounting
similarity index 94%
rename from lfs/squid-accounting
rename to lfs/proxy-accounting
index 9476382b3e..024f249bec 100644
--- a/lfs/squid-accounting
+++ b/lfs/proxy-accounting
@@ -13,11 +13,11 @@ SUMMARY    = SQUID Accounting IPFire extension
 
 VER        = 1.0.4
 
-THISAPP    = squid-accounting-$(VER)
+THISAPP    = proxy-accounting-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = squid-accounting
-PAK_VER    = 13
+PROG       = proxy-accounting
+PAK_VER    = 14
 
 DEPS       = perl-File-ReadBackwards
 
@@ -65,7 +65,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	install -v -m 644 $(DIR_APP)/squid-accounting/EX-squid-accounting.menu /var/ipfire/menu.d/
 	install -v -m 755 $(DIR_APP)/squid-accounting/dbinstall.pl /var/ipfire/accounting/
 	install -v -m 644 $(DIR_APP)/squid-accounting/config/backup/includes/squid-accounting  \
-			/var/ipfire/backup/addons/includes/squid-accounting
+			/var/ipfire/backup/addons/includes/proxy-accounting
 
 #activate hourly logging of proxy logfile
 	ln -sf /usr/local/bin/acct.pl /etc/fcron.hourly/squid-accounting
diff --git a/make.sh b/make.sh
index a6f44030cb..ea3e0f9a14 100755
--- a/make.sh
+++ b/make.sh
@@ -1655,7 +1655,7 @@ buildipfire() {
   lfsmake2 perl-Font-TTF
   lfsmake2 perl-IO-String
   lfsmake2 perl-PDF-API2
-  lfsmake2 squid-accounting
+  lfsmake2 proxy-accounting
   lfsmake2 pigz
   lfsmake2 tmux
   lfsmake2 perl-Text-CSV_XS
diff --git a/src/paks/squid-accounting/install.sh b/src/paks/proxy-accounting/install.sh
similarity index 100%
rename from src/paks/squid-accounting/install.sh
rename to src/paks/proxy-accounting/install.sh
diff --git a/src/paks/squid-accounting/uninstall.sh b/src/paks/proxy-accounting/uninstall.sh
similarity index 100%
rename from src/paks/squid-accounting/uninstall.sh
rename to src/paks/proxy-accounting/uninstall.sh
diff --git a/src/paks/squid-accounting/update.sh b/src/paks/proxy-accounting/update.sh
similarity index 100%
rename from src/paks/squid-accounting/update.sh
rename to src/paks/proxy-accounting/update.sh