From a7d0905b746b9e5319e2fa4d29f7a8191944fd2d Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 27 Apr 2018 13:06:00 -0700 Subject: 1.2.8 bump for all but Windows install files. --- RELEASE-NOTES.md | 8 ++++++++ debian/changelog | 6 ++++++ ext/installfiles/mac/ZeroTier One.pkgproj | 2 +- .../windows/chocolatey/zerotier-one/zerotier-one.nuspec | 2 +- version.h | 2 +- windows/WinUI/AboutView.xaml | 2 +- zerotier-one.spec | 2 +- 7 files changed, 19 insertions(+), 5 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index a73671d7..0ff36519 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,6 +1,14 @@ ZeroTier Release Notes ====== +# 2018-04-27 -- Version 1.2.8 + + * Linux version once again builds with PIE (position independent executable) flags + * Fixed bug in zerotier-idtool file sign and verify + * Fixed minor OSX app typo + * Merged alpha NetBSD support (mostly untested, so YMMV) + * Merged several minor typo and one-liner bug fixes + # 2018-04-17 -- Version 1.2.6 * Features and Core Improvements diff --git a/debian/changelog b/debian/changelog index b13e179a..bc89ab07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zerotier-one (1.2.8) unstable; urgency=medium + + * See https://github.com/zerotier/ZeroTierOne for release notes. + + -- Adam Ierymenko Tue, 27 Apr 2018 01:00:00 -0700 + zerotier-one (1.2.6) unstable; urgency=medium * See https://github.com/zerotier/ZeroTierOne for release notes. diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index 59c22dde..1083d47b 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -664,7 +664,7 @@ USE_HFS+_COMPRESSION VERSION - 1.2.6 + 1.2.8 PROJECT_COMMENTS diff --git a/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec b/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec index 3d090a7b..c0112029 100644 --- a/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec +++ b/ext/installfiles/windows/chocolatey/zerotier-one/zerotier-one.nuspec @@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe - 1.2.6 + 1.2.8 diff --git a/version.h b/version.h index 064f2585..c82986fe 100644 --- a/version.h +++ b/version.h @@ -40,7 +40,7 @@ /** * Revision */ -#define ZEROTIER_ONE_VERSION_REVISION 6 +#define ZEROTIER_ONE_VERSION_REVISION 8 /** * Build version diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml index 39213b73..3e83c2e2 100644 --- a/windows/WinUI/AboutView.xaml +++ b/windows/WinUI/AboutView.xaml @@ -19,7 +19,7 @@ - + diff --git a/zerotier-one.spec b/zerotier-one.spec index 2e78cba9..bc8eaf80 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -1,5 +1,5 @@ Name: zerotier-one -Version: 1.2.6 +Version: 1.2.8 Release: 1%{?dist} Summary: ZeroTier One network virtualization service -- cgit v1.2.3 From 0a52840fa354440c8a70c1ef1da26c188ff56ffb Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 27 Apr 2018 13:52:33 -0700 Subject: 1.2.8 Windows Advanced Installer update. --- ext/installfiles/windows/ZeroTier One.aip | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip index f75edaed..d160a167 100644 --- a/ext/installfiles/windows/ZeroTier One.aip +++ b/ext/installfiles/windows/ZeroTier One.aip @@ -27,10 +27,10 @@ - + - + @@ -64,7 +64,7 @@ - + @@ -454,7 +454,7 @@ - + -- cgit v1.2.3 From 7533d244a9e4148d5cf5b0b6dddc50e5b0881203 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 27 Apr 2018 16:21:22 -0700 Subject: Debian build fix. --- make-linux.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/make-linux.mk b/make-linux.mk index 2e6a8632..0cd4a47f 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -353,6 +353,9 @@ uninstall: FORCE debian: FORCE debuild -I -i -us -uc -nc -b +debian-clean: FORCE + rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one + redhat: FORCE rpmbuild -ba zerotier-one.spec -- cgit v1.2.3 From caf849fcba02268d7a46b98c3b07ca1e6dafeba1 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 27 Apr 2018 16:22:36 -0700 Subject: Typo. --- make-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-linux.mk b/make-linux.mk index 0cd4a47f..b885263d 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -354,7 +354,7 @@ debian: FORCE debuild -I -i -us -uc -nc -b debian-clean: FORCE - rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one + rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one redhat: FORCE rpmbuild -ba zerotier-one.spec -- cgit v1.2.3 From 19d453cb90e9009e582805510cc4641ce38ccd77 Mon Sep 17 00:00:00 2001 From: Travis LaDuke Date: Fri, 27 Apr 2018 16:48:34 -0700 Subject: Add some more icon sizes 20x20, 60x60, 1024x1024 pngs getting ready for an iOS release --- artwork/AppIcon_1024x1024.png | Bin 0 -> 56076 bytes artwork/AppIcon_20x20.png | Bin 0 -> 621 bytes artwork/AppIcon_60x60.png | Bin 0 -> 1597 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 artwork/AppIcon_1024x1024.png create mode 100644 artwork/AppIcon_20x20.png create mode 100644 artwork/AppIcon_60x60.png diff --git a/artwork/AppIcon_1024x1024.png b/artwork/AppIcon_1024x1024.png new file mode 100644 index 00000000..dc0ba2fc Binary files /dev/null and b/artwork/AppIcon_1024x1024.png differ diff --git a/artwork/AppIcon_20x20.png b/artwork/AppIcon_20x20.png new file mode 100644 index 00000000..bb10b478 Binary files /dev/null and b/artwork/AppIcon_20x20.png differ diff --git a/artwork/AppIcon_60x60.png b/artwork/AppIcon_60x60.png new file mode 100644 index 00000000..bb46ae75 Binary files /dev/null and b/artwork/AppIcon_60x60.png differ -- cgit v1.2.3 From 1df5d0453d4c7c6f3c5a653f4e7a4eae24242099 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 27 Apr 2018 18:50:40 -0700 Subject: Remove separate dh-systemd dependency since this is obsolete on newer Debian anyway. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a9554f19..1eb147e0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Adam Ierymenko Section: net Priority: optional Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9), dh-systemd +Build-Depends: debhelper (>= 9) Vcs-Git: git://github.com/zerotier/ZeroTierOne Vcs-Browser: https://github.com/zerotier/ZeroTierOne Homepage: https://www.zerotier.com/ -- cgit v1.2.3 From fffb037873448afab75b91dd66617e84bcb21644 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 27 Apr 2018 18:53:55 -0700 Subject: Fix for packaging on old Debian squeeze. --- debian/control.wheezy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control.wheezy b/debian/control.wheezy index f14c8760..a8e24084 100644 --- a/debian/control.wheezy +++ b/debian/control.wheezy @@ -3,7 +3,7 @@ Maintainer: Adam Ierymenko Section: net Priority: optional Standards-Version: 3.9.4 -Build-Depends: debhelper (>= 9) +Build-Depends: debhelper Vcs-Git: git://github.com/zerotier/ZeroTierOne Vcs-Browser: https://github.com/zerotier/ZeroTierOne Homepage: https://www.zerotier.com/ -- cgit v1.2.3 From d4160afac8921d98fcf59960504b4c596299901c Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 27 Apr 2018 19:51:27 -0700 Subject: Another squeeze fix to see if we can make this work. --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/compat b/debian/compat index f11c82a4..301160a9 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 \ No newline at end of file +8 \ No newline at end of file -- cgit v1.2.3