diff --git a/debian/changelog b/debian/changelog index 235c694..aa2fb53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,38 @@ -zerotier-one (1.1.14-nt3) unstable; urgency=medium +zerotier-one (1.1.14) unstable; urgency=medium - * Clean up authtoken CGI + * See https://github.com/zerotier/ZeroTierOne for release notes. - -- NAStools Fri, 09 Dec 2016 10:20:55 -0800 + -- Adam Ierymenko Tue, 21 Jul 2016 07:14:12 -0700 -zerotier-one (1.1.14-nt2) unstable; urgency=medium +zerotier-one (1.1.12) unstable; urgency=medium - * Include UI from macOS client - * Configure package to use UI from macOS client + * See https://github.com/zerotier/ZeroTierOne for release notes. - -- NAStools Tue, 29 Nov 2016 18:02:28 -0800 + -- Adam Ierymenko Tue, 12 Jul 2016 03:02:22 -0700 -zerotier-one (1.1.14-nt1) unstable; urgency=medium +zerotier-one (1.1.10) unstable; urgency=medium - * Initial release + * See https://github.com/zerotier/ZeroTierOne for release notes. + * ZeroTier Debian packages no longer depend on http-parser since its ABI is too unstable. - -- NAStools Tue, 01 Nov 2016 16:30:45 -0700 + -- Adam Ierymenko Tue, 12 Jul 2016 12:29:00 -0700 + +zerotier-one (1.1.8) unstable; urgency=low + + * See https://github.com/zerotier/ZeroTierOne for release notes. + + -- Adam Ierymenko Fri, 08 Jul 2016 01:56:00 -0700 + +zerotier-one (1.1.6) unstable; urgency=medium + + * First Debian release on ZeroTier, Inc. private apt repository. + + * See https://github.com/zerotier/ZeroTierOne for release notes. + + -- Adam Ierymenko Fri, 24 Jun 2016 10:00:00 -0700 + +zerotier-one (1.1.5) UNRELEASED; urgency=medium + + * Development package -- first clean Debian packaging test. + + -- Adam Ierymenko Wed, 08 Jun 2016 10:05:01 -0700 diff --git a/debian/control b/debian/control index dea8d25..46b8307 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,17 @@ Source: zerotier-one -Maintainer: NAStools +Maintainer: Adam Ierymenko Section: net Priority: optional Standards-Version: 3.9.6 -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 +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/ -Package: nastools-zerotier-one +Package: zerotier-one Architecture: any -Depends: readynasos (>= 6.6.0), ${shlibs:Depends}, ${misc:Depends}, - libnatpmp1, iproute2 +Depends: ${shlibs:Depends}, ${misc:Depends}, liblz4-1, libnatpmp1, iproute2 +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 diff --git a/debian/control.wheezy b/debian/control.wheezy new file mode 100644 index 0000000..0cbd151 --- /dev/null +++ b/debian/control.wheezy @@ -0,0 +1,19 @@ +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/source/format b/debian/format similarity index 100% rename from debian/source/format rename to debian/format diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 28456f2..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,14 +0,0 @@ -[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 deleted file mode 100644 index 703976c..0000000 --- a/debian/install +++ /dev/null @@ -1,10 +0,0 @@ -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 -debian/readynas/https.conf apps/nastools-zerotier-one -debian/readynas/authtoken apps/nastools-zerotier-one/cgi -zerotier-one apps/nastools-zerotier-one/sbin -ext/installfiles/mac/ui/*.html apps/nastools-zerotier-one/var/ui -ext/installfiles/mac/ui/*.js apps/nastools-zerotier-one/var/ui -ext/installfiles/mac/ui/*.css apps/nastools-zerotier-one/var/ui -ext/installfiles/mac/ui/*.jsx apps/nastools-zerotier-one/var/ui diff --git a/debian/links b/debian/links deleted file mode 100644 index 7eef662..0000000 --- a/debian/links +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 61c7fb5..0000000 --- a/debian/lintian-overrides +++ /dev/null @@ -1,7 +0,0 @@ -## 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 deleted file mode 100644 index 2f03aa0..0000000 --- a/debian/manpages +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 9acf2fa..0000000 --- a/debian/patches/0001-Update-platformDefaultHomePath-for-ReadyNAS-OS.patch +++ /dev/null @@ -1,23 +0,0 @@ -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/0002-Allow-automatic-retrieval-of-authtoken-from-CGI.patch b/debian/patches/0002-Allow-automatic-retrieval-of-authtoken-from-CGI.patch deleted file mode 100644 index 104c72f..0000000 --- a/debian/patches/0002-Allow-automatic-retrieval-of-authtoken-from-CGI.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: NAStools -Date: Tue, 29 Nov 2016 17:41:16 -0800 -Subject: Allow automatic retrieval of authtoken from CGI - ---- - ext/installfiles/mac/ui/main.js | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/ext/installfiles/mac/ui/main.js b/ext/installfiles/mac/ui/main.js -index a164712..08d716f 100644 ---- a/ext/installfiles/mac/ui/main.js -+++ b/ext/installfiles/mac/ui/main.js -@@ -42,7 +42,13 @@ function getUrlParameter(parameter) - - var ztAuthToken = getUrlParameter('authToken'); - if ((!ztAuthToken)||(ztAuthToken.length <= 0)) { -- ztAuthToken = prompt('No authToken specified in URL. Enter token from\nauthtoken.secret to authorize.'); -+ xmlhttp = new XMLHttpRequest(); -+ xmlhttp.open("GET", "/apps/nastools-zerotier-one/cgi/authtoken", false); -+ xmlhttp.send(); -+ ztAuthToken = xmlhttp.responseText; -+ if ((!ztAuthToken)||(ztAuthToken.length <= 0)) { -+ ztAuthToken = prompt('No authToken specified in URL. Enter token from\nauthtoken.secret to authorize.'); -+ } - } - - React.render( diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ac8b132..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-Update-platformDefaultHomePath-for-ReadyNAS-OS.patch -0002-Allow-automatic-retrieval-of-authtoken-from-CGI.patch diff --git a/debian/readynas/authtoken.c b/debian/readynas/authtoken.c deleted file mode 100644 index 5aedb71..0000000 --- a/debian/readynas/authtoken.c +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include - -int main() { - FILE *f; - char c[32]; - - f=fopen("/apps/nastools-zerotier-one/var/authtoken.secret","r"); - if(!f) - return 1; - - printf("Content-Type: text/plain\n\n"); - - size_t ret = fread(c, 1, sizeof(c), f); - if(!ret) - return 1; - fwrite(c, ret, 1, stdout); - - fclose(f); - return 0; -} diff --git a/debian/readynas/config.xml b/debian/readynas/config.xml deleted file mode 100644 index 5491bee..0000000 --- a/debian/readynas/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - 1.1.14-nt3 - 6.6.0 - ZeroTier One NT - NAStools - 0 - https://localhost/apps/nastools-zerotier-one/ui/ - https://github.com/nastools/zerotierone - nastools-zerotier-one - ZeroTier network virtualization service - fvapp-nastools-zerotier-one.service - - diff --git a/debian/readynas/https.conf b/debian/readynas/https.conf deleted file mode 100644 index dcd1742..0000000 --- a/debian/readynas/https.conf +++ /dev/null @@ -1,21 +0,0 @@ - - LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so - - - LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so - - -ScriptAlias /apps/nastools-zerotier-one/cgi /apps/nastools-zerotier-one/cgi - - - Include "/etc/frontview/apache/Admin_Auth.conf" - - - - - - ProxyPass http://localhost:9993/ - ProxyPassReverse http://localhost:9993/ - - - diff --git a/debian/readynas/logo.png b/debian/readynas/logo.png deleted file mode 100644 index 971b24f..0000000 Binary files a/debian/readynas/logo.png and /dev/null differ diff --git a/debian/rules b/debian/rules index 6ce46ff..cf0b04f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,16 @@ #!/usr/bin/make -f +CFLAGS=-O3 -fstack-protector-strong +CXXFLAGS=-O3 -fstack-protector-strong + %: - dh $@ + dh $@ --with systemd override_dh_auto_build: - make ZT_USE_MINIUPNPC=1 -j$(nproc) - gcc $$(pwd)/debian/readynas/authtoken.c -o $$(pwd)/debian/readynas/authtoken - chmod u+s $$(pwd)/debian/readynas/authtoken + make ZT_USE_MINIUPNPC=1 -j 2 -override_dh_fixperms: - dh_fixperms -Xauthtoken +override_dh_systemd_start: + dh_systemd_start --restart-after-upgrade -override_dh_auto_install: +override_dh_installinit: + dh_installinit --name=zerotier-one -- defaults diff --git a/debian/rules.wheezy b/debian/rules.wheezy new file mode 100755 index 0000000..e51d794 --- /dev/null +++ b/debian/rules.wheezy @@ -0,0 +1,11 @@ +#!/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 deleted file mode 100644 index 96c149f..0000000 --- a/debian/source.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -## 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/source/include-binaries b/debian/source/include-binaries deleted file mode 100644 index 997e03f..0000000 --- a/debian/source/include-binaries +++ /dev/null @@ -1 +0,0 @@ -debian/readynas/logo.png diff --git a/debian/zerotier-one.init b/debian/zerotier-one.init new file mode 100644 index 0000000..41a22a5 --- /dev/null +++ b/debian/zerotier-one.init @@ -0,0 +1,49 @@ +#!/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/readynas/fvapp-nastools-zerotier-one.service b/debian/zerotier-one.service similarity index 54% rename from debian/readynas/fvapp-nastools-zerotier-one.service rename to debian/zerotier-one.service index adc8d71..a0126b7 100644 --- a/debian/readynas/fvapp-nastools-zerotier-one.service +++ b/debian/zerotier-one.service @@ -1,9 +1,9 @@ [Unit] Description=ZeroTier One -After=network.target apache2.service +After=network.target [Service] -ExecStart=/apps/nastools-zerotier-one/sbin/zerotier-one +ExecStart=/usr/sbin/zerotier-one Restart=always KillMode=process diff --git a/debian/zerotier-one.upstart b/debian/zerotier-one.upstart new file mode 100644 index 0000000..7753580 --- /dev/null +++ b/debian/zerotier-one.upstart @@ -0,0 +1,14 @@ +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