From e309fc0538142307fe23365efb9760093c5687fd31583e5650c37669a512b848 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Fri, 11 Nov 2022 09:58:01 +0000 Subject: [PATCH 1/3] - Update to version 1.045: * Add basic support for config from ini file (#314) * Drop support for rsync in MIRRORCACHE_ROOT (#314) * Allow html tags in CUSTOM_FOOTER_MESSAGE (#314) * Fix os version in report generation on mariadb (#314) * Fix zsync file generation missing empty line after header (#314) * Fix download report including stats only from begin of hour (#315) OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=72 --- MirrorCache-1.044.obscpio | 3 --- MirrorCache-1.045.obscpio | 3 +++ MirrorCache.changes | 11 +++++++++++ MirrorCache.obsinfo | 6 +++--- MirrorCache.spec | 4 ++-- 5 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 MirrorCache-1.044.obscpio create mode 100644 MirrorCache-1.045.obscpio diff --git a/MirrorCache-1.044.obscpio b/MirrorCache-1.044.obscpio deleted file mode 100644 index 9ba12ec..0000000 --- a/MirrorCache-1.044.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e78abbcadb14be696bc1ba34528445fec864083bf7e3495be4baa0f697aa10b -size 1017868 diff --git a/MirrorCache-1.045.obscpio b/MirrorCache-1.045.obscpio new file mode 100644 index 0000000..bd7c18e --- /dev/null +++ b/MirrorCache-1.045.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:347c825311864ffda16f3508cd0e4c11d72221fd65556162acaef67b5ed343a3 +size 997900 diff --git a/MirrorCache.changes b/MirrorCache.changes index 481f5f3..cf7150c 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Nov 11 09:42:10 UTC 2022 - Andrii Nikitin + +- Update to version 1.045: + * Add basic support for config from ini file (#314) + * Drop support for rsync in MIRRORCACHE_ROOT (#314) + * Allow html tags in CUSTOM_FOOTER_MESSAGE (#314) + * Fix os version in report generation on mariadb (#314) + * Fix zsync file generation missing empty line after header (#314) + * Fix download report including stats only from begin of hour (#315) + ------------------------------------------------------------------- Thu Oct 27 13:16:53 UTC 2022 - Andrii Nikitin diff --git a/MirrorCache.obsinfo b/MirrorCache.obsinfo index 00eea98..ace8dd7 100644 --- a/MirrorCache.obsinfo +++ b/MirrorCache.obsinfo @@ -1,4 +1,4 @@ name: MirrorCache -version: 1.044 -mtime: 1666875061 -commit: 9e614f3f90035b0234a554eabb5a4744c395fd37 +version: 1.045 +mtime: 1668159057 +commit: fcd5d312ae28c5f4cfbecd080459289cb50f6b6d diff --git a/MirrorCache.spec b/MirrorCache.spec index 7147f4c..8d592eb 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -19,10 +19,10 @@ %define mirrorcache_services_restart mirrorcache.service mirrorcache-backstage.service mirrorcache-backstage-hashes.service mirrorcache-subtree.service %define mirrorcache_services %{mirrorcache_services_restart} mirrorcache-hypnotoad.service %define assetpack_requires perl(CSS::Minifier::XS) >= 0.01 perl(JavaScript::Minifier::XS) >= 0.11 perl(Mojolicious::Plugin::AssetPack) >= 1.36 perl(IO::Socket::SSL) -%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 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) perl(Config::IniFiles) %define build_requires %{assetpack_requires} rubygem(sass) tidy sysuser-shadow sysuser-tools Name: MirrorCache -Version: 1.044 +Version: 1.045 Release: 0 Summary: WebApp to redirect and manage mirrors License: GPL-2.0-or-later From 7df6ec6f4f70e91ab7f34761f491f8ad4deb35eafb2d8710749aea18d9c07ff8 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Fri, 11 Nov 2022 10:54:30 +0000 Subject: [PATCH 2/3] - Add temporary patch for default database name * 0001-Default-db-name.patch OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=73 --- 0001-Default-db-name.patch | 14 ++++++++++++++ MirrorCache.changes | 5 +++++ MirrorCache.spec | 3 ++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 0001-Default-db-name.patch diff --git a/0001-Default-db-name.patch b/0001-Default-db-name.patch new file mode 100644 index 0000000..3d471b0 --- /dev/null +++ b/0001-Default-db-name.patch @@ -0,0 +1,14 @@ +diff --git a/lib/MirrorCache/Config.pm b/lib/MirrorCache/Config.pm +index fb5565d..2388cf3 100644 +--- a/lib/MirrorCache/Config.pm ++++ b/lib/MirrorCache/Config.pm +@@ -28,7 +28,7 @@ has dbuser => $ENV{MIRRORCACHE_DBUSER}; + has dbpass => $ENV{MIRRORCACHE_DBPASS}; + has dbhost => $ENV{MIRRORCACHE_DBHOST}; + has dbport => $ENV{MIRRORCACHE_DBPORT}; +-has dbdb => $ENV{MIRRORCACHE_DB}; ++has dbdb => $ENV{MIRRORCACHE_DB} // 'mirrorcache'; + has dsn => $ENV{MIRRORCACHE_DSN}; + has dsn_replica => $ENV{MIRRORCACHE_DSN_REPLICA}; + has redirect => $ENV{MIRRORCACHE_REDIRECT}; + diff --git a/MirrorCache.changes b/MirrorCache.changes index cf7150c..d74ce36 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 11 10:42:10 UTC 2022 - Andrii Nikitin +- Add temporary patch for default database name + * 0001-Default-db-name.patch + ------------------------------------------------------------------- Fri Nov 11 09:42:10 UTC 2022 - Andrii Nikitin diff --git a/MirrorCache.spec b/MirrorCache.spec index 8d592eb..24610e9 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -29,6 +29,7 @@ License: GPL-2.0-or-later Group: Productivity/Networking/Web/Servers URL: https://github.com/openSUSE/MirrorCache Source0: %{name}-%{version}.tar.xz +Patch0: 0001-Default-db-name.patch Source1: cache.tar.xz Source2: %{name}-user.conf Source3: %{name}-tmpfilesd.conf @@ -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 143e3f947afabc211c742c61ef2a492e46d958ffebb7ceb30928efe557658aa6 Mon Sep 17 00:00:00 2001 From: Andrii Nikitin Date: Thu, 17 Nov 2022 06:26:18 +0000 Subject: [PATCH 3/3] - Update to version 1.046: * Correctly render mirrorlist in browser when file is unknown * Allow rendering .zsync files * Render selected mirrors with osm in .mirrorlist OBS-URL: https://build.opensuse.org/package/show/openSUSE:infrastructure:MirrorCache/MirrorCache?expand=0&rev=74 --- 0001-Default-db-name.patch | 14 -------------- MirrorCache-1.045.obscpio | 3 --- MirrorCache-1.046.obscpio | 3 +++ MirrorCache.changes | 8 ++++++++ MirrorCache.obsinfo | 6 +++--- MirrorCache.spec | 5 ++--- cache.tar.xz | 4 ++-- 7 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 0001-Default-db-name.patch delete mode 100644 MirrorCache-1.045.obscpio create mode 100644 MirrorCache-1.046.obscpio diff --git a/0001-Default-db-name.patch b/0001-Default-db-name.patch deleted file mode 100644 index 3d471b0..0000000 --- a/0001-Default-db-name.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/lib/MirrorCache/Config.pm b/lib/MirrorCache/Config.pm -index fb5565d..2388cf3 100644 ---- a/lib/MirrorCache/Config.pm -+++ b/lib/MirrorCache/Config.pm -@@ -28,7 +28,7 @@ has dbuser => $ENV{MIRRORCACHE_DBUSER}; - has dbpass => $ENV{MIRRORCACHE_DBPASS}; - has dbhost => $ENV{MIRRORCACHE_DBHOST}; - has dbport => $ENV{MIRRORCACHE_DBPORT}; --has dbdb => $ENV{MIRRORCACHE_DB}; -+has dbdb => $ENV{MIRRORCACHE_DB} // 'mirrorcache'; - has dsn => $ENV{MIRRORCACHE_DSN}; - has dsn_replica => $ENV{MIRRORCACHE_DSN_REPLICA}; - has redirect => $ENV{MIRRORCACHE_REDIRECT}; - diff --git a/MirrorCache-1.045.obscpio b/MirrorCache-1.045.obscpio deleted file mode 100644 index bd7c18e..0000000 --- a/MirrorCache-1.045.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:347c825311864ffda16f3508cd0e4c11d72221fd65556162acaef67b5ed343a3 -size 997900 diff --git a/MirrorCache-1.046.obscpio b/MirrorCache-1.046.obscpio new file mode 100644 index 0000000..e97ea05 --- /dev/null +++ b/MirrorCache-1.046.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1029fc4ae4af821fe8cb4b6fe9130535c4d00a649e2568493759d0581380d86b +size 1006092 diff --git a/MirrorCache.changes b/MirrorCache.changes index d74ce36..e1baaf8 100644 --- a/MirrorCache.changes +++ b/MirrorCache.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 17 06:21:34 UTC 2022 - Andrii Nikitin + +- Update to version 1.046: + * Correctly render mirrorlist in browser when file is unknown + * Allow rendering .zsync files + * Render selected mirrors with osm in .mirrorlist + ------------------------------------------------------------------- Fri Nov 11 10:42:10 UTC 2022 - Andrii Nikitin - Add temporary patch for default database name diff --git a/MirrorCache.obsinfo b/MirrorCache.obsinfo index ace8dd7..9b202f5 100644 --- a/MirrorCache.obsinfo +++ b/MirrorCache.obsinfo @@ -1,4 +1,4 @@ name: MirrorCache -version: 1.045 -mtime: 1668159057 -commit: fcd5d312ae28c5f4cfbecd080459289cb50f6b6d +version: 1.046 +mtime: 1668665747 +commit: 53fabc74250862a160fb6cec5a7b3487964ece7c diff --git a/MirrorCache.spec b/MirrorCache.spec index 24610e9..21fd9d9 100644 --- a/MirrorCache.spec +++ b/MirrorCache.spec @@ -22,14 +22,13 @@ %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) perl(Config::IniFiles) %define build_requires %{assetpack_requires} rubygem(sass) tidy sysuser-shadow sysuser-tools Name: MirrorCache -Version: 1.045 +Version: 1.046 Release: 0 Summary: WebApp to redirect and manage mirrors License: GPL-2.0-or-later Group: Productivity/Networking/Web/Servers URL: https://github.com/openSUSE/MirrorCache Source0: %{name}-%{version}.tar.xz -Patch0: 0001-Default-db-name.patch Source1: cache.tar.xz Source2: %{name}-user.conf Source3: %{name}-tmpfilesd.conf @@ -45,7 +44,7 @@ BuildArch: noarch Mirror redirector web service, which automatically scans the main server and mirrors %prep -%autosetup -p1 +%setup -q -a1 %build # make {?_smp_mflags} diff --git a/cache.tar.xz b/cache.tar.xz index da5ff95..0119a7e 100644 --- a/cache.tar.xz +++ b/cache.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b9a45ba24087e5ee4521e23e87dbb9181967f3b971b08e23de3a8c96d9be454 -size 971064 +oid sha256:0182ab7353191fc3efbfa978cd96fd636830d508cbac813a53fd136296a6b595 +size 1013292