Add undefined to sanitizer options

Merge pull request #2514 from zerotier/fix-debian-controller-build
Fix debian controller build
2026-09-22 15:29:03 -07:00 · 2025-09-17 22:01:49 -07:00 · 2025-09-15 12:27:29 -04:00 · 2025-09-13 11:07:36 -04:00 · 2025-09-12 19:17:37 -04:00 · 2025-09-12 19:17:11 -04:00
5 changed files with 15 additions and 9 deletions
@@ -1,3 +1,9 @@
+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.
@@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong
 	dh $@ --with systemd

 override_dh_auto_build:
-	make
+	make ZT_OFFICIAL=1 ZT_NONFREE=1 all

 override_dh_systemd_start:
 	dh_systemd_start --restart-after-upgrade
@@ -7,5 +7,5 @@ CXXFLAGS=-O3 -fstack-protector
 	dh $@

 override_dh_auto_build:
-	make -j 2
+	make -j 2 ZT_OFFICIAL=1 ZT_NONFREE=1 all

@@ -71,7 +71,7 @@ endif

 # Build with address sanitization library for advanced debugging (clang)
 ifeq ($(ZT_SANITIZE),1)
-	override DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
+	override DEFS+=-fsanitize=address,undefined -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)
@@ -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} one
+make ZT_USE_MINIUPNPC=1 %{?_smp_mflags} ZT_OFFICIAL=1 ZT_NONFREE=1 one
 %endif

 %pre
Author	SHA1	Message	Date
Joseph Henry	03d894f1a6	Add undefined to sanitizer options	2025-09-17 22:01:49 -07:00
Adam Ierymenko	895b8211e1	Merge pull request #2514 from zerotier/fix-debian-controller-build Fix debian controller build	2025-09-15 12:27:29 -04:00
Adam Ierymenko	a28a6d1bf5	Build fix.	2025-09-13 11:07:36 -04:00
Adam Ierymenko	6921628610	RPM too	2025-09-12 19:17:37 -04:00
Adam Ierymenko	5d18a57518	Include controller on debian.	2025-09-12 19:17:11 -04:00
Adam Ierymenko	bc0a42651b	Merge pull request #2510 from zerotier/dev-main-merge Dev main merge	2025-09-11 13:57:46 -04:00
Adam Ierymenko	a16d6dbc01	Merge remote-tracking branch 'github/main' into dev	2025-09-11 13:55:34 -04:00
Adam Ierymenko	8140264cb6	Merge pull request #2363 from zerotier/dev 1.14.1 merge dev to main	2024-09-12 18:51:36 -04:00