Modified packaging for ReadyNAS OS

debian/control

@@ -1,17 +1,17 @@
 Source: zerotier-one
-Maintainer: Adam Ierymenko <[email protected]>
+Maintainer: NAStools <[email protected]>
 Section: net
 Priority: optional
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), liblz4-dev, libnatpmp-dev, dh-systemd, ruby-ronn
-Vcs-Git: git://github.com/zerotier/ZeroTierOne
-Vcs-Browser: https://github.com/zerotier/ZeroTierOne
-Homepage: https://www.zerotier.com/
+Build-Depends: debhelper (>= 9), liblz4-dev, libnatpmp-dev, ruby-ronn
+Vcs-Git: git://github.com/nastools/zerotierone
+Vcs-Browser: https://github.com/nastools/zerotierone
+Homepage: https://www.zerotier.com
 
-Package: zerotier-one
+Package: nastools-zerotier-one
 Architecture: any
-Depends:  ${shlibs:Depends}, ${misc:Depends}, liblz4-1, libnatpmp1, iproute2
-Homepage: https://www.zerotier.com/
+Depends:  readynasos (>= 6.6.0), ${shlibs:Depends}, ${misc:Depends},
+          libnatpmp1, iproute2
 Description: ZeroTier network virtualization service
  ZeroTier One lets you join ZeroTier virtual networks and
  have them appear as tun/tap ports on your system. See

debian/gbp.conf

@@ -0,0 +1,14 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = master
+debian-tag = readynas/%(version)s
+debian-tag-msg = %(pkg)s ReadyNAS OS release %(version)s
+
+[git-buildpackage]
+export-dir  = ../build-area/
+color = on
+pristine-tar-commit = True
+
+[git-dch]
+# ignore merge commit messages
+git-log = --no-merges

debian/install

@@ -0,0 +1,4 @@
+debian/readynas/config.xml apps/nastools-zerotier-one
+debian/readynas/fvapp-nastools-zerotier-one.service apps/nastools-zerotier-one
+debian/readynas/logo.png apps/nastools-zerotier-one
+zerotier-one apps/nastools-zerotier-one/sbin

debian/links

@@ -0,0 +1,3 @@
+apps/nastools-zerotier-one/sbin/zerotier-one usr/sbin/zerotier-cli
+apps/nastools-zerotier-one/sbin/zerotier-one usr/sbin/zerotier-idtool
+apps/nastools-zerotier-one/sbin/zerotier-one usr/sbin/zerotier-one

debian/lintian-overrides

@@ -0,0 +1,7 @@
+## Overrides from NAStools
+# Overrides for ReadyNAS packaging
+nastools-zerotier-one: non-standard-toplevel-dir apps/
+nastools-zerotier-one: file-in-unusual-dir apps/nastools-zerotier-one/*
+
+# Debian's libminiupnpc is too old, so let ZT include its own
+nastools-zerotier-one: embedded-library apps/nastools-zerotier-one/sbin/zerotier-one: libminiupnpc

debian/manpages

@@ -0,0 +1,3 @@
+doc/zerotier-cli.1
+doc/zerotier-idtool.1
+doc/zerotier-one.8

debian/patches/0001-Update-platformDefaultHomePath-for-ReadyNAS-OS.patch

@@ -0,0 +1,23 @@
+From: NAStools <[email protected]>
+Date: Tue, 1 Nov 2016 16:09:41 -0700
+Subject: Update platformDefaultHomePath() for ReadyNAS OS
+
+---
+ osdep/OSUtils.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/osdep/OSUtils.cpp b/osdep/OSUtils.cpp
+index 3a04308..0a9ade6 100644
+--- a/osdep/OSUtils.cpp
++++ b/osdep/OSUtils.cpp
+@@ -244,8 +244,8 @@ std::string OSUtils::platformDefaultHomePath()
+ 	// BSD likes /var/db instead of /var/lib
+ 	return std::string("/var/db/zerotier-one");
+ #else
+-	// Use /var/lib for Linux and other *nix
+-	return std::string("/var/lib/zerotier-one");
++	// Use /apps/nastools-zerotier-one/var for ReadyNAS OS
++	return std::string("/apps/nastools-zerotier-one/var");
+ #endif
+
+ #endif

debian/patches/series

@@ -0,0 +1 @@
+0001-Update-platformDefaultHomePath-for-ReadyNAS-OS.patch

debian/readynas/config.xml

@@ -0,0 +1,13 @@
+<Application resource-id="nastools-zerotier-one">
+  <Version></Version>
+  <MinFirmwareVer>6.6.0</MinFirmwareVer>
+  <Name>ZeroTier One NT</Name>
+  <Author>NAStools</Author>
+  <RequireReboot>0</RequireReboot>
+  <LaunchURL/>
+  <InfoURL>https://github.com/nastools/zerotierone</InfoURL>
+  <DebianPackage>nastools-zerotier-one</DebianPackage>
+  <Description lang="en-us">ZeroTier network virtualization service (CLI only)</Description>
+  <ServiceName>fvapp-nastools-zerotier-one.service</ServiceName>
+  <ConfigURL/>
+</Application>

debian/zerotier-one.service → debian/readynas/fvapp-nastools-zerotier-one.service

@@ -1,9 +1,9 @@
 [Unit]
 Description=ZeroTier One
-After=network.target
+After=network.target apache2.service
 
 [Service]
-ExecStart=/usr/sbin/zerotier-one
+ExecStart=/apps/nastools-zerotier-one/sbin/zerotier-one
 Restart=always
 KillMode=process
 

debian/rules

@@ -1,16 +1,6 @@
 #!/usr/bin/make -f
 
-CFLAGS=-O3 -fstack-protector-strong
-CXXFLAGS=-O3 -fstack-protector-strong
-
 %:
-	dh $@ --with systemd
-
-override_dh_auto_build:
-	make ZT_USE_MINIUPNPC=1 -j 2
-
-override_dh_systemd_start:
-	dh_systemd_start --restart-after-upgrade
+	dh $@
 
-override_dh_installinit:
-	dh_installinit --name=zerotier-one -- defaults
+override_dh_auto_install:

debian/source.lintian-overrides

@@ -0,0 +1,5 @@
+## Overrides from NAStools
+# Nothing we can do about these, since they're upstream
+zerotier-one source: source-is-missing ext/installfiles/mac/ui/ztui.min.js
+zerotier-one source: source-is-missing ext/installfiles/mac/ui/simpleajax.min.js
+zerotier-one source: source-is-missing ext/installfiles/mac/ui/react.min.js

debian/source/include-binaries

@@ -0,0 +1 @@
+debian/readynas/logo.png