Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

debian/changelog

@@ -1,3 +1,9 @@
+zerotier-one (1.2.0) unstable; urgency=medium
+
+  * See https://github.com/zerotier/ZeroTierOne for release notes.
+
+ -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 07 Mar 2017 09:08:00 -0700
+
 zerotier-one (1.1.14) unstable; urgency=medium
 
   * See https://github.com/zerotier/ZeroTierOne for release notes.

debian/control

@@ -3,14 +3,14 @@ Maintainer: Adam Ierymenko <adam.ierymenko@zerotier.com>
 Section: net
 Priority: optional
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), libnatpmp-dev, dh-systemd, ruby-ronn
+Build-Depends: debhelper (>= 9), dh-systemd
 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}, libnatpmp1, iproute2
+Depends:  ${shlibs:Depends}, ${misc:Depends}, iproute2
 Homepage: https://www.zerotier.com/
 Description: ZeroTier network virtualization service
  ZeroTier One lets you join ZeroTier virtual networks and

debian/control.wheezy

@@ -3,7 +3,7 @@ Maintainer: Adam Ierymenko <adam.ierymenko@zerotier.com>
 Section: net
 Priority: optional
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9), ruby-ronn
+Build-Depends: debhelper (>= 9)
 Vcs-Git: git://github.com/zerotier/ZeroTierOne
 Vcs-Browser: https://github.com/zerotier/ZeroTierOne
 Homepage: https://www.zerotier.com/

debian/rules

@@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong
 	dh $@ --with systemd
 
 override_dh_auto_build:
-	make -j 2
+#	make -j 2
 
 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
+#	make -j 2
 

make-linux.mk

@@ -185,10 +185,10 @@ uninstall:	FORCE
 
 # These are just for convenience for building Linux packages
 
-debian:	distclean
+debian:	FORCE
-	debuild -I -i -us -uc
+	debuild -I -i -us -uc -nc -b
 
-redhat:	distclean
+redhat:	FORCE
 	rpmbuild -ba zerotier-one.spec
 
 FORCE:

zerotier-one.spec

@@ -1,18 +1,16 @@
 Name:           zerotier-one
-Version:        1.1.14
+Version:        1.2.0
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 Summary:        ZeroTier One network virtualization service
 
 License:        GPLv3
 URL:            https://www.zerotier.com
-Source0:        %{name}-%{version}.tar.gz
 
 %if 0%{?rhel} >= 7
 BuildRequires:  systemd
 %endif
 
 %if 0%{?fedora} >= 21
-BuildRequires:  libnatpmp-devel
 BuildRequires:  systemd
 %endif
 
@@ -27,17 +25,9 @@ Requires:       chkconfig
 %endif
 
 %if 0%{?fedora} >= 21
-Requires:       libnatpmp
 Requires:       systemd
 %endif
 
-Provides:       bundled(http-parser) = 2.7.0
-Provides:       bundled(miniupnpc) = 2.0.20161216
-
-%if 0%{?rhel} >= 6
-Provides:       bundled(libnatpmp) = 20131126
-%endif
-
 %description
 ZeroTier is a software defined networking layer for Earth.
 
@@ -51,33 +41,35 @@ like conventional VPNs or VLANs. It can run on native systems, VMs, or
 containers (Docker, OpenVZ, etc.).
 
 %prep
-rm -rf *
+#rm -rf *
-ln -s %{getenv:PWD} %{name}-%{version}
+#ln -s %{getenv:PWD} %{name}-%{version}
-tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf %{_sourcedir}/%{name}-%{version}.tar.gz %{name}-%{version}/*
+#tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf %{_sourcedir}/%{name}-%{version}.tar.gz %{name}-%{version}/*
-rm -f %{name}-%{version}
+#rm -f %{name}-%{version}
-cp -a %{getenv:PWD}/* .
+#cp -a %{getenv:PWD}/* .
 
 %build
-%if 0%{?rhel} <= 7
+#%if 0%{?rhel} <= 7
-make CFLAGS="`echo %{optflags} | sed s/stack-protector-strong/stack-protector/`" CXXFLAGS="`echo %{optflags} | sed s/stack-protector-strong/stack-protector/`" ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one manpages selftest
+#make CFLAGS="`echo %{optflags} | sed s/stack-protector-strong/stack-protector/`" CXXFLAGS="`echo %{optflags} | sed s/stack-protector-strong/stack-protector/`" ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one manpages selftest
-%else
+#%else
-make CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one manpages selftest
+#make CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one manpages selftest
-%endif
+#%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+pushd %{getenv:PWD}
 make install DESTDIR=$RPM_BUILD_ROOT
+popd
 %if 0%{?rhel} >= 7
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-cp debian/zerotier-one.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
+cp %{getenv:PWD}/debian/zerotier-one.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
 %endif
 %if 0%{?fedora} >= 21
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-cp debian/zerotier-one.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
+cp ${getenv:PWD}/debian/zerotier-one.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
 %endif
 %if 0%{?rhel} <= 6
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
-cp ext/installfiles/linux/zerotier-one.init.rhel6 $RPM_BUILD_ROOT/etc/init.d/zerotier-one
+cp %{getenv:PWD}/ext/installfiles/linux/zerotier-one.init.rhel6 $RPM_BUILD_ROOT/etc/init.d/zerotier-one
 chmod 0755 $RPM_BUILD_ROOT/etc/init.d/zerotier-one
 %endif