From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: [PATCH v2] Core Update 165: Rename squid-accounting add-on to proxy-accounting Date: Sat, 19 Mar 2022 14:09:15 +0100 Message-ID: In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9068618259904464015==" List-Id: --===============9068618259904464015== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi All, I am trying to do an update of this patch for /core/165/update.sh related to = the proxy-accounting addon. I was able to fairly easily copy the approach from Peter on the earlier lines= to create mv lines for the backup file and the includes file for squid-accou= nting to proxy-accounting. What I have not been able to figure out is how to get the updated acct.en.pl = language file included in the update. I would expect that any changed addon would have its update.sh pak file run b= ut I can't figure out where that is defined and it doesn't look like it happe= ned with Core Update 165 Testing as an already installed version stays with t= he old language names. Can anyone help me with how to get this new lang file installed for any one w= ho already has an existing installed squid-accounting/proxy-accounting instal= lation. Regards, Adolf. On 18/03/2022 14:46, Adolf Belka wrote: > Hi Peter, > > I didn't notice at the time, my fault, but two additional files need to hav= e their names changed with this patch. I just found it out when testing a CU = from 164 to 165 Testing with squid-accounting installed as an addon in the CU= 164 version. > > > The files needing changing are:- > > /var/ipfire/backup/includes/squid-accounting to /var/ipfire/backup/includes= /proxy-accounting > > /var/ipfire/backup/includes/squid-accounting.ipf to /var/ipfire/backup/incl= udes/proxy-accounting.ipf > > Regards, > > Adolf. > > On 05/03/2022 21:40, Adolf Belka wrote: >> Hi Peter, >> >> On 05/03/2022 15:45, Peter M=C3=BCller wrote: >>> https://lists.ipfire.org/pipermail/development/2022-February/012482.html >>> >>> The second version of this patch omits bogus directives for restarting a >>> service, which proxy-accounting is not. >> Thanks very much for figuring this out. I will note this so that when I ne= ed to do it in future I know how to approach it. >> >> Lucky thing is that all of the packages that were in my perl renaming patc= h set were all core packages with none being addons so this approach is not n= eeded for any of them. >> >> Regards, >> Adolf. >>> Cc: Michael Tremer >>> Cc: Adolf Belka >>> Signed-off-by: Peter M=C3=BCller >>> --- >>> =C2=A0 config/rootfiles/core/165/update.sh | 8 ++++++++ >>> =C2=A0 1 file changed, 8 insertions(+) >>> >>> diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/= 165/update.sh >>> index fe4449fff..f505628e4 100644 >>> --- a/config/rootfiles/core/165/update.sh >>> +++ b/config/rootfiles/core/165/update.sh >>> @@ -97,6 +97,14 @@ rm -rvf \ >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /var/ipfire/dhcpc/dhcpcd-hooks/10-mtu \ >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /var/ipfire/firewall/p2protocols >>> =C2=A0 +# Rename squid-accounting add-on to proxy-accounting, if installed >>> +# (see: https://lists.ipfire.org/pipermail/development/2022-February/012= 482.html) >>> +if [ -e "/opt/pakfire/db/installed/meta-squid-accounting" ] && [ -e "/op= t/pakfire/db/meta/meta-squid-accounting" ]; then >>> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/installed/meta-squid-accounting= /opt/pakfire/db/installed/meta-proxy-accounting >>> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/meta/meta-squid-accounting /opt= /pakfire/db/meta/meta-proxy-accounting >>> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/rootfiles/squid-accounting /opt= /pakfire/db/rootfiles/proxy-accounting >>> +fi >>> + >>> =C2=A0 # Stop services >>> =C2=A0 =C2=A0 # Extract files >> --===============9068618259904464015==--