From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- net-misc/zerotier/Manifest | 1 - .../zerotier-1.4.6-add-mk-ctlr-node-target.patch | 27 ---------------------- 2 files changed, 28 deletions(-) delete mode 100644 net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch (limited to 'net-misc/zerotier') diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index 9c6cbef3cc57..fc4f54546efc 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -1,5 +1,4 @@ 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 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 deleted file mode 100644 index 0d19099865b7..000000000000 --- a/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - -- cgit v1.2.3