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:18:51 +0100 Message-ID: <78c7f769-881d-1254-e93e-55b9ba24cce6@ipfire.org> In-Reply-To: <56360d88-2fb0-3610-4076-61ee60f57841@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0000473479776683520==" List-Id: --===============0000473479776683520== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Matthias and all, I may have found what I need to change. In my updated /var/cache/pakfire/ directory I have squid-accounting-1.0.4-13.= ipfire So there is not a proxy-accounting-1.0.4-14.ipfire package present, which I w= ould expect if this addon has been updated. I suspect that this package file name need to be changed to proxy-accounting-= 1.0.4-13.ipfire so that the new version will be added to be updated. I will give that a try with my vm system. Have squid-accounting installed on = a CU164 version and then manually rename that package file in the cache and t= hen run the CU165 Testing update. If that works then I know what filename change I need to add into the Core Up= date 165 update.sh script. Regards, Adolf. On 19/03/2022 15:04, Adolf Belka wrote: > Hi Matthias, > > On 19/03/2022 14:27, Matthias Fischer wrote: >> Hi Adolf, >> >> I hope I get this right: >> >> 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 >> >> You may want to rename this directory to 'src/proxy-accounting'!? ;-) > Michael only wanted me to rename directories and filenames that would be se= en by people using the WUI so I left the source as it was. >> >> 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. How= ever the filename was also changed from squid-accounting to proxy-accounting. >> >> 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 = one in config/rootfiles/core/165/update.sh when using the current master repo= sitory. This update.sh script had some lines added by Peter to ensure that pe= ople who already had squid-accounting installed would have their filenames up= dated to proxy-accounting. > > After that was done I realised that there were two more files that needed t= o have their name changed. That was the easy bit. > > The problem is that if you install the proxy-accounting addon in CU165 then= everything works perfectly. If you have squid-accounting installed in CU164 = or earlier then the update fro version 13 squid-accounting to version 14 prox= y-accounting does not install the new acct.en.pl lang file that I had updated= in 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 ar= e included because the PAK_VER number is incremented for a specific addon fil= ename. This might give a problem because the filename of the addon also chang= es in pakfire so maybe the Core Update process from 164 to 165 does not end u= p running the update.sh pak file for squid-accounting because it doesn't look= like 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 en= ough for someone looking at this for the first time. > > Looking back at the IPFire history it looks like the name of an existing ad= don has never been changed so everyone is feeling their way to figure out how= to ensure people that have this addon already installed get it properly upda= ted. > > Regards, > Adolf. >> >> HTH, >> Matthias >> >> 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 l= ines to create mv lines for the backup file and the includes file for squid-a= ccounting 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 r= un but I can't figure out where that is defined and it doesn't look like it h= appened with Core Update 165 Testing as an already installed version stays wi= th the old language names. >>> >>> Can anyone help me with how to get this new lang file installed for any o= ne who already has an existing installed squid-accounting/proxy-accounting in= stallation. >>> >>> >>> 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 = have 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= CU164 version. >>>> >>>> >>>> The files needing changing are:- >>>> >>>> /var/ipfire/backup/includes/squid-accounting to /var/ipfire/backup/inclu= des/proxy-accounting >>>> >>>> /var/ipfire/backup/includes/squid-accounting.ipf to /var/ipfire/backup/i= ncludes/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.ht= ml >>>>>> >>>>>> 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 p= atch set were all core packages with none being addons so this approach is no= t needed for any of them. >>>>> >>>>> Regards, >>>>> Adolf. >>>>>> Cc: Michael Tremer >>>>>> Cc: Adolf Belka >>>>>> Signed-off-by: Peter M=C3=BCller >>>>>> --- >>>>>> =C2=A0=C2=A0 config/rootfiles/core/165/update.sh | 8 ++++++++ >>>>>> =C2=A0=C2=A0 1 file changed, 8 insertions(+) >>>>>> >>>>>> diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/co= re/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=C2=A0 /var/ipfire/dhcpc/dhcpcd-hooks/10= -mtu \ >>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /var/ipfire/firewall/p2protocols >>>>>> =C2=A0=C2=A0 +# Rename squid-accounting add-on to proxy-accounting, if= installed >>>>>> +# (see: https://lists.ipfire.org/pipermail/development/2022-February/= 012482.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-account= ing /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=C2=A0 # Stop services >>>>>> =C2=A0=C2=A0 =C2=A0 # Extract files >>>>> >> --===============0000473479776683520==--