From 6e7437a0d08c1e0621cd8bc430712fdc77d4e996 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 0c60963a94f7bb3b9458aaa65d78a83e0e7004d2 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 30 Apr 2018 12:08:09 -0700 Subject: app icon with no alpha channel --- artwork/AppIcon_1024x1024.png | Bin 56076 -> 47728 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/artwork/AppIcon_1024x1024.png b/artwork/AppIcon_1024x1024.png index dc0ba2fc..c423c4f7 100644 Binary files a/artwork/AppIcon_1024x1024.png and b/artwork/AppIcon_1024x1024.png differ -- cgit v1.2.3 From 9001ab58581b59cae1985bb22f8c0362e54256fc Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 2 May 2018 14:08:42 -0700 Subject: Do not add zerotier-one user if it does not exist (Debian) --- debian/postinst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/postinst b/debian/postinst index ecd148a4..0d540a67 100644 --- a/debian/postinst +++ b/debian/postinst @@ -2,7 +2,9 @@ case "$1" in configure) - adduser --system --group --home /var/lib/zerotier-one --no-create-home zerotier-one + if ! id zerotier-one >>/dev/null 2>&1; then + adduser --system --group --home /var/lib/zerotier-one --no-create-home zerotier-one + fi ;; esac -- cgit v1.2.3 From 776ff46db7125c57a1ca5e3e38a41d3e2a9ad78f Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 2 May 2018 14:12:10 -0700 Subject: User useradd not adduser on Debian. --- debian/postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/postinst b/debian/postinst index 0d540a67..2e673aef 100644 --- a/debian/postinst +++ b/debian/postinst @@ -3,7 +3,7 @@ case "$1" in configure) if ! id zerotier-one >>/dev/null 2>&1; then - adduser --system --group --home /var/lib/zerotier-one --no-create-home zerotier-one + useradd --system --user-group --home-dir /var/lib/zerotier-one --no-create-home zerotier-one fi ;; esac -- cgit v1.2.3 From f4e993c814b4c106362bdb8400ef25d09b0ca183 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 3 May 2018 12:51:49 -0700 Subject: Debian clean fix and CentOS 6 upgrade fix. --- make-linux.mk | 4 ++-- zerotier-one.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/make-linux.mk b/make-linux.mk index 08866090..de209d9f 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -286,7 +286,7 @@ manpages: FORCE doc: manpages clean: FORCE - rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o + rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp distclean: clean @@ -355,7 +355,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 debian/.debhelper debian/debhelper-build-stamp redhat: FORCE rpmbuild -ba zerotier-one.spec diff --git a/zerotier-one.spec b/zerotier-one.spec index bc8eaf80..1ce0989c 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -110,8 +110,8 @@ case "$1" in chkconfig --add zerotier-one ;; 2) - chkconfig --del newservice - chkconfig --add newservice + chkconfig --del zerotier-one + chkconfig --add zerotier-one ;; esac %endif @@ -145,6 +145,9 @@ esac %endif %changelog +* Thu May 03 2018 Adam Ierymenko - 1.2.8-0.1 +- see https://github.com/zerotier/ZeroTierOne for release notes + * Mon Apr 24 2017 Adam Ierymenko - 1.2.2-0.1 - see https://github.com/zerotier/ZeroTierOne for release notes -- cgit v1.2.3 From d01b1ffde51c2becef6ed0b55dfde1659aaa474f Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 May 2018 12:09:04 -0700 Subject: Added -fPIC for Synology builds --- make-linux.mk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/make-linux.mk b/make-linux.mk index 2e6a8632..a571f344 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -42,14 +42,6 @@ endif # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems. ONE_OBJS+=ext/http-parser/http_parser.o -ifeq ($(ZT_SYNOLOGY), 1) - override DEFS+=-D__SYNOLOGY__ -endif - -ifeq ($(ZT_QNAP), 1) - override DEFS+=-D__QNAP__ -endif - ifeq ($(ZT_TRACE),1) override DEFS+=-DZT_TRACE endif @@ -80,6 +72,15 @@ else STRIP+=--strip-all endif +ifeq ($(ZT_QNAP), 1) + override DEFS+=-D__QNAP__ +endif + +ifeq ($(ZT_SYNOLOGY), 1) + CXXFLAGS+=-fPIC + override DEFS+=-D__SYNOLOGY__ +endif + ifeq ($(ZT_TRACE),1) override DEFS+=-DZT_TRACE endif -- cgit v1.2.3 From c8a907fd71393ac8cdf1664952544c99973e4c79 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 May 2018 13:03:52 -0700 Subject: Added override directive to CXXFLAGS for Synology builds in make-linux.mk --- make-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-linux.mk b/make-linux.mk index a571f344..1280e895 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -77,7 +77,7 @@ ifeq ($(ZT_QNAP), 1) endif ifeq ($(ZT_SYNOLOGY), 1) - CXXFLAGS+=-fPIC + override CXXFLAGS+=-fPIC override DEFS+=-D__SYNOLOGY__ endif -- cgit v1.2.3 From 22301a459970dc557c4959104afe418d4b2d6bb1 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 May 2018 14:31:34 -0700 Subject: Added override directive to CFLAGS for Synology builds in make-linux.mk --- make-linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make-linux.mk b/make-linux.mk index 1280e895..4a2a3e2d 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -77,6 +77,7 @@ ifeq ($(ZT_QNAP), 1) endif ifeq ($(ZT_SYNOLOGY), 1) + override CFLAGS+=-fPIC override CXXFLAGS+=-fPIC override DEFS+=-D__SYNOLOGY__ endif -- cgit v1.2.3 From 5f85e335100c31f19bd4c1cb327f4123f864a343 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 7 May 2018 12:15:55 -0700 Subject: GitHub issue #734 (warning removal) --- ext/ed25519-amd64-asm/ge25519_scalarmult_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c b/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c index 986abaf6..ffa6e2fa 100644 --- a/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c +++ b/ext/ed25519-amd64-asm/ge25519_scalarmult_base.c @@ -12,7 +12,7 @@ static const ge25519_niels ge25519_base_multiples_niels[] = { }; /* d */ -static const fe25519 ecd = {{0x75EB4DCA135978A3, 0x00700A4D4141D8AB, 0x8CC740797779E898, 0x52036CEE2B6FFE73}}; +/*static const fe25519 ecd = {{0x75EB4DCA135978A3, 0x00700A4D4141D8AB, 0x8CC740797779E898, 0x52036CEE2B6FFE73}};*/ void ge25519_scalarmult_base(ge25519_p3 *r, const sc25519 *s) { -- cgit v1.2.3 From 0cd01b6ff8e2717be194a354cc9adeaed428b8b5 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 7 May 2018 12:51:39 -0700 Subject: Fix silly bug where moons and networks were being loaded by the address of an array rather than the proper value. --- service/OneService.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/service/OneService.cpp b/service/OneService.cpp index 1d271b21..04d8c8df 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1083,8 +1083,8 @@ public: /* fprintf(stderr, "path = %s\n", path.c_str()); fprintf(stderr, "headers.size=%d\n", headers.size()); - std::map::const_iterator it(headers.begin()); - while(it != headers.end()) { + std::map::const_iterator it(headers.begin()); + while(it != headers.end()) { fprintf(stderr,"header[%s] = %s\n", (it->first).c_str(), (it->second).c_str()); it++; } @@ -1092,7 +1092,7 @@ public: // parse out url args int synotoken_pos = path.find("SynoToken"); int argpos = path.find("?"); - if(synotoken_pos != std::string::npos && argpos != std::string::npos) { + if(synotoken_pos != std::string::npos && argpos != std::string::npos) { std::string cookie = path.substr(argpos+1, synotoken_pos-(argpos+1)); std::string synotoken = path.substr(synotoken_pos); std::string cookie_val = cookie.substr(cookie.find("=")+1); @@ -1589,7 +1589,7 @@ public: if (std::find(n.managedIps.begin(),n.managedIps.end(),*ip) == n.managedIps.end()) { if (!n.tap->addIp(*ip)) fprintf(stderr,"ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf)); - } + } } #endif n.managedIps.swap(newManagedIps); @@ -2004,7 +2004,7 @@ public: if (n.tap) { // sanity check #if defined(__WINDOWS__) && !defined(ZT_SDK) // wait for up to 5 seconds for the WindowsEthernetTap to actually be initialized - // + // // without WindowsEthernetTap::isInitialized() returning true, the won't actually // be online yet and setting managed routes on it will fail. const int MAX_SLEEP_COUNT = 500; @@ -2164,10 +2164,10 @@ public: OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "planet",_homePath.c_str()); break; case ZT_STATE_OBJECT_MOON: - OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "moons.d" ZT_PATH_SEPARATOR_S "%.16llx.moon",_homePath.c_str(),(unsigned long long)id); + OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "moons.d" ZT_PATH_SEPARATOR_S "%.16llx.moon",_homePath.c_str(),(unsigned long long)id[0]); break; case ZT_STATE_OBJECT_NETWORK_CONFIG: - OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "networks.d" ZT_PATH_SEPARATOR_S "%.16llx.conf",_homePath.c_str(),(unsigned long long)id); + OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "networks.d" ZT_PATH_SEPARATOR_S "%.16llx.conf",_homePath.c_str(),(unsigned long long)id[0]); break; case ZT_STATE_OBJECT_PEER: OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "peers.d" ZT_PATH_SEPARATOR_S "%.10llx.peer",_homePath.c_str(),(unsigned long long)id[0]); -- cgit v1.2.3 From 9765ba334abae268aea7644ba1a172a9e704143d Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 8 May 2018 13:07:20 -0700 Subject: 1.2.10 --- RELEASE-NOTES.md | 6 ++++++ 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 | 5 ++++- 7 files changed, 20 insertions(+), 5 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 0ff36519..54dd1375 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,6 +1,12 @@ ZeroTier Release Notes ====== +# 2018-05-08 -- Version 1.2.10 + + * Fix bug loading `moons.d/` files for federated root operation. + * Fix compile problem with ZT_DEBUG on some versions of `clang` + * Fix slow network startup bug related to loading of `networks.d/` cache files + # 2018-04-27 -- Version 1.2.8 * Linux version once again builds with PIE (position independent executable) flags diff --git a/debian/changelog b/debian/changelog index bc89ab07..1c020411 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zerotier-one (1.2.10) unstable; urgency=medium + + * See https://github.com/zerotier/ZeroTierOne for release notes. + + -- Adam Ierymenko Tue, 08 May 2018 01:00:00 -0700 + zerotier-one (1.2.8) 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 1083d47b..866029ee 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.8 + 1.2.10 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 c0112029..1270652b 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.8 + 1.2.10 diff --git a/version.h b/version.h index c82986fe..808879d7 100644 --- a/version.h +++ b/version.h @@ -40,7 +40,7 @@ /** * Revision */ -#define ZEROTIER_ONE_VERSION_REVISION 8 +#define ZEROTIER_ONE_VERSION_REVISION 10 /** * Build version diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml index 3e83c2e2..b1df750b 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 1ce0989c..41af5aca 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -1,5 +1,5 @@ Name: zerotier-one -Version: 1.2.8 +Version: 1.2.10 Release: 1%{?dist} Summary: ZeroTier One network virtualization service @@ -145,6 +145,9 @@ esac %endif %changelog +* Tue May 08 2018 Adam Ierymenko - 1.2.10-0.1 +- see https://github.com/zerotier/ZeroTierOne for release notes + * Thu May 03 2018 Adam Ierymenko - 1.2.8-0.1 - see https://github.com/zerotier/ZeroTierOne for release notes -- cgit v1.2.3 From 535ba8a207f7cfc2ce6e8ba2e44442896ffffc29 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Wed, 9 May 2018 13:51:32 -0700 Subject: Consolidated powerpc64le machine types, added 32-bit powerpc machine type and a flag to disable use of Linux capabilities --- make-linux.mk | 12 +++++++----- one.cpp | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/make-linux.mk b/make-linux.mk index 62f319bf..56096da8 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -79,7 +79,7 @@ endif ifeq ($(ZT_SYNOLOGY), 1) override CFLAGS+=-fPIC override CXXFLAGS+=-fPIC - override DEFS+=-D__SYNOLOGY__ + override DEFS+=-D__SYNOLOGY__ endif ifeq ($(ZT_TRACE),1) @@ -111,6 +111,12 @@ ifeq ($(CC_MACH),amd64) endif ifeq ($(CC_MACH),powerpc64le) ZT_ARCHITECTURE=8 + override DEFS+=-DZT_NO_TYPE_PUNNING +endif +ifeq ($(CC_MACH),powerpc) + ZT_ARCHITECTURE=8 + override DEFS+=-DZT_NO_TYPE_PUNNING + override DEFS+=-DZT_NO_CAPABILITIES endif ifeq ($(CC_MACH),ppc64le) ZT_ARCHITECTURE=8 @@ -199,10 +205,6 @@ ifeq ($(CC_MACH),mips64el) ZT_ARCHITECTURE=6 override DEFS+=-DZT_NO_TYPE_PUNNING endif -ifeq ($(CC_MACH),powerpc64le) - ZT_ARCHITECTURE=7 - override DEFS+=-DZT_NO_TYPE_PUNNING -endif # Fail if system architecture could not be determined ifeq ($(ZT_ARCHITECTURE),999) diff --git a/one.cpp b/one.cpp index 9ebc83c1..b770451c 100644 --- a/one.cpp +++ b/one.cpp @@ -972,7 +972,7 @@ static void _sighandlerQuit(int sig) #endif // Drop privileges on Linux, if supported by libc etc. and "zerotier-one" user exists on system -#ifdef __LINUX__ +#if defined(__LINUX__) && !defined(ZT_NO_CAPABILITIES) #ifndef PR_CAP_AMBIENT #define PR_CAP_AMBIENT 47 #define PR_CAP_AMBIENT_IS_SET 1 -- cgit v1.2.3 From 5809941ae9c697c51f20f9810621e7a53a75f48f Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 11 May 2018 13:40:03 -0700 Subject: Windows 1.2.10 --- 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 d160a167..cfa7d673 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