From 5d7174b162055340eb7622dd2e1e556c5a2dcd42 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 12 Jul 2016 10:11:00 -0700 Subject: [PATCH] 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. --- debian/control | 4 ++-- linux-build-farm/debian-jessie/x64/Dockerfile | 2 ++ linux-build-farm/debian-jessie/x86/Dockerfile | 2 ++ linux-build-farm/debian-stretch/x64/Dockerfile | 2 ++ linux-build-farm/debian-stretch/x86/Dockerfile | 2 ++ linux-build-farm/debian-wheezy/x64/Dockerfile | 2 ++ linux-build-farm/debian-wheezy/x86/Dockerfile | 2 ++ linux-build-farm/ubuntu-trusty/x64/Dockerfile | 2 ++ linux-build-farm/ubuntu-trusty/x86/Dockerfile | 2 ++ linux-build-farm/ubuntu-wily/x64/Dockerfile | 2 ++ linux-build-farm/ubuntu-wily/x86/Dockerfile | 2 ++ linux-build-farm/ubuntu-xenial/x64/Dockerfile | 2 ++ linux-build-farm/ubuntu-xenial/x86/Dockerfile | 2 ++ 13 files changed, 26 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index cfe506824..46b8307ff 100644 --- a/debian/control +++ b/debian/control @@ -3,14 +3,14 @@ Maintainer: Adam Ierymenko 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 diff --git a/linux-build-farm/debian-jessie/x64/Dockerfile b/linux-build-farm/debian-jessie/x64/Dockerfile index 9591eff66..316c1d83e 100644 --- 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 / diff --git a/linux-build-farm/debian-jessie/x86/Dockerfile b/linux-build-farm/debian-jessie/x86/Dockerfile index 9ed826ff5..3ad83329f 100644 --- 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 / diff --git a/linux-build-farm/debian-stretch/x64/Dockerfile b/linux-build-farm/debian-stretch/x64/Dockerfile index c5fdc2a19..c973c2b7b 100644 --- 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 / diff --git a/linux-build-farm/debian-stretch/x86/Dockerfile b/linux-build-farm/debian-stretch/x86/Dockerfile index 159e83c76..bfc7a86fa 100644 --- 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 / diff --git a/linux-build-farm/debian-wheezy/x64/Dockerfile b/linux-build-farm/debian-wheezy/x64/Dockerfile index 5663f1e17..77e1c3259 100644 --- a/linux-build-farm/debian-wheezy/x64/Dockerfile +++ b/linux-build-farm/debian-wheezy/x64/Dockerfile @@ -4,6 +4,8 @@ MAINTAINER Adam Ierymenko 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 diff --git a/linux-build-farm/debian-wheezy/x86/Dockerfile b/linux-build-farm/debian-wheezy/x86/Dockerfile index 7b7a632a8..1f0117d27 100644 --- 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 +RUN dpkg --purge libhttp-parser-dev + ADD zt1-src.tar.gz / RUN mv -f /ZeroTierOne/debian/control.wheezy /ZeroTierOne/debian/control diff --git a/linux-build-farm/ubuntu-trusty/x64/Dockerfile b/linux-build-farm/ubuntu-trusty/x64/Dockerfile index 6ec65d2ff..f84cc6e36 100644 --- 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 / diff --git a/linux-build-farm/ubuntu-trusty/x86/Dockerfile b/linux-build-farm/ubuntu-trusty/x86/Dockerfile index 271c19bbe..6be3ae872 100644 --- 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 / diff --git a/linux-build-farm/ubuntu-wily/x64/Dockerfile b/linux-build-farm/ubuntu-wily/x64/Dockerfile index f56344cfd..99b8d34cd 100644 --- 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 / diff --git a/linux-build-farm/ubuntu-wily/x86/Dockerfile b/linux-build-farm/ubuntu-wily/x86/Dockerfile index 24bb11169..86ad14f21 100644 --- 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 / diff --git a/linux-build-farm/ubuntu-xenial/x64/Dockerfile b/linux-build-farm/ubuntu-xenial/x64/Dockerfile index 03a65c55e..fa665a0ac 100644 --- 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 / diff --git a/linux-build-farm/ubuntu-xenial/x86/Dockerfile b/linux-build-farm/ubuntu-xenial/x86/Dockerfile index 3d04a57df..d01eec9bb 100644 --- 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 /