From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 1/3] squid-accounting: Rename to proxy-accounting - bug#12772 Date: Tue, 22 Feb 2022 10:44:57 +0000 Message-ID: <11C1C0AC-AD26-404D-8C1F-7E233C7507DF@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4140621265398516127==" List-Id: --===============4140621265398516127== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, > On 21 Feb 2022, at 21:46, Peter M=C3=BCller wr= ote: >=20 > Hello *, >=20 >> Hello, >>=20 >>> On 21 Feb 2022, at 09:11, Adolf Belka wrote: >>>=20 >>> Hi Michael, >>>=20 >>> On 20/02/2022 18:49, Michael Tremer wrote: >>>> Hello, >>>> How are we making sure that people who have the old package installed wi= ll receive updates for the new package? >>> Ah, that is a good point. I hadn't thought of that. I presume name change= s have occurred in the past to addons. Do you have any suggestions for what I= need to modify or do. >>>=20 >>> I presume that my perl file name changes will have caused the same proble= m for any perl addons that were changed so I will also need to go back and so= rt those out. >>=20 >> Yes. In the updater, we would have to check for the old package to be inst= alled and if so, to rename any meta-data and adjust it accordingly in the pak= fire database. This is most likely a job for Peter. >=20 > since I was unable to find a similar event in the past, I am afraid I need = help on this one: No, we haven=E2=80=99t done this before. > (a) How is it possible to enumerate from Pakfire whether an add-on is insta= lled or not? > "pakfire --help" does not appear to give any useful function for this. There is no command. You will have to manually edit the files in the database: https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dblob;f=3Dconfig/rootfiles/oldc= ore/161/update.sh;hb=3D3b45d9561b6d30d9491419a2022f2befaf2b2f4a#l90 Here, we removed a package. Each package consists of its meta file in the ins= talled directory and its rootfile. In this case, you will have to check whether both files exist, if so, then re= name them to the new name. I suppose we keep the version numbers and keep cou= nting up, so pakfire will after the update check against the downloaded packa= ge database and find an update and install the new version and uninstalling a= ll old files. That should work just fine. > (b) What does "adjust it accordingly in the pakfire database" imply precise= ly? See above. > (c) Is there anything else to do afterwards, such as "pakfire update" or so= me database cleanup? Yes, after renaming, you probably want to install the new package, but since = you are already in the middle of an update, this will happen automatically. There is no need for any manual cleanup. Just renaming the files. Let me know if you have any further questions. Best, -Michael >=20 > Thanks, and best regards, > Peter M=C3=BCller >=20 >>=20 >> -Michael >>=20 >>>=20 >>> Regards, >>> Adolf. >>>> I believe I have seen this patch merged, but that should be considered. >>>> -Michael >>>>> On 18 Feb 2022, at 14:32, Adolf Belka wrote: >>>>>=20 >>>>> - Rename lfs, rootfile and paks directory >>>>> - Change name in make.sh >>>>> - Tested out in a vm system and worked >>>>>=20 >>>>> Fixes: Bug#12772 >>>>> Tested-by: Adolf Belka >>>>> Signed-off-by: Adolf Belka >>>>> --- >>>>> .../packages/{squid-accounting =3D> proxy-accounting} | 2 +- >>>>> lfs/{squid-accounting =3D> proxy-accounting} | 8 ++++---- >>>>> make.sh | 2 +- >>>>> .../{squid-accounting =3D> proxy-accounting}/install.sh | 0 >>>>> .../{squid-accounting =3D> proxy-accounting}/uninstall.sh | 0 >>>>> src/paks/{squid-accounting =3D> proxy-accounting}/update.sh | 0 >>>>> 6 files changed, 6 insertions(+), 6 deletions(-) >>>>> rename config/rootfiles/packages/{squid-accounting =3D> proxy-accountin= g} (90%) >>>>> rename lfs/{squid-accounting =3D> proxy-accounting} (94%) >>>>> rename src/paks/{squid-accounting =3D> proxy-accounting}/install.sh (10= 0%) >>>>> rename src/paks/{squid-accounting =3D> proxy-accounting}/uninstall.sh (= 100%) >>>>> rename src/paks/{squid-accounting =3D> proxy-accounting}/update.sh (100= %) >>>>>=20 >>>>> diff --git a/config/rootfiles/packages/squid-accounting b/config/rootfi= les/packages/proxy-accounting >>>>> similarity index 90% >>>>> rename from config/rootfiles/packages/squid-accounting >>>>> rename to config/rootfiles/packages/proxy-accounting >>>>> index 82b171e33..0c142ea5c 100644 >>>>> --- a/config/rootfiles/packages/squid-accounting >>>>> +++ b/config/rootfiles/packages/proxy-accounting >>>>> @@ -11,6 +11,6 @@ var/ipfire/addon-lang/acct.de.pl >>>>> var/ipfire/addon-lang/acct.en.pl >>>>> var/ipfire/addon-lang/acct.fr.pl >>>>> var/ipfire/addon-lang/acct.tr.pl >>>>> -var/ipfire/backup/addons/includes/squid-accounting >>>>> +var/ipfire/backup/addons/includes/proxy-accounting >>>>> var/ipfire/menu.d/EX-squid-accounting.menu >>>>> var/log/accounting.log >>>>> diff --git a/lfs/squid-accounting b/lfs/proxy-accounting >>>>> similarity index 94% >>>>> rename from lfs/squid-accounting >>>>> rename to lfs/proxy-accounting >>>>> index 77742554e..82e39ae76 100644 >>>>> --- a/lfs/squid-accounting >>>>> +++ b/lfs/proxy-accounting >>>>> @@ -11,11 +11,11 @@ include Config >>>>>=20 >>>>> VER =3D 1.0.4 >>>>>=20 >>>>> -THISAPP =3D squid-accounting-$(VER) >>>>> +THISAPP =3D proxy-accounting-$(VER) >>>>> DIR_APP =3D $(DIR_SRC)/$(THISAPP) >>>>> TARGET =3D $(DIR_INFO)/$(THISAPP) >>>>> -PROG =3D squid-accounting >>>>> -PAK_VER =3D 13 >>>>> +PROG =3D proxy-accounting >>>>> +PAK_VER =3D 14 >>>>>=20 >>>>> DEPS =3D perl-File-ReadBackwards >>>>>=20 >>>>> @@ -61,7 +61,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>>>> install -v -m 644 $(DIR_APP)/squid-accounting/EX-squid-accounting.menu= /var/ipfire/menu.d/ >>>>> install -v -m 755 $(DIR_APP)/squid-accounting/dbinstall.pl /var/ipfire= /accounting/ >>>>> install -v -m 644 $(DIR_APP)/squid-accounting/config/backup/includes/s= quid-accounting \ >>>>> - /var/ipfire/backup/addons/includes/squid-accounting >>>>> + /var/ipfire/backup/addons/includes/proxy-accounting >>>>>=20 >>>>> #activate hourly logging of proxy logfile >>>>> ln -sf /usr/local/bin/acct.pl /etc/fcron.hourly/squid-accounting >>>>> diff --git a/make.sh b/make.sh >>>>> index 79798834a..e35fed398 100755 >>>>> --- a/make.sh >>>>> +++ b/make.sh >>>>> @@ -1638,7 +1638,7 @@ buildipfire() { >>>>> lfsmake2 perl-Font-TTF >>>>> lfsmake2 perl-IO-String >>>>> lfsmake2 perl-PDF-API2 >>>>> - lfsmake2 squid-accounting >>>>> + lfsmake2 proxy-accounting >>>>> lfsmake2 pigz >>>>> lfsmake2 tmux >>>>> lfsmake2 perl-Text-CSV_XS >>>>> diff --git a/src/paks/squid-accounting/install.sh b/src/paks/proxy-acco= unting/install.sh >>>>> similarity index 100% >>>>> rename from src/paks/squid-accounting/install.sh >>>>> rename to src/paks/proxy-accounting/install.sh >>>>> diff --git a/src/paks/squid-accounting/uninstall.sh b/src/paks/proxy-ac= counting/uninstall.sh >>>>> similarity index 100% >>>>> rename from src/paks/squid-accounting/uninstall.sh >>>>> rename to src/paks/proxy-accounting/uninstall.sh >>>>> diff --git a/src/paks/squid-accounting/update.sh b/src/paks/proxy-accou= nting/update.sh >>>>> similarity index 100% >>>>> rename from src/paks/squid-accounting/update.sh >>>>> rename to src/paks/proxy-accounting/update.sh >>>>> --=20 >>>>> 2.35.1 >>>>>=20 >>>=20 >>> --=20 >>> Sent from my laptop --===============4140621265398516127==--