From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] Fix bug 10504: match download's sourceurl mangling in, updxlrator Date: Sat, 30 Dec 2017 14:27:40 +0000 Message-ID: <1514644060.3685.11.camel@ipfire.org> In-Reply-To: <287ec1cd-00b7-b6b8-2fcd-13206ef08d5b@mail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6680139619793009571==" List-Id: --===============6680139619793009571== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello Justin, and welcome to the team. Thanks for your submission. Indeed we have not been touching update accelerat= or much in the last years. Some people have been working on forks but never submitted their changes and just uploaded them somewhere. Therefore I am happy that you had a look. On Fri, 2017-12-29 at 17:12 +0300, Justin Luth wrote: > Updatexlrator stores its files in a hash of the URL. >=20 > The download utility mangles the URL for [+/~], but > the updxlrator only does it for [/]. Thus, download > stores the result as one hash, and updxlrator looks for it > with a different hash. The result is that the file is > re-downloaded every time by both the client, and updxlrator. Wouldn't it be a better idea to generally escape/unescape the URLs? There is a perl module that does that: http://search.cpan.org/dist/URI/lib/URI/Escape.pm Your changes certainly make sense, but there are more characters that could cause the same problem here. Let me know if that would make sense, too. Best, -Michael > This is fixed by making updxlrator mangle the url in the > same way as the downloader. apt-get install g++ would > be a good test for this. >=20 > Signed-off-by: Justin Luth >=20 > --- > I submitted the bug report and attached this patch three years > ago, but the maintainer of updxlrator - although he > incorporated it into his own ipcop packagea - has never > released it (for ipcop) or any of the other promised updates that > he has been working on (in ipfire). >=20 > I have a few more fixes for updxlrator that I want to submit, > if this process goes well. > --- > config/updxlrator/updxlrator | 2 ++ > 1 file changed, 2 insertions(+) >=20 > diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator > index 2ddc6d8e4..b728902f6 100644 > --- a/config/updxlrator/updxlrator > +++ b/config/updxlrator/updxlrator > @@ -345,7 +345,9 @@ sub check_cache > my $sourceurl=3D$_[0]; > my $cfmirror=3D$_[4]; >=20 > + $sourceurl =3D~ s@\%2b(a)+@ig; > $sourceurl =3D~ s@\%2f@/@ig; > + $sourceurl =3D~ s@\%7e@~@ig; > $updfile =3D substr($sourceurl,rindex($sourceurl,"/")+1); > $updfile =3D~ s@\%20@ @ig; >=20 --===============6680139619793009571== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl Mnlwa3R4Z0hudy8yK1FDUWNGQWxwSG9sd0FDZ2tRZ0hudy8yK1EKQ1Fmajl3Ly9XKzFVUzRmYjRr ZHZUb3YwK1VVQTFyOUlVNXRVQytmM3FHak1IL2o1YmZlVDNiWmNXbmtmSGJobQpjdHBBL2JFNTU4 SjJkSGZ5WmcvR3QxcUpMTVlOVFlvOGZZQ3cvcHJkM3FxSVdOREN0TkxRc2huRHFoT0JsM1dwCkoz cVlyenVWMjJSa0pPSHozazdFMmc4OVZ1cVc3cUF6bzh0OVFOZUlBNkZwckUrOTBjUU5GMm5aQ1RJ dlZWdSsKTUg1aGMzL21xcURqSWNKNTdFb1FJWDFwQUxzdkIyalo1cnR1czVCdllWM2Q5WHMySUQw V2pHdzUxMk10UUErSApkR0NOSWFIbExSQzRTMlUwcW9HRnNweStwb0M3QVd4U082dENXOVUxNk15 MkpvaDNCdmF2NjgwWFRSVExLSnVoCnRWZzgyQ2xSWitPaFk2STJGWkFtYWlrRVhMRkNEU1NRMXBo RVRFZG8yYTh5M1Zlb1VoYzlXekQ3ZUkyT1p4ZTUKTGxlamFyS0JRNHFpWkUvdWRLbVdvVjM0MDZQ elV1blZqQ3JWSFY5dS91Wnh4N0pKYjJpSGs5UmVDV21HN0lVQwpqcHM5T0ZvNVRuc2RXNW8xVlRC ZExkdmhyM1d5dXgwb1E5aWh4Rm5DMjBJd3YwNnRxbEhSVVZqdTVvZTl2MFBCCmxGNitOZGhWbG9a UXVoNzRMd01ER1hwc2pmdmdIUlQ4WGVlbG5FYVNmOFFxVmxtSU4wbDdkci8yL3NsWU8wSloKcEhP bEF3ZFRLeUhib0tseGF6T0lHMHZhWkZqdHo0UHRlSlZmZ0RLMmVmczUxWSs2SEpCZWFHMmxiZU42 YWs1MQpaZSsrMGNBK0hiTnFLTFkvVXZhV0RGU1Z5ZCtSd0JYQUJaNXFkcnd1SVR1N1FpUmJ3U3M9 Cj0zdEhnCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============6680139619793009571==--