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: Mon, 21 Feb 2022 11:23:22 +0000 Message-ID: In-Reply-To: <874c5d08-a946-e465-1e3d-8ca64e9aca9c@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3057014342839635178==" List-Id: --===============3057014342839635178== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, > 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 will= receive updates for the new package? > Ah, that is a good point. I hadn't thought of that. I presume name changes = have occurred in the past to addons. Do you have any suggestions for what I n= eed to modify or do. >=20 > I presume that my perl file name changes will have caused the same problem = for any perl addons that were changed so I will also need to go back and sort= those out. Yes. In the updater, we would have to check for the old package to be install= ed and if so, to rename any meta-data and adjust it accordingly in the pakfir= e database. This is most likely a job for Peter. -Michael >=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-accounting}= (90%) >>> rename lfs/{squid-accounting =3D> proxy-accounting} (94%) >>> rename src/paks/{squid-accounting =3D> proxy-accounting}/install.sh (100%) >>> rename src/paks/{squid-accounting =3D> proxy-accounting}/uninstall.sh (10= 0%) >>> rename src/paks/{squid-accounting =3D> proxy-accounting}/update.sh (100%) >>>=20 >>> diff --git a/config/rootfiles/packages/squid-accounting b/config/rootfile= s/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/a= ccounting/ >>> install -v -m 644 $(DIR_APP)/squid-accounting/config/backup/includes/squ= id-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-accoun= ting/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-acco= unting/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-account= ing/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 --===============3057014342839635178==--