From 0a50b4a6b2a322da807da1d510e3296722bfd0b2 Mon Sep 17 00:00:00 2001 From: NAStools Date: Tue, 1 Nov 2016 16:50:04 -0700 Subject: [PATCH] Modified packaging for ReadyNAS OS --- debian/control | 16 +++--- debian/control.wheezy | 19 ------- debian/gbp.conf | 14 +++++ debian/install | 4 ++ debian/links | 3 ++ debian/lintian-overrides | 7 +++ debian/manpages | 3 ++ ...tformDefaultHomePath-for-ReadyNAS-OS.patch | 23 ++++++++ debian/patches/series | 1 + debian/readynas/config.xml | 13 +++++ .../fvapp-nastools-zerotier-one.service} | 4 +- debian/readynas/logo.png | Bin 0 -> 11148 bytes debian/rules | 14 +---- debian/rules.wheezy | 11 ---- debian/source.lintian-overrides | 5 ++ debian/{ => source}/format | 0 debian/source/include-binaries | 1 + debian/zerotier-one.init | 49 ------------------ debian/zerotier-one.upstart | 14 ----- 19 files changed, 86 insertions(+), 115 deletions(-) delete mode 100644 debian/control.wheezy create mode 100644 debian/gbp.conf create mode 100644 debian/install create mode 100644 debian/links create mode 100644 debian/lintian-overrides create mode 100644 debian/manpages create mode 100644 debian/patches/0001-Update-platformDefaultHomePath-for-ReadyNAS-OS.patch create mode 100644 debian/patches/series create mode 100644 debian/readynas/config.xml rename debian/{zerotier-one.service => readynas/fvapp-nastools-zerotier-one.service} (54%) create mode 100644 debian/readynas/logo.png delete mode 100755 debian/rules.wheezy create mode 100644 debian/source.lintian-overrides rename debian/{ => source}/format (100%) create mode 100644 debian/source/include-binaries delete mode 100644 debian/zerotier-one.init delete mode 100644 debian/zerotier-one.upstart diff --git a/debian/control b/debian/control index 46b8307..dea8d25 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,17 @@ Source: zerotier-one -Maintainer: Adam Ierymenko +Maintainer: NAStools 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 diff --git a/debian/control.wheezy b/debian/control.wheezy deleted file mode 100644 index 0cbd151..0000000 --- a/debian/control.wheezy +++ /dev/null @@ -1,19 +0,0 @@ -Source: zerotier-one -Maintainer: Adam Ierymenko -Section: net -Priority: optional -Standards-Version: 3.9.4 -Build-Depends: debhelper (>= 9), ruby-ronn -Vcs-Git: git://github.com/zerotier/ZeroTierOne -Vcs-Browser: https://github.com/zerotier/ZeroTierOne -Homepage: https://www.zerotier.com/ - -Package: zerotier-one -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute -Homepage: https://www.zerotier.com/ -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 - https://www.zerotier.com/ for instructions and - documentation. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..28456f2 --- /dev/null +++ b/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 diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..f4ef971 --- /dev/null +++ b/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 diff --git a/debian/links b/debian/links new file mode 100644 index 0000000..7eef662 --- /dev/null +++ b/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 diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..61c7fb5 --- /dev/null +++ b/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 diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..2f03aa0 --- /dev/null +++ b/debian/manpages @@ -0,0 +1,3 @@ +doc/zerotier-cli.1 +doc/zerotier-idtool.1 +doc/zerotier-one.8 diff --git a/debian/patches/0001-Update-platformDefaultHomePath-for-ReadyNAS-OS.patch b/debian/patches/0001-Update-platformDefaultHomePath-for-ReadyNAS-OS.patch new file mode 100644 index 0000000..9acf2fa --- /dev/null +++ b/debian/patches/0001-Update-platformDefaultHomePath-for-ReadyNAS-OS.patch @@ -0,0 +1,23 @@ +From: NAStools +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 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e4a416a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Update-platformDefaultHomePath-for-ReadyNAS-OS.patch diff --git a/debian/readynas/config.xml b/debian/readynas/config.xml new file mode 100644 index 0000000..05bc556 --- /dev/null +++ b/debian/readynas/config.xml @@ -0,0 +1,13 @@ + + + 6.6.0 + ZeroTier One NT + NAStools + 0 + + https://github.com/nastools/zerotierone + nastools-zerotier-one + ZeroTier network virtualization service (CLI only) + fvapp-nastools-zerotier-one.service + + diff --git a/debian/zerotier-one.service b/debian/readynas/fvapp-nastools-zerotier-one.service similarity index 54% rename from debian/zerotier-one.service rename to debian/readynas/fvapp-nastools-zerotier-one.service index a0126b7..adc8d71 100644 --- a/debian/zerotier-one.service +++ b/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 diff --git a/debian/readynas/logo.png b/debian/readynas/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..971b24f38d43c51cf28b08759dc1af419a06b1b0 GIT binary patch literal 11148 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 literal 0 HcmV?d00001 diff --git a/debian/rules b/debian/rules index cf0b04f..c34429d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,6 @@ #!/usr/bin/make -f -CFLAGS=-O3 -fstack-protector-strong -CXXFLAGS=-O3 -fstack-protector-strong - %: - dh $@ --with systemd + dh $@ -override_dh_auto_build: - make ZT_USE_MINIUPNPC=1 -j 2 - -override_dh_systemd_start: - dh_systemd_start --restart-after-upgrade - -override_dh_installinit: - dh_installinit --name=zerotier-one -- defaults +override_dh_auto_install: diff --git a/debian/rules.wheezy b/debian/rules.wheezy deleted file mode 100755 index e51d794..0000000 --- a/debian/rules.wheezy +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/make -f - -CFLAGS=-O3 -fstack-protector -CXXFLAGS=-O3 -fstack-protector - -%: - dh $@ - -override_dh_auto_build: - make ZT_USE_MINIUPNPC=1 -j 2 - diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides new file mode 100644 index 0000000..96c149f --- /dev/null +++ b/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 diff --git a/debian/format b/debian/source/format similarity index 100% rename from debian/format rename to debian/source/format diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 0000000..997e03f --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1 @@ +debian/readynas/logo.png diff --git a/debian/zerotier-one.init b/debian/zerotier-one.init deleted file mode 100644 index 41a22a5..0000000 --- a/debian/zerotier-one.init +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: zerotier-one -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: -# Short-Description: ZeroTier One network virtualization service -### END INIT INFO - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DESC="zerotier-one daemon" -NAME=zerotier-one -DAEMON=/usr/sbin/zerotier-one -PIDFILE=/var/lib/zerotier-one/zerotier-one.pid -SCRIPTNAME=/etc/init.d/"$NAME" -EXTRA_OPTS=-d - -test -f $DAEMON || exit 0 - -. /lib/lsb/init-functions - -case "$1" in -start) log_daemon_msg "Starting ZeroTier One" "zerotier-one" - start_daemon -p $PIDFILE $DAEMON $EXTRA_OPTS - log_end_msg $? - ;; -stop) log_daemon_msg "Stopping ZeroTier One" "zerotier-one" - killproc -p $PIDFILE $DAEMON - RETVAL=$? - [ $RETVAL -eq 0 ] && [ -e "$PIDFILE" ] && rm -f $PIDFILE - log_end_msg $RETVAL - ;; -restart) log_daemon_msg "Restarting ZeroTier One" "zerotier-one" - $0 stop - $0 start - ;; -reload|force-reload) log_daemon_msg "Reloading ZeroTier One" "zerotier-one" - log_end_msg 0 - ;; -status) - status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? - ;; -*) log_action_msg "Usage: /etc/init.d/cron {start|stop|status|restart|reload|force-reload}" - exit 2 - ;; -esac -exit 0 diff --git a/debian/zerotier-one.upstart b/debian/zerotier-one.upstart deleted file mode 100644 index 7753580..0000000 --- a/debian/zerotier-one.upstart +++ /dev/null @@ -1,14 +0,0 @@ -description "ZeroTier One upstart startup script" - -author "Adam Ierymenko " - -start on (local-filesystems and net-device-up IFACE!=lo) -stop on runlevel [!2345] - -respawn -respawn limit 2 300 - -#pre-start script -#end script - -exec /usr/sbin/zerotier-one