From dafc1a00ba15846bce3ebc89ba55edd79f8eb1b1 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Fri, 14 Jun 2024 14:43:11 +0200 Subject: [PATCH 1/2] prep for 0.23.0 --- CHANGES | 4 ++ COPYRIGHT | 2 +- README.md | 6 +-- VERSION | 2 +- bin/znapzendzetup | 2 +- bin/znapzendztatz | 2 +- man/znapzend.1 | 2 +- man/znapzendzetup.1 | 2 +- man/znapzendztatz.1 | 2 +- release-prep.sh | 12 ++--- thirdparty/cpanfile-5.30.snapshot | 88 +++++++++++++++++++++++++++++++ 11 files changed, 105 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index 602efe10..133c2e8a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +znapzend (0.23.0) unstable; urgency=medium + * Fixed `autoCreation` behavior broken in 0.22.0 release -- @jimklimov * Updated recipes for `make check` to install Perl modules it needs (previously was only done as part of GitHub checks); renamed the @@ -10,6 +12,8 @@ module installations) -- @jimklimov * Applied same markup style to older CHANGES logged entries -- @jimklimov + -- Tobi Oetiker Fri, 14 Jun 2024 14:42:00 +0200 + znapzend (0.22.0) unstable; urgency=medium * Add debian 12 package -- @moetiker diff --git a/COPYRIGHT b/COPYRIGHT index 69f64c09..0adf9922 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -3,7 +3,7 @@ znapzend - A ZFS backup system Copyright by Dominik Hassler, Tobias Oetiker and the other people listed in the AUTHORS file. -2024-05-03 +2024-06-14 All rights reserved. diff --git a/README.md b/README.md index 94419734..5766d9b9 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ xcode-select --install ### ...or just install the full Xcode app from the Apple With that in place you can now utter: ```sh -ZNAPVER=0.22.1 +ZNAPVER=0.23.0 wget https://github.com/oetiker/znapzend/releases/download/v${ZNAPVER}/znapzend-${ZNAPVER}.tar.gz tar zxvf znapzend-${ZNAPVER}.tar.gz cd znapzend-${ZNAPVER} @@ -159,7 +159,7 @@ Optionally (but recommended) put symbolic links to the installed binaries in the system PATH, e.g.: ```sh -ZNAPVER=0.22.1 +ZNAPVER=0.23.0 for x in /opt/znapzend-${ZNAPVER}/bin/*; do ln -fs ../../../$x /usr/local/bin/; done ``` @@ -612,4 +612,4 @@ And if you have a code or documentation contribution, please Enjoy! Dominik Hassler & Tobi Oetiker -2024-05-03 +2024-06-14 diff --git a/VERSION b/VERSION index 21574090..ca222b7c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.22.0 +0.23.0 diff --git a/bin/znapzendzetup b/bin/znapzendzetup index fed5c30d..aa72464f 100755 --- a/bin/znapzendzetup +++ b/bin/znapzendzetup @@ -10,7 +10,7 @@ use Scalar::Util qw(blessed); use Mojo::Base -strict; use Mojo::Log; use ZnapZend::Config; -my $VERSION = q{0.22.0}; # VERSION +my $VERSION = q{0.23.0}; # VERSION my @ROOT_EXEC_OPTIONS = qw(pfexec sudo rootExec=s debug features=s); my %featureMap = map { $_ => 1 } qw(pfexec sudo lowmemRecurse zfsGetType); diff --git a/bin/znapzendztatz b/bin/znapzendztatz index c9f69765..9fb786e2 100755 --- a/bin/znapzendztatz +++ b/bin/znapzendztatz @@ -10,7 +10,7 @@ use Mojo::Base -strict; use Mojo::Log; use ZnapZend::Config; use ZnapZend::ZFS; -my $VERSION = q{0.22.0}; # VERSION +my $VERSION = q{0.23.0}; # VERSION my $zConfig; my $zZfs; my $zTime = ZnapZend::Time->new(); diff --git a/man/znapzend.1 b/man/znapzend.1 index c2f5280d..104c8add 100644 --- a/man/znapzend.1 +++ b/man/znapzend.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ZNAPZEND 1" -.TH ZNAPZEND 1 "2024-05-03" "0.22.1" "znapzend" +.TH ZNAPZEND 1 "2024-05-03" "0.23.0" "znapzend" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/znapzendzetup.1 b/man/znapzendzetup.1 index 7e84e7e7..b32244f4 100644 --- a/man/znapzendzetup.1 +++ b/man/znapzendzetup.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ZNAPZENDZETUP 1" -.TH ZNAPZENDZETUP 1 "2024-05-03" "0.22.0" "znapzend" +.TH ZNAPZENDZETUP 1 "2024-06-14" "0.23.0" "znapzend" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/znapzendztatz.1 b/man/znapzendztatz.1 index e5ae647d..204323b9 100644 --- a/man/znapzendztatz.1 +++ b/man/znapzendztatz.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ZNAPZENDZTATZ 1" -.TH ZNAPZENDZTATZ 1 "2024-05-03" "0.22.0" "znapzend" +.TH ZNAPZENDZTATZ 1 "2024-06-14" "0.23.0" "znapzend" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/release-prep.sh b/release-prep.sh index 0b233740..e5a7e249 100755 --- a/release-prep.sh +++ b/release-prep.sh @@ -5,17 +5,11 @@ P=znapzend rm -f config.status ./bootstrap.sh ./configure -echo ${V} `date +"%Y-%m-%d %H:%M:%S %z"` `git config user.name` '<'`git config user.email`'>' > CHANGES.new -echo >> CHANGES.new -echo ' -' >> CHANGES.new -echo >> CHANGES.new -$EDITOR CHANGES.new -tail --line=+2 CHANGES.new | sed -e 's/^ //' > release-notes-$V.md -cat CHANGES >> CHANGES.new -mv CHANGES.new CHANGES +VERSION=$(cat VERSION) +debchange -m -v $V make make dist -git checkout -b v${V} +git checkout -b v${V} || true git commit -a git push --set-upstream origin v${V} #gh release create v${V} --title "ZnapZend $V" --notes-file release-notes-$V.md ${P}-${V}.tar.gz'#Source Archive' diff --git a/thirdparty/cpanfile-5.30.snapshot b/thirdparty/cpanfile-5.30.snapshot index 7494afc0..6ffcbab7 100644 --- a/thirdparty/cpanfile-5.30.snapshot +++ b/thirdparty/cpanfile-5.30.snapshot @@ -1,5 +1,93 @@ # carton snapshot format: version 1.0 DISTRIBUTIONS + Class-Method-Modifiers-2.15 + pathname: E/ET/ETHER/Class-Method-Modifiers-2.15.tar.gz + provides: + Class::Method::Modifiers 2.15 + requirements: + B 0 + Carp 0 + Exporter 0 + ExtUtils::MakeMaker 0 + base 0 + perl 5.006 + strict 0 + warnings 0 + ExtUtils-Config-0.008 + pathname: L/LE/LEONT/ExtUtils-Config-0.008.tar.gz + provides: + ExtUtils::Config 0.008 + requirements: + Data::Dumper 0 + ExtUtils::MakeMaker 6.30 + strict 0 + warnings 0 + ExtUtils-Helpers-0.026 + pathname: L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz + provides: + ExtUtils::Helpers 0.026 + ExtUtils::Helpers::Unix 0.026 + ExtUtils::Helpers::VMS 0.026 + ExtUtils::Helpers::Windows 0.026 + requirements: + Carp 0 + Exporter 5.57 + ExtUtils::MakeMaker 0 + File::Basename 0 + File::Copy 0 + File::Spec::Functions 0 + Text::ParseWords 3.24 + perl 5.006 + strict 0 + warnings 0 + ExtUtils-InstallPaths-0.012 + pathname: L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz + provides: + ExtUtils::InstallPaths 0.012 + requirements: + Carp 0 + ExtUtils::Config 0.002 + ExtUtils::MakeMaker 0 + File::Spec 0 + perl 5.006 + strict 0 + warnings 0 + Module-Build-Tiny-0.039 + pathname: L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz + provides: + Module::Build::Tiny 0.039 + requirements: + CPAN::Meta 0 + DynaLoader 0 + Exporter 5.57 + ExtUtils::CBuilder 0 + ExtUtils::Config 0.003 + ExtUtils::Helpers 0.020 + ExtUtils::Install 0 + ExtUtils::InstallPaths 0.002 + ExtUtils::ParseXS 0 + File::Basename 0 + File::Find 0 + File::Path 0 + File::Spec::Functions 0 + Getopt::Long 2.36 + JSON::PP 2 + Pod::Man 0 + TAP::Harness::Env 0 + perl 5.006 + strict 0 + warnings 0 + Mojo-Log-Clearable-1.001 + pathname: D/DB/DBOOK/Mojo-Log-Clearable-1.001.tar.gz + provides: + Mojo::Log::Clearable 1.001 + Mojo::Log::Role::Clearable 1.001 + requirements: + Class::Method::Modifiers 2.11 + Module::Build::Tiny 0.034 + Mojolicious 7.42 + Role::Tiny 2.000002 + perl 5.010001 Mojolicious-9.30 pathname: S/SR/SRI/Mojolicious-9.30.tar.gz provides: From 61931161014ce242c853cd3cf62b1bfa9fa899be Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Fri, 14 Jun 2024 17:17:37 +0200 Subject: [PATCH 2/2] fix changes --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 133c2e8a..5704b0dc 100644 --- a/CHANGES +++ b/CHANGES @@ -12,7 +12,7 @@ znapzend (0.23.0) unstable; urgency=medium module installations) -- @jimklimov * Applied same markup style to older CHANGES logged entries -- @jimklimov - -- Tobi Oetiker Fri, 14 Jun 2024 14:42:00 +0200 + -- Tobi Oetiker Fri, 14 Jun 2024 14:42:00 +0200 znapzend (0.22.0) unstable; urgency=medium