Go back to bundling libhttp-parser on Debian, at least for our own internally-created packages, since this library has a massively unstable ABI and causes nothing but problems if referenced from the distro.

10 years ago · 5d7174b162
13 changed files with 26 additions and 2 deletions
--- a/debian/control
+++ b/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), libhttp-parser-dev (>= 2.1), liblz4-dev, libnatpmp-dev, dh-systemd, ruby-ronn
+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: zerotier-one
 Architecture: any
-Depends:  ${shlibs:Depends}, ${misc:Depends}, libhttp-parser2.1, liblz4-1, 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
--- a/linux-build-farm/debian-jessie/x64/Dockerfile
+++ b/linux-build-farm/debian-jessie/x64/Dockerfile
@ -7,4 +7,6 @@ RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev l
 RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++
 RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
--- a/linux-build-farm/debian-jessie/x86/Dockerfile
+++ b/linux-build-farm/debian-jessie/x86/Dockerfile
@ -7,4 +7,6 @@ RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev l
 RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++
 RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
--- a/linux-build-farm/debian-stretch/x64/Dockerfile
+++ b/linux-build-farm/debian-stretch/x64/Dockerfile
@ -7,4 +7,6 @@ RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev l
 #RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++
 #RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
--- a/linux-build-farm/debian-stretch/x86/Dockerfile
+++ b/linux-build-farm/debian-stretch/x86/Dockerfile
@ -7,4 +7,6 @@ RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev l
 #RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++
 #RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
--- a/linux-build-farm/debian-wheezy/x64/Dockerfile
+++ b/linux-build-farm/debian-wheezy/x64/Dockerfile
@ -4,6 +4,8 @@ MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
 RUN apt-get update
 RUN apt-get install -y build-essential debhelper ruby-ronn g++ make devscripts
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
 RUN mv -f /ZeroTierOne/debian/control.wheezy /ZeroTierOne/debian/control
--- a/linux-build-farm/debian-wheezy/x86/Dockerfile
+++ b/linux-build-farm/debian-wheezy/x86/Dockerfile
@ -7,6 +7,8 @@
 FROM zerotier/zt1-build-debian-wheezy-x86-base
 MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
 RUN mv -f /ZeroTierOne/debian/control.wheezy /ZeroTierOne/debian/control
--- a/linux-build-farm/ubuntu-trusty/x64/Dockerfile
+++ b/linux-build-farm/ubuntu-trusty/x64/Dockerfile
@ -7,4 +7,6 @@ RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev l
 RUN ln -sf /usr/bin/clang++-3.6 /usr/bin/clang++
 RUN ln -sf /usr/bin/clang-3.6 /usr/bin/clang
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
--- a/linux-build-farm/ubuntu-trusty/x86/Dockerfile
+++ b/linux-build-farm/ubuntu-trusty/x86/Dockerfile
@ -7,4 +7,6 @@ RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev l
 RUN ln -sf /usr/bin/clang++-3.6 /usr/bin/clang++
 RUN ln -sf /usr/bin/clang-3.6 /usr/bin/clang
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
--- a/linux-build-farm/ubuntu-wily/x64/Dockerfile
+++ b/linux-build-farm/ubuntu-wily/x64/Dockerfile
@ -7,4 +7,6 @@ RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev l
 RUN ln -sf /usr/bin/clang++-3.7 /usr/bin/clang++
 RUN ln -sf /usr/bin/clang-3.7 /usr/bin/clang
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
--- a/linux-build-farm/ubuntu-wily/x86/Dockerfile
+++ b/linux-build-farm/ubuntu-wily/x86/Dockerfile
@ -7,4 +7,6 @@ RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev l
 RUN ln -sf /usr/bin/clang++-3.7 /usr/bin/clang++
 RUN ln -sf /usr/bin/clang-3.7 /usr/bin/clang
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
--- a/linux-build-farm/ubuntu-xenial/x64/Dockerfile
+++ b/linux-build-farm/ubuntu-xenial/x64/Dockerfile
@ -9,4 +9,6 @@ RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev l
 RUN rm -f /usr/bin/clang++ /usr/bin/clang
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /
--- a/linux-build-farm/ubuntu-xenial/x86/Dockerfile
+++ b/linux-build-farm/ubuntu-xenial/x86/Dockerfile
@ -9,4 +9,6 @@ RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev l
 RUN rm -f /usr/bin/clang++ /usr/bin/clang
 RUN dpkg --purge libhttp-parser-dev
 ADD zt1-src.tar.gz /