Xenial fix (clang broken) and bundle http-parser even in Fedora because it is so version sensitive.

linux-build-farm/ubuntu-xenial/x64/Dockerfile

@@ -4,7 +4,9 @@ MAINTAINER Adam Ierymenko <[email protected]>
 RUN apt-get update
 RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev libnatpmp-dev dh-systemd ruby-ronn g++ make devscripts clang-3.8
 
-RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++
-RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang
+#RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++
+#RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang
+
+RUN rm -f /usr/bin/clang++ /usr/bin/clang
 
 ADD zt1-src.tar.gz /

linux-build-farm/ubuntu-xenial/x86/Dockerfile

@@ -4,7 +4,9 @@ MAINTAINER Adam Ierymenko <[email protected]>
 RUN apt-get update
 RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev libnatpmp-dev dh-systemd ruby-ronn g++ make devscripts clang-3.8
 
-RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++
-RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang
+#RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++
+#RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang
+
+RUN rm -f /usr/bin/clang++ /usr/bin/clang
 
 ADD zt1-src.tar.gz /

zerotier-one.spec

@@ -12,7 +12,6 @@ BuildRequires:  systemd
 %endif
 
 %if 0%{?fedora} >= 21
-BuildRequires:  http-parser-devel
 BuildRequires:  lz4-devel
 BuildRequires:  libnatpmp-devel
 BuildRequires:  systemd
@@ -30,19 +29,18 @@ Requires:       chkconfig
 %endif
 
 %if 0%{?fedora} >= 21
-Requires:       http-parser
 Requires:       lz4
 Requires:       libnatpmp
 Requires:       systemd
 Requires:       json-parser
 %endif
 
+Provides:       bundled(http-parser) = 2.7.0
 Provides:       bundled(miniupnpc) = 2.0
 
 %if 0%{?rhel} >= 6
 Provides:       bundled(json-parser) = 1.1.0
 Provides:       bundled(lz4) = 1.7.1
-Provides:       bundled(http-parser) = 2.7.0
 Provides:       bundled(libnatpmp) = 20131126
 %endif