Re: [PATCH v2] Core Update 165: Rename squid-accounting add-on to proxy-accounting

[Matthias Fischer <matthias.fischer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4138 bytes --]

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,
> 
> 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-accounting 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 but I can't figure out where that is defined and it doesn't look like it happened with Core Update 165 Testing as an already installed version stays with the old language names.
> 
> 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 installation.
> 
> 
> 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/includes/proxy-accounting
>>
>> /var/ipfire/backup/includes/squid-accounting.ipf to /var/ipfire/backup/includes/proxy-accounting.ipf
>>
>> Regards,
>>
>> Adolf.
>>
>> On 05/03/2022 21:40, Adolf Belka wrote:
>>> Hi Peter,
>>>
>>> On 05/03/2022 15:45, Peter Müller 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 patch set were all core packages with none being addons so this approach is not needed for any of them.
>>>
>>> Regards,
>>> Adolf.
>>>> Cc: Michael Tremer <michael.tremer(a)ipfire.org>
>>>> Cc: Adolf Belka <adolf.belka(a)ipfire.org>
>>>> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
>>>> ---
>>>>   config/rootfiles/core/165/update.sh | 8 ++++++++
>>>>   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 \
>>>>       /var/ipfire/dhcpc/dhcpcd-hooks/10-mtu \
>>>>       /var/ipfire/firewall/p2protocols
>>>>   +# 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
>>>> +    mv -v /opt/pakfire/db/installed/meta-squid-accounting /opt/pakfire/db/installed/meta-proxy-accounting
>>>> +    mv -v /opt/pakfire/db/meta/meta-squid-accounting /opt/pakfire/db/meta/meta-proxy-accounting
>>>> +    mv -v /opt/pakfire/db/rootfiles/squid-accounting /opt/pakfire/db/rootfiles/proxy-accounting
>>>> +fi
>>>> +
>>>>   # Stop services
>>>>     # Extract files
>>>