Merge pull request #2509 from zerotier/dev

1.16 dev to main

debian/changelog

@@ -1,9 +1,3 @@
-zerotier-one (1.16.0-2) unstable; urgency=medium
-
-  * Fix build settings to include controller.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Thu, 12 Sep 2025 01:00:00 -0700
-
 zerotier-one (1.16.0) unstable; urgency=medium
 
   * See RELEASE-NOTES.md for release notes.

debian/rules

@@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong
 	dh $@ --with systemd
 
 override_dh_auto_build:
-	make ZT_OFFICIAL=1 ZT_NONFREE=1 all
+	make
 
 override_dh_systemd_start:
 	dh_systemd_start --restart-after-upgrade

debian/rules.wheezy

@@ -7,5 +7,5 @@ CXXFLAGS=-O3 -fstack-protector
 	dh $@
 
 override_dh_auto_build:
-	make -j 2 ZT_OFFICIAL=1 ZT_NONFREE=1 all
+	make -j 2
 

make-linux.mk

@@ -71,7 +71,7 @@ endif
 
 # Build with address sanitization library for advanced debugging (clang)
 ifeq ($(ZT_SANITIZE),1)
-	override DEFS+=-fsanitize=address,undefined -DASAN_OPTIONS=symbolize=1
+	override DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
 endif
 ifeq ($(ZT_DEBUG),1)
 	override CFLAGS+=-Wall -Wno-deprecated -g -O -pthread $(INCLUDES) $(DEFS)
@@ -341,10 +341,10 @@ ifeq ($(ZT_STATIC),1)
 endif
 
 # For building an official semi-static binary on CentOS 7
-#ifeq ($(ZT_OFFICIAL),1)
-#	CORE_OBJS+=ext/misc/linux-old-glibc-compat.o
-#	override LDFLAGS+=-Wl,--wrap=memcpy -static-libstdc++
-#endif
+ifeq ($(ZT_OFFICIAL),1)
+	CORE_OBJS+=ext/misc/linux-old-glibc-compat.o
+	override LDFLAGS+=-Wl,--wrap=memcpy -static-libstdc++
+endif
 
 ifeq ($(ZT_CONTROLLER),1)
 	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)

zerotier-one.spec

@@ -102,12 +102,12 @@ ln -s %{getenv:PWD} %{name}-%{version}
 mkdir -p SOURCES
 tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf SOURCES/%{name}-%{version}.tar.gz %{name}-%{version}/*
 rm -f %{name}-%{version}
-cp -a %{getenv:PWD}/* .
+# cp -a %{getenv:PWD}/* .
 %endif
 
 %build
 %if "%{?dist}" != ".el6"
-make ZT_USE_MINIUPNPC=1 %{?_smp_mflags} ZT_OFFICIAL=1 ZT_NONFREE=1 one
+make ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one
 %endif
 
 %pre