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 15:04:54 +0100 Message-ID: <56360d88-2fb0-3610-4076-61ee60f57841@ipfire.org> In-Reply-To: <82025c14-2ab6-dcdf-d6b9-06887088da9c@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2685163244882244839==" List-Id: --===============2685163244882244839== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Matthias, On 19/03/2022 14:27, Matthias Fischer wrote: > Hi Adolf, >=20 > I hope I get this right: >=20 > As I see it, 'acct.en.pl' - together with the other files needed for > this package - is located in the directory 'src/squid-accounting/'. Correct >=20 > You may want to rename this directory to 'src/proxy-accounting'!? ;-) Michael only wanted me to rename directories and filenames that would be seen= by people using the WUI so I left the source as it was. >=20 > IMHO, all you have to do is to change 'acct.*.pl' as you want to and > bump the version number in the 'lfs'-file ('lfs/squid-accounting'). That is what I had already done. The PAK_VER was changed from 13 to 14. Howev= er the filename was also changed from squid-accounting to proxy-accounting. >=20 > The 'update.sh' file you're searching for is in > 'src/paks/squid-accounting/', together with 'install' and 'uninstall'. > But I think this won't need a change. Those pak files have not been changed. The update.sh script I meant is the on= e in config/rootfiles/core/165/update.sh when using the current master reposi= tory. This update.sh script had some lines added by Peter to ensure that peop= le who already had squid-accounting installed would have their filenames upda= ted to proxy-accounting. After that was done I realised that there were two more files that needed to = have their name changed. That was the easy bit. The problem is that if you install the proxy-accounting addon in CU165 then e= verything works perfectly. If you have squid-accounting installed in CU164 or= earlier then the update fro version 13 squid-accounting to version 14 proxy-= accounting does not install the new acct.en.pl lang file that I had updated i= n my patch (even though on a new install it is correctly installed). Since I wrote the previous email I have been wondering if updated addons are = included because the PAK_VER number is incremented for a specific addon filen= ame. This might give a problem because the filename of the addon also changes= in pakfire so maybe the Core Update process from 164 to 165 does not end up = running the update.sh pak file for squid-accounting because it doesn't look l= ike the PAK_VER has changed because it is for a different addon name. Thanks for the input Matthias. I probably didn't make my situation clear enou= gh for someone looking at this for the first time. Looking back at the IPFire history it looks like the name of an existing addo= n has never been changed so everyone is feeling their way to figure out how t= o ensure people that have this addon already installed get it properly update= d. Regards, Adolf. >=20 > HTH, > Matthias >=20 > On 19.03.2022 14:09, Adolf Belka wrote: >> 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 li= nes to create mv lines for the backup file and the includes file for squid-ac= counting 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 ru= n but I can't figure out where that is defined and it doesn't look like it ha= ppened with Core Update 165 Testing as an already installed version stays wit= h the old language names. >> >> Can anyone help me with how to get this new lang file installed for any on= e who already has an existing installed squid-accounting/proxy-accounting ins= tallation. >> >> >> 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 h= ave their names changed with this patch. I just found it out when testing a C= U from 164 to 165 Testing with squid-accounting installed as an addon in the = CU164 version. >>> >>> >>> The files needing changing are:- >>> >>> /var/ipfire/backup/includes/squid-accounting to /var/ipfire/backup/includ= es/proxy-accounting >>> >>> /var/ipfire/backup/includes/squid-accounting.ipf to /var/ipfire/backup/in= cludes/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 = need 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 pa= tch set were all core packages with none being addons so this approach is not= needed 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/cor= e/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 insta= lled >>>>> +# (see: https://lists.ipfire.org/pipermail/development/2022-February/0= 12482.html) >>>>> +if [ -e "/opt/pakfire/db/installed/meta-squid-accounting" ] && [ -e "/= opt/pakfire/db/meta/meta-squid-accounting" ]; then >>>>> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/installed/meta-squid-accounti= ng /opt/pakfire/db/installed/meta-proxy-accounting >>>>> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/meta/meta-squid-accounting /o= pt/pakfire/db/meta/meta-proxy-accounting >>>>> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/rootfiles/squid-accounting /o= pt/pakfire/db/rootfiles/proxy-accounting >>>>> +fi >>>>> + >>>>> =C2=A0 # Stop services >>>>> =C2=A0 =C2=A0 # Extract files >>>> >=20 --===============2685163244882244839==--