From 0693e331f60e3d2e5b58486be341676af5211b30db5fc83c288bde0fb71af600 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Wed, 24 Aug 2022 08:19:08 +0000 Subject: [PATCH 1/5] - Update to version 1.038: * Control order of projects in mirrors report (#294) * Include subsidiary url into region in /report/mirrors (#295) * Add mirror report links to header in openSUSE template (#296) * Add operator to mirrors report (#296) * Add column sponsor to server table (#296) OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=61 --- MirrorCache-1.037.obscpio | 3 --- MirrorCache-1.038.obscpio | 3 +++ MirrorCache.changes | 18 ++++++++++++++---- MirrorCache.obsinfo | 6 +++--- MirrorCache.spec | 2 +- 5 files changed, 21 insertions(+), 11 deletions(-) delete mode 100644 MirrorCache-1.037.obscpio create mode 100644 MirrorCache-1.038.obscpio diff --git a/MirrorCache-1.037.obscpio b/MirrorCache-1.037.obscpio deleted file mode 100644 index 033d240..0000000 --- a/MirrorCache-1.037.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b445288e7ddb032061eb93b277853b856320c5ceabe89e1e7cf01be7b8bd6334 -size 972812 diff --git a/MirrorCache-1.038.obscpio b/MirrorCache-1.038.obscpio new file mode 100644 index 0000000..e0018d7 --- /dev/null +++ b/MirrorCache-1.038.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94164ea23382c1fa64f7ca91218754aa928d803c1dec070eb002bcc2567f774c +size 975884 diff --git a/MirrorCache.changes b/MirrorCache.changes index 710576e..43b3071 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Aug 24 08:12:10 UTC 2022 - Andrii Nikitin + +- Update to version 1.038: + * Control order of projects in mirrors report (#294) + * Include subsidiary url into region in /report/mirrors (#295) + * Add mirror report links to header in openSUSE template (#296) + * Add operator to mirrors report (#296) + * Add column sponsor to server table (#296) + ------------------------------------------------------------------- Thu Aug 11 15:10:05 UTC 2022 - Andrii Nikitin @@ -8,10 +18,10 @@ Thu Aug 11 15:10:05 UTC 2022 - Andrii Nikitin Fri Aug 05 12:14:42 UTC 2022 - Andrii Nikitin - Update to version 1.036: - * Fix mirrors report when missing folders (#288) - * Tweak systemd files (#291) - * Rework mirrors report (#290) - * Rescan if no country hit (#292) + * Fix mirrors report when missing folders (#288) + * Tweak systemd files (#291) + * Rework mirrors report (#290) + * Rescan if no country hit (#292) ------------------------------------------------------------------- Thu Jun 23 04:55:11 UTC 2022 - Andrii Nikitin diff --git a/MirrorCache.obsinfo b/MirrorCache.obsinfo index fc7e456..06dbf03 100644 --- a/MirrorCache.obsinfo +++ b/MirrorCache.obsinfo @@ -1,4 +1,4 @@ name: MirrorCache -version: 1.037 -mtime: 1660224542 -commit: 5281a9c79509f79aec972de25f37d12b0e099b85 +version: 1.038 +mtime: 1661325255 +commit: 7254c526a78ffd9e42267248424253d6c220e251 diff --git a/MirrorCache.spec b/MirrorCache.spec index fbbfbc3..4ecc6df 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -22,7 +22,7 @@ %define main_requires %{assetpack_requires} perl(Carp) perl(DBD::Pg) >= 3.7.4 perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801 perl(DBIx::Class::DynamicDefault) perl(DateTime) perl(Encode) perl(Time::Piece) perl(Time::Seconds) perl(Time::ParseDate) perl(DateTime::Format::Pg) perl(Exporter) perl(File::Basename) perl(LWP::UserAgent) perl(Mojo::Base) perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg) perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands) perl(Mojolicious::Plugin) perl(Mojolicious::Plugin::RenderFile) perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX) perl(Sort::Versions) perl(URI::Escape) perl(XML::Writer) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings) shadow rubygem(sass) perl(Net::DNS) perl(LWP::Protocol::https) perl(Digest::SHA) %define build_requires %{assetpack_requires} rubygem(sass) tidy sysuser-shadow sysuser-tools Name: MirrorCache -Version: 1.037 +Version: 1.038 Release: 0 Summary: WebApp to redirect and manage mirrors License: GPL-2.0-or-later From c58dc80107d478fcb3b82f9e9c785b9501246a0ff7c45227f708b07ceccf34a1 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Fri, 26 Aug 2022 13:21:03 +0000 Subject: [PATCH 2/5] - Update to version 1.039: * Fix editing columns with underscore in /app (#297) * Fix mirror report links in header (#297) OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=62 --- MirrorCache-1.038.obscpio | 3 --- MirrorCache-1.039.obscpio | 3 +++ MirrorCache.changes | 7 +++++++ MirrorCache.obsinfo | 6 +++--- MirrorCache.spec | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 MirrorCache-1.038.obscpio create mode 100644 MirrorCache-1.039.obscpio diff --git a/MirrorCache-1.038.obscpio b/MirrorCache-1.038.obscpio deleted file mode 100644 index e0018d7..0000000 --- a/MirrorCache-1.038.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94164ea23382c1fa64f7ca91218754aa928d803c1dec070eb002bcc2567f774c -size 975884 diff --git a/MirrorCache-1.039.obscpio b/MirrorCache-1.039.obscpio new file mode 100644 index 0000000..ab5274f --- /dev/null +++ b/MirrorCache-1.039.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e369406301d0dd98e368258ba2f24c664a9137194ecd7e4c70024217fecefd5a +size 976396 diff --git a/MirrorCache.changes b/MirrorCache.changes index 43b3071..46ef2bf 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 26 13:17:22 UTC 2022 - Andrii Nikitin + +- Update to version 1.039: + * Fix editing columns with underscore in /app (#297) + * Fix mirror report links in header (#297) + ------------------------------------------------------------------- Wed Aug 24 08:12:10 UTC 2022 - Andrii Nikitin diff --git a/MirrorCache.obsinfo b/MirrorCache.obsinfo index 06dbf03..f6760ba 100644 --- a/MirrorCache.obsinfo +++ b/MirrorCache.obsinfo @@ -1,4 +1,4 @@ name: MirrorCache -version: 1.038 -mtime: 1661325255 -commit: 7254c526a78ffd9e42267248424253d6c220e251 +version: 1.039 +mtime: 1661519611 +commit: 056db65ee5963af81f5b04c526dcc3f8df31e682 diff --git a/MirrorCache.spec b/MirrorCache.spec index 4ecc6df..cd93654 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -22,7 +22,7 @@ %define main_requires %{assetpack_requires} perl(Carp) perl(DBD::Pg) >= 3.7.4 perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801 perl(DBIx::Class::DynamicDefault) perl(DateTime) perl(Encode) perl(Time::Piece) perl(Time::Seconds) perl(Time::ParseDate) perl(DateTime::Format::Pg) perl(Exporter) perl(File::Basename) perl(LWP::UserAgent) perl(Mojo::Base) perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg) perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands) perl(Mojolicious::Plugin) perl(Mojolicious::Plugin::RenderFile) perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX) perl(Sort::Versions) perl(URI::Escape) perl(XML::Writer) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings) shadow rubygem(sass) perl(Net::DNS) perl(LWP::Protocol::https) perl(Digest::SHA) %define build_requires %{assetpack_requires} rubygem(sass) tidy sysuser-shadow sysuser-tools Name: MirrorCache -Version: 1.038 +Version: 1.039 Release: 0 Summary: WebApp to redirect and manage mirrors License: GPL-2.0-or-later From 5a19e0e52a5eb425d8dbed23a974ccb31d15d5200e947f146671dde48df74221 Mon Sep 17 00:00:00 2001 From: Elisei Roca Date: Thu, 1 Sep 2022 14:12:03 +0000 Subject: [PATCH 3/5] Add temporary patch to avoid by and ru mirrors for ua requests OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=63 --- ...oid-by-and-ru-mrrors-for-ua-requests.patch | 47 +++++++++++++++++++ MirrorCache.changes | 6 +++ MirrorCache.spec | 3 +- 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 0001-Avoid-by-and-ru-mrrors-for-ua-requests.patch diff --git a/0001-Avoid-by-and-ru-mrrors-for-ua-requests.patch b/0001-Avoid-by-and-ru-mrrors-for-ua-requests.patch new file mode 100644 index 0000000..19f1ee6 --- /dev/null +++ b/0001-Avoid-by-and-ru-mrrors-for-ua-requests.patch @@ -0,0 +1,47 @@ +From 7d9346897af13e5e5ca1752b7a9cfb5718305228 Mon Sep 17 00:00:00 2001 +From: Andrii Nikitin +Date: Thu, 1 Sep 2022 14:11:40 +0200 +Subject: [PATCH] Avoid by and ru mrrors for ua requests + +--- + lib/MirrorCache/Datamodule.pm | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/lib/MirrorCache/Datamodule.pm b/lib/MirrorCache/Datamodule.pm +index 5e5c2d8..7fb4cfd 100644 +--- a/lib/MirrorCache/Datamodule.pm ++++ b/lib/MirrorCache/Datamodule.pm +@@ -322,8 +322,18 @@ sub _init_location($self) { + $region = lc($p); + } + } +- if (my $p = $query->param('AVOID_COUNTRY')) { ++ $country = substr(lc($country), 0, 2) if $country; ++ $country = $country // ''; ++ my $p = $query->param('AVOID_COUNTRY'); ++ if ($p || $country eq 'ua') { + my @avoid_countries = (); ++ if ($country eq 'ua') { ++ if ($p) { ++ $p = $p . ',by,ru'; ++ } else { ++ $p = 'by,ru'; ++ } ++ } + for my $c (split ',', $p) { + next unless length($c) == 2; + $c = lc($c); +@@ -331,8 +341,8 @@ sub _init_location($self) { + $country = '' if $c eq lc($country // ''); + } + $self->_avoid_countries(\@avoid_countries); +- } +- $country = substr($country, 0, 2) if $country; ++ } ++ + $self->_country($country // ''); + $self->_region($region // ''); + } +-- +2.35.3 + diff --git a/MirrorCache.changes b/MirrorCache.changes index 46ef2bf..44ff0d1 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 1 14:09:37 UTC 2022 - Elisei Roca + +- Add temporary patch to avoid by and ru mirrors for ua requests + * 0001-Avoid-by-and-ru-mrrors-for-ua-requests.patch + ------------------------------------------------------------------- Fri Aug 26 13:17:22 UTC 2022 - Andrii Nikitin diff --git a/MirrorCache.spec b/MirrorCache.spec index cd93654..56b3b51 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -34,6 +34,7 @@ Source2: %{name}-user.conf Source3: %{name}-tmpfilesd.conf # use update-cache (or tools/generate-packed-assets) to generate/update cache.tar.xz Source101: update-cache.sh +Patch0: 0001-Avoid-by-and-ru-mrrors-for-ua-requests.patch BuildRequires: %{build_requires} Requires: %{main_requires} Requires: perl(Minion) >= 10.0 @@ -44,7 +45,7 @@ BuildArch: noarch Mirror redirector web service, which automatically scans the main server and mirrors %prep -%setup -q -a1 +%autosetup -p1 %build # make {?_smp_mflags} From 5c3cdecea6d925344d622254e719816f6f3d1fce3bd6fbcb062ac1d2422a4474 Mon Sep 17 00:00:00 2001 From: Elisei Roca Date: Thu, 1 Sep 2022 14:29:36 +0000 Subject: [PATCH 4/5] Update assets cache OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=64 --- MirrorCache.changes | 5 +++++ cache.tar.xz | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/MirrorCache.changes b/MirrorCache.changes index 44ff0d1..c4b2852 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 1 14:29:10 UTC 2022 - Elisei Roca + +- Update assets cache + ------------------------------------------------------------------- Thu Sep 1 14:09:37 UTC 2022 - Elisei Roca diff --git a/cache.tar.xz b/cache.tar.xz index 37b228c..da5ff95 100644 --- a/cache.tar.xz +++ b/cache.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ea726b688be35fb589e3ccfb99b851a4671447b167d5aa8574bf59bcaf81b73 -size 1035689 +oid sha256:8b9a45ba24087e5ee4521e23e87dbb9181967f3b971b08e23de3a8c96d9be454 +size 971064 From d7730bd67a897c5524b7aaa5c357670477e8ec0c0391bf1a62d608e76e4f8fea Mon Sep 17 00:00:00 2001 From: Elisei Roca Date: Thu, 1 Sep 2022 15:48:16 +0000 Subject: [PATCH 5/5] Revert autosetup change OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=65 --- MirrorCache.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MirrorCache.spec b/MirrorCache.spec index 56b3b51..4d0de04 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -45,7 +45,8 @@ BuildArch: noarch Mirror redirector web service, which automatically scans the main server and mirrors %prep -%autosetup -p1 +%setup -q -a1 +%patch0 -p1 %build # make {?_smp_mflags}