From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer 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:27:13 +0100 Message-ID: <82025c14-2ab6-dcdf-d6b9-06887088da9c@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5737469553132393362==" List-Id: --===============5737469553132393362== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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/'. You may want to rename this directory to 'src/proxy-accounting'!? ;-) 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'). 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. HTH, Matthias On 19.03.2022 14:09, Adolf Belka wrote: > Hi All, >=20 > I am trying to do an update of this patch for /core/165/update.sh related t= o the proxy-accounting addon. >=20 > I was able to fairly easily copy the approach from Peter on the earlier lin= es to create mv lines for the backup file and the includes file for squid-acc= ounting to proxy-accounting. >=20 >=20 > What I have not been able to figure out is how to get the updated acct.en.p= l language file included in the update. >=20 > I would expect that any changed addon would have its update.sh pak file run= but I can't figure out where that is defined and it doesn't look like it hap= pened with Core Update 165 Testing as an already installed version stays with= the old language names. >=20 > Can anyone help me with how to get this new lang file installed for any one= who already has an existing installed squid-accounting/proxy-accounting inst= allation. >=20 >=20 > Regards, >=20 > Adolf. >=20 > 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 ha= ve 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 C= U164 version. >> >> >> The files needing changing are:- >> >> /var/ipfire/backup/includes/squid-accounting to /var/ipfire/backup/include= s/proxy-accounting >> >> /var/ipfire/backup/includes/squid-accounting.ipf to /var/ipfire/backup/inc= ludes/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 n= eed 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 pat= ch 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/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 install= ed >>>> +# (see: https://lists.ipfire.org/pipermail/development/2022-February/01= 2482.html) >>>> +if [ -e "/opt/pakfire/db/installed/meta-squid-accounting" ] && [ -e "/o= pt/pakfire/db/meta/meta-squid-accounting" ]; then >>>> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/installed/meta-squid-accountin= g /opt/pakfire/db/installed/meta-proxy-accounting >>>> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/meta/meta-squid-accounting /op= t/pakfire/db/meta/meta-proxy-accounting >>>> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/rootfiles/squid-accounting /op= t/pakfire/db/rootfiles/proxy-accounting >>>> +fi >>>> + >>>> =C2=A0 # Stop services >>>> =C2=A0 =C2=A0 # Extract files >>> --===============5737469553132393362==--