From f86e9b7df28c287f7111f92007bed0d273416da3 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 8 Jul 2016 13:57:16 -0700 Subject: Bump version in RPM spec and DEB. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c6e9eb90..10c524d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zerotier-one (1.1.8) unstable; urgency=low + + * See https://github.com/zerotier/ZeroTierOne for release notes. + + -- Adam Ierymenko Fri, 08 Jul 2016 01:56:00 -0700 + zerotier-one (1.1.6) unstable; urgency=medium * First Debian release on ZeroTier, Inc. private apt repository. -- cgit v1.2.3 From 5d7174b162055340eb7622dd2e1e556c5a2dcd42 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 12 Jul 2016 10:11:00 -0700 Subject: 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(-) (limited to 'debian') diff --git a/debian/control b/debian/control index cfe50682..46b8307f 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 9591eff6..316c1d83 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 9ed826ff..3ad83329 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 c5fdc2a1..c973c2b7 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 159e83c7..bfc7a86f 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 5663f1e1..77e1c325 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 7b7a632a..1f0117d2 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 6ec65d2f..f84cc6e3 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 271c19bb..6be3ae87 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 f56344cf..99b8d34c 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 24bb1116..86ad14f2 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 03a65c55..fa665a0a 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 3d04a57d..d01eec9b 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 / -- cgit v1.2.3 From 34e7c8652a48b01b9e8ed993ed29606d159e4165 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 12 Jul 2016 12:30:35 -0700 Subject: Version bumps. --- debian/changelog | 7 +++++++ ext/installfiles/mac/ZeroTier One.pkgproj | 2 +- zerotier-one.spec | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 10c524d6..46b2d04e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zerotier-one (1.1.10) unstable; urgency=medium + + * See https://github.com/zerotier/ZeroTierOne for release notes. + * ZeroTier Debian packages no longer depend on http-parser since its ABI is too unstable. + + -- Adam Ierymenko Tue, 12 Jul 2016 12:29:00 -0700 + zerotier-one (1.1.8) unstable; urgency=low * See https://github.com/zerotier/ZeroTierOne for release notes. diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index 863046f7..34198ca0 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -759,7 +759,7 @@ OVERWRITE_PERMISSIONS VERSION - 1.1.8 + 1.1.10 PROJECT_COMMENTS diff --git a/zerotier-one.spec b/zerotier-one.spec index 3b9d2a0c..aba18878 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -1,5 +1,5 @@ Name: zerotier-one -Version: 1.1.8 +Version: 1.1.10 Release: 0.1%{?dist} Summary: ZeroTier One network virtualization service @@ -149,6 +149,9 @@ esac %endif %changelog +* Tue Jul 12 2016 Adam Ierymenko - 1.1.10-0.1 +- see https://github.com/zerotier/ZeroTierOne for release notes + * Fri Jul 08 2016 Adam Ierymenko - 1.1.8-0.1 - see https://github.com/zerotier/ZeroTierOne for release notes -- cgit v1.2.3 From 1a285e534298c498e5e458c30e812b3366134152 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 12 Jul 2016 15:03:06 -0700 Subject: Version bump again. Slack has updated their client twice in one day so its okay. --- debian/changelog | 6 ++++++ ext/installfiles/mac/ZeroTier One.pkgproj | 2 +- version.h | 2 +- zerotier-one.spec | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 46b2d04e..3b33c1e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zerotier-one (1.1.12) unstable; urgency=medium + + * See https://github.com/zerotier/ZeroTierOne for release notes. + + -- Adam Ierymenko Tue, 12 Jul 2016 03:02:22 -0700 + zerotier-one (1.1.10) unstable; urgency=medium * See https://github.com/zerotier/ZeroTierOne for release notes. diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index 34198ca0..acbc3cfb 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -759,7 +759,7 @@ OVERWRITE_PERMISSIONS VERSION - 1.1.10 + 1.1.12 PROJECT_COMMENTS diff --git a/version.h b/version.h index 2facbffc..9ef01d6d 100644 --- a/version.h +++ b/version.h @@ -32,6 +32,6 @@ /** * Revision */ -#define ZEROTIER_ONE_VERSION_REVISION 10 +#define ZEROTIER_ONE_VERSION_REVISION 12 #endif diff --git a/zerotier-one.spec b/zerotier-one.spec index aba18878..36856bd4 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -1,5 +1,5 @@ Name: zerotier-one -Version: 1.1.10 +Version: 1.1.12 Release: 0.1%{?dist} Summary: ZeroTier One network virtualization service -- cgit v1.2.3