Merge branch 'dev' into edge

This commit is contained in:
Adam Ierymenko 2019-08-13 15:51:19 -07:00
commit a028e04ab9
No known key found for this signature in database
GPG Key ID: 1657198823E52A61
2 changed files with 9 additions and 2 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
zerotier-one (1.4.2-2) unstable; urgency=medium
* See https://github.com/zerotier/ZeroTierOne for release notes.
* This is a new build that fixes a binary build issue with containers and SELinux
-- Adam Ierymenko <adam.ierymenko@zerotier.com> Thu, 04 Aug 2019 01:00:00 -0700
zerotier-one (1.4.2) unstable; urgency=medium
* See https://github.com/zerotier/ZeroTierOne for release notes.

View File

@ -1,6 +1,6 @@
Name: zerotier-one
Version: 1.4.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: ZeroTier One network virtualization service
License: GPLv3
@ -14,7 +14,7 @@ BuildRequires: systemd
BuildRequires: systemd
%endif
Requires: iproute
Requires: iproute libstdc++
%if 0%{?rhel} >= 7
Requires: systemd