diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /net-misc/zerotier | |
parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) |
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'net-misc/zerotier')
-rw-r--r-- | net-misc/zerotier/Manifest | 8 | ||||
-rw-r--r-- | net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch | 14 | ||||
-rw-r--r-- | net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch | 27 | ||||
-rw-r--r-- | net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch | 96 | ||||
-rw-r--r-- | net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch | 11 | ||||
-rw-r--r-- | net-misc/zerotier/metadata.xml | 13 | ||||
-rw-r--r-- | net-misc/zerotier/zerotier-1.4.6.ebuild | 79 |
7 files changed, 239 insertions, 9 deletions
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index 43c1a509e3b0..9c6cbef3cc57 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -1,5 +1,11 @@ +AUX zerotier-1.4.6-add-armv7a-support.patch 419 BLAKE2B 8670511fb18c3833d17b601e692e141281d429f47281d12b420e5bf84c61a0312642be00785284739d68c33c353ff76b76b0651b03de4789cf7112c352c39648 SHA512 e2be80e39ee1a6f554b60c481f11e04c60a30bd8b198142aaeb7479365fee3d3e73ed9365f1ad7795c33781bf83693cc51a86ea5e294c63030fb111872dbad3a +AUX zerotier-1.4.6-add-mk-ctlr-node-target.patch 1080 BLAKE2B 2c8395a8d32096fa83c7cc4d6600c12aeecd6f0881cf0279d4697ed2a764dbc7d84c87ab8c94fb6b0504c6f343a0d9c776c52f6d24e42cb4394a4d1bd9d42f97 SHA512 a72eb4e2f6c97484ff22b5caa2798d3cc45458b9035b33c325a9489f27196e0170a017a9dbb3b22eaa715d3c7b50365de270aaeaadfa46d910d39eb002770c36 +AUX zerotier-1.4.6-fixup-neon-support.patch 2667 BLAKE2B 39feb92294b2221fa61fbfe93c894bad4218528161854f74d5b5e9c301aef86b9f5a84de567d5050463d323a309179b4efb8e95eb09b22424c4ecfcc065a3da6 SHA512 f032b95f485ae264577f4c7f579a9f4e9ab4a82a5c806c6dc9bd37fb4262d60d98088a19b27a545893d1deedbefb7f1ffdeb52ac102d0b3cfbb82c46b3abca9a +AUX zerotier-1.4.6-respect-ldflags.patch 455 BLAKE2B 2add558b3770e35d9318965eee27219366af4660935d2ee1261bc7735cbd77405ec8c8677f95ad31e02a0f81a9b9f1984b89ba2aeff3b919a84adfdebf7518bf SHA512 8b00309912e64a33086173f0c14649115bf82d5ceaf838642dc604e6ae1ec49d883c90ad5fcd93c9291fb7491cdd06b4d609ffc80c512425ee7c9988bb67149f AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701 DIST zerotier-1.2.12.tar.gz 6058902 BLAKE2B 851d0d871fac7f6cdd9feafb375f97181f9155c265f13e44122424bd7adcaff10e3f2c2a4484d2e2ad1f4f2f174fc723681451c1a728c9aa324bdcb02300af57 SHA512 a35029993d9266f3529a9922daa606b0d56a332514545f8cfab2092a4c9db4fc7217223f3bd7dbe59e536de325ee9b4f0226d673c0f0ec5859cf2937e8a4a2d4 +DIST zerotier-1.4.6.tar.gz 13055818 BLAKE2B 46003d9c3ad09e30dbefaa441422ed4570bdbdfb99f2f24fb82246f9e970501d38d96c19dc9771a1d0d30bc49bd8be2b79ebd2e5c8bd85e88b738b29f0a1dcc3 SHA512 72f00602f67190d03ac0c8caa6b79e7f346b10745bdf772c68f77a3a940cdd718d05ec642bc862a6235aab9bd3bfefb0c57571f358ae55f38761f45500f0f189 EBUILD zerotier-1.2.12.ebuild 914 BLAKE2B b321d596dcc72e2495c2a324b79a5d9a630f1e280a0ed40b7876dc2af359c166fb9024a00f49db1b19ca13a5dea2b5c69bacaf4254729c95e0fc58c8f15f6a46 SHA512 a102dc5a09237e6a98e4b8bf51c3397d4fc9ea698bdc6847c5efe5d31f0333f9281c3700abc6b477ef95e9cda68ede2a080cada13b1b2a6316ff87a2238d6d53 -MISC metadata.xml 550 BLAKE2B b2337f927bef36ec75e2329459f9f654e3e786ec8d4dfa2016e42c5c857db77a539df1e2e6398483995e72d2a71f9eee3bf81df3e26501354c8bdd8ac5243222 SHA512 2c76feb941ce99247828da120bf10b4c9152065a361230b06c2717716fe0eb8798fa59eb737dff449d9c2d8f7f99025576e42a1592ac7183163bd4d8e7e9ba8a +EBUILD zerotier-1.4.6.ebuild 1802 BLAKE2B 3fa9f53c3568d53c528a20610d58400e3d51ec02d6b6c3781350fddcd133dc8c30aae6f74d4b6a43e06708bc3b71281b60a1c0958b2e1390d0caeb62d5c04d23 SHA512 712437b743c70d5941f72206c0ab9025b85809453ddf5c33e8d18ace4a9771f3c5c861b491758cc2f2b8ee455a50738f7d0b16ac3d87784998ba966f8d56fbb1 +MISC metadata.xml 482 BLAKE2B 8aaebdfd4d9a6454f3a426fb472a12e50f64e7cc356795b10175f9a3e3bfc5a181f503d609bb431b9619e73675ffa6e24059452696cdbe6f2d4aeff5f3a8cd11 SHA512 54bdb668f32bc05faee9dca6f29c3648127abe60c5338a4f1cdb71b3812e33314f1e6b691801caeb3fc3e5dfaa8ccc89b9f73469eb964321fc9f983ec669dadc diff --git a/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch b/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch new file mode 100644 index 000000000000..802b1a873f58 --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch @@ -0,0 +1,14 @@ +--- a/make-linux.mk 2019-09-05 11:02:16.000000000 -0700 ++++ b/make-linux.mk 2019-09-27 21:01:21.000000000 -0700 +@@ -195,6 +195,11 @@ + override DEFS+=-DZT_NO_TYPE_PUNNING + ZT_USE_ARM32_NEON_ASM_CRYPTO=1 + endif ++ifeq ($(CC_MACH),armv7a) ++ ZT_ARCHITECTURE=3 ++ override DEFS+=-DZT_NO_TYPE_PUNNING ++ ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++endif + ifeq ($(CC_MACH),armv7l) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING diff --git a/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch b/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch new file mode 100644 index 000000000000..0d19099865b7 --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch @@ -0,0 +1,27 @@ +diff --git a/make-linux.mk b/make-linux.mk +index 9fd4f7b9..a7eb7f6a 100644 +--- a/make-linux.mk ++++ b/make-linux.mk +@@ -45,6 +45,12 @@ endif + # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems. + ONE_OBJS+=ext/http-parser/http_parser.o + ++ifeq ($(ZT_CONTROLLER),1) ++ #LIBS+=-lpq -lrabbitmq ++ #DEFS+=-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER ++ override DEFS+=-DZT_CONTROLLER ++endif ++ + # Build with address sanitization library for advanced debugging (clang) + ifeq ($(ZT_SANITIZE),1) + DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1 +@@ -331,6 +337,9 @@ official: FORCE + docker: FORCE + docker build -f ext/installfiles/linux/zerotier-containerized/Dockerfile -t zerotier-containerized . + ++controller-node: FORCE ++ make DEFS+="-DZT_CONTROLLER" one ++ + central-controller: FORCE + make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq -Lext/librabbitmq/centos_x64/lib/ -lrabbitmq" CXXFLAGS="-I/usr/pgsql-10/include -I./ext/librabbitmq/centos_x64/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one + diff --git a/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch b/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch new file mode 100644 index 000000000000..a6ca7f7ca382 --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch @@ -0,0 +1,96 @@ +--- a/make-linux.mk 2019-09-27 21:35:39.000000000 -0700 ++++ b/make-linux.mk 2019-09-27 21:36:01.000000000 -0700 +@@ -118,6 +118,7 @@ + # Determine system build architecture from compiler target + CC_MACH=$(shell $(CC) -dumpmachine | cut -d '-' -f 1) + ZT_ARCHITECTURE=999 ++ZT_DISABLE_NEON?= + ifeq ($(CC_MACH),x86_64) + ZT_ARCHITECTURE=2 + ZT_USE_X64_ASM_SALSA=1 +@@ -158,57 +159,57 @@ + ifeq ($(CC_MACH),arm) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),armel) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=1 + endif + ifeq ($(CC_MACH),armhf) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),armv6) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=1 + endif + ifeq ($(CC_MACH),armv6l) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=1 + endif + ifeq ($(CC_MACH),armv6zk) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=1 + endif + ifeq ($(CC_MACH),armv6kz) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=1 + endif + ifeq ($(CC_MACH),armv7) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),armv7a) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),armv7l) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),armv7hl) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),arm64) + ZT_ARCHITECTURE=4 +@@ -268,10 +269,13 @@ + override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm + override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm + ZT_USE_ARM32_NEON_ASM_CRYPTO=0 +- else +- override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions +- override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions ++ endif ++ ifeq ($(ZT_DISABLE_NEON),1) ++ override CFLAGS+=-mno-unaligned-access -marm -fexceptions ++ override CXXFLAGS+=-mno-unaligned-access -marm -fexceptions + ZT_USE_ARM32_NEON_ASM_CRYPTO=0 ++ else ++ ZT_USE_ARM32_NEON_ASM_CRYPTO=1 + endif + endif + diff --git a/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch new file mode 100644 index 000000000000..46e24fd7a928 --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch @@ -0,0 +1,11 @@ +--- a/make-linux.mk 2019-09-05 11:02:16.000000000 -0700 ++++ b/make-linux.mk 2019-09-27 21:01:21.000000000 -0700 +@@ -77,7 +77,7 @@ + override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) + CXXFLAGS?=-O3 -fstack-protector -fPIE + override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS) +- LDFLAGS=-pie -Wl,-z,relro,-z,now ++ LDFLAGS?=-pie -Wl,-z,relro,-z,now + STRIP?=strip + STRIP+=--strip-all + endif diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml index 9a0bb99004b4..e422a4abe39a 100644 --- a/net-misc/zerotier/metadata.xml +++ b/net-misc/zerotier/metadata.xml @@ -1,16 +1,13 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>ramage.lucas@protonmail.com</email> - <name>Lucas Ramage</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <changelog>https://github.com/zerotier/ZeroTierOne/raw/master/RELEASE-NOTES.md</changelog> <remote-id type="github">zerotier/ZeroTierOne</remote-id> </upstream> +<use> + <flag name="clang">Use Clang compiler instead of GCC</flag> + <flag name="neon">Enable ARM32 neon-salsa2012-asm code</flag> +</use> </pkgmetadata> diff --git a/net-misc/zerotier/zerotier-1.4.6.ebuild b/net-misc/zerotier/zerotier-1.4.6.ebuild new file mode 100644 index 000000000000..49c7f7ed5ff9 --- /dev/null +++ b/net-misc/zerotier/zerotier-1.4.6.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic llvm systemd toolchain-funcs + +HOMEPAGE="https://www.zerotier.com/" +DESCRIPTION="A software-based managed Ethernet switch for planet Earth" +SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="clang neon" + +S="${WORKDIR}/ZeroTierOne-${PV}" + +RDEPEND=" + dev-libs/json-glib + net-libs/libnatpmp + net-libs/miniupnpc:= + clang? ( >=sys-devel/clang-6:* )" + +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${P}-respect-ldflags.patch" + "${FILESDIR}/${P}-add-armv7a-support.patch" + "${FILESDIR}/${P}-fixup-neon-support.patch" ) + +DOCS=( README.md AUTHORS.md ) + +LLVM_MAX_SLOT=9 + +llvm_check_deps() { + if use clang ; then + if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then + ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." + return 1 + fi + + if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then + ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." + return 1 + fi + + einfo "Will use LLVM slot ${LLVM_SLOT}!" + fi +} + +pkg_setup() { + if use clang && ! tc-is-clang ; then + export CC=${CHOST}-clang + export CXX=${CHOST}-clang++ + else + tc-export CXX CC + fi + use neon || export ZT_DISABLE_NEON=1 +} + +src_compile() { + append-ldflags -Wl,-z,noexecstack + emake CXX="${CXX}" STRIP=: one +} + +src_test() { + emake selftest + ./zerotier-selftest || die +} + +src_install() { + default + # remove pre-zipped man pages + rm "${ED}"/usr/share/man/{man1,man8}/* || die + + newinitd "${FILESDIR}/${PN}".init "${PN}" + systemd_dounit "${FILESDIR}/${PN}".service + doman doc/zerotier-{cli.1,idtool.1,one.8} +} |