net/rabbiteer: fix openssl 1.1.1 breakage

Upstream uses a library that uses a library that provides OpenSSL
bindings, in a way that is unlikely to be addressed. Purge the SSL
patches until such time as a replacement is available.

Approved by:	jrm (mentor)
MFH:		2018Q4
Differential Revision:	https://reviews.freebsd.org/D17939

4 files changed, 3 insertions, 355 deletions

diff --git a/net/rabbiteer/Makefile b/net/rabbiteer/Makefile
index ec8acfc68f18..905842e09e57 100644
--- a/net/rabbiteer/Makefile
+++ b/net/rabbiteer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rabbiteer
 DISTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	dch@FreeBSD.org
@@ -11,12 +11,7 @@ COMMENT=	AMQP & RabbitMQ command-line tool
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE-MIT
 
-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	https://github.com/Antti/rust-amqp/issues/43
-BROKEN_FreeBSD_12=	${BROKEN_SSL_REASON_openssl111}
-BROKEN_FreeBSD_13=	${BROKEN_SSL_REASON_openssl111}
-
-USES=		cargo ssl
+USES=		cargo
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	algesten
@@ -31,7 +26,6 @@ CARGO_CRATES=	aho-corasick-0.5.3 \
 		backtrace-0.3.9 \
 		backtrace-sys-0.1.24 \
 		bit-vec-0.4.4 \
-		bitflags-0.7.1 \
 		bitflags-1.0.4 \
 		byteorder-0.5.3 \
 		cc-1.0.24 \
@@ -44,38 +38,25 @@ CARGO_CRATES=	aho-corasick-0.5.3 \
 		error-chain-0.10.0 \
 		fuchsia-zircon-0.3.3 \
 		fuchsia-zircon-sys-0.3.3 \
-		gcc-0.3.55 \
-		gdi32-sys-0.2.0 \
 		idna-0.1.5 \
 		kernel32-sys-0.2.2 \
-		lazy_static-0.2.11 \
 		libc-0.2.43 \
-		libressl-pnacl-sys-2.1.6 \
 		log-0.3.9 \
 		log-0.4.5 \
 		matches-0.1.8 \
 		memchr-0.1.11 \
 		num-traits-0.1.43 \
 		num-traits-0.2.5 \
-		openssl-0.7.14 \
-		openssl-sys-0.7.17 \
-		openssl-sys-extras-0.7.14 \
 		percent-encoding-1.0.1 \
-		pkg-config-0.3.14 \
-		pnacl-build-helper-1.4.11 \
-		rand-0.4.3 \
 		rand-0.5.5 \
 		rand_core-0.2.1 \
 		redox_syscall-0.1.40 \
 		redox_termios-0.1.1 \
 		regex-0.1.80 \
 		regex-syntax-0.3.9 \
-		remove_dir_all-0.5.1 \
 		rustc-demangle-0.1.9 \
 		rustc-serialize-0.3.24 \
-		same-file-0.1.3 \
 		strsim-0.7.0 \
-		tempdir-0.3.7 \
 		termion-1.5.1 \
 		textwrap-0.10.0 \
 		thread-id-2.0.0 \
@@ -84,10 +65,8 @@ CARGO_CRATES=	aho-corasick-0.5.3 \
 		unicode-normalization-0.1.7 \
 		unicode-width-0.1.5 \
 		url-1.7.1 \
-		user32-sys-0.2.0 \
 		utf8-ranges-0.1.3 \
 		vec_map-0.8.1 \
-		walkdir-1.0.7 \
 		winapi-0.2.8 \
 		winapi-0.3.5 \
 		winapi-build-0.1.1 \
diff --git a/net/rabbiteer/distinfo b/net/rabbiteer/distinfo
index b5aefe39eff2..d7b079cafebb 100644
--- a/net/rabbiteer/distinfo
+++ b/net/rabbiteer/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1539546799
+TIMESTAMP = 1541889561
 SHA256 (rust/crates/aho-corasick-0.5.3.tar.gz) = ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66
 SIZE (rust/crates/aho-corasick-0.5.3.tar.gz) = 252052
 SHA256 (rust/crates/amq-proto-0.1.0.tar.gz) = 66d79639b71f74c7006c12683cc2ff221615a51a741688fa7798ccd080dc54d3
@@ -15,8 +15,6 @@ SHA256 (rust/crates/backtrace-sys-0.1.24.tar.gz) = c66d56ac8dabd07f6aacdaf633f4b
 SIZE (rust/crates/backtrace-sys-0.1.24.tar.gz) = 522332
 SHA256 (rust/crates/bit-vec-0.4.4.tar.gz) = 02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f
 SIZE (rust/crates/bit-vec-0.4.4.tar.gz) = 17895
-SHA256 (rust/crates/bitflags-0.7.1.tar.gz) = ab1c7dc97f39523ffa63f3096291612e630cf3ed75aa6b9fad436bac4c700274
-SIZE (rust/crates/bitflags-0.7.1.tar.gz) = 11121
 SHA256 (rust/crates/bitflags-1.0.4.tar.gz) = 228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12
 SIZE (rust/crates/bitflags-1.0.4.tar.gz) = 15282
 SHA256 (rust/crates/byteorder-0.5.3.tar.gz) = 0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855
@@ -41,20 +39,12 @@ SHA256 (rust/crates/fuchsia-zircon-0.3.3.tar.gz) = 2e9763c69ebaae630ba35f74888db
 SIZE (rust/crates/fuchsia-zircon-0.3.3.tar.gz) = 22565
 SHA256 (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7
 SIZE (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191
-SHA256 (rust/crates/gcc-0.3.55.tar.gz) = 8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2
-SIZE (rust/crates/gcc-0.3.55.tar.gz) = 37262
-SHA256 (rust/crates/gdi32-sys-0.2.0.tar.gz) = 0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518
-SIZE (rust/crates/gdi32-sys-0.2.0.tar.gz) = 7643
 SHA256 (rust/crates/idna-0.1.5.tar.gz) = 38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e
 SIZE (rust/crates/idna-0.1.5.tar.gz) = 258735
 SHA256 (rust/crates/kernel32-sys-0.2.2.tar.gz) = 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d
 SIZE (rust/crates/kernel32-sys-0.2.2.tar.gz) = 24537
-SHA256 (rust/crates/lazy_static-0.2.11.tar.gz) = 76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73
-SIZE (rust/crates/lazy_static-0.2.11.tar.gz) = 12361
 SHA256 (rust/crates/libc-0.2.43.tar.gz) = 76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d
 SIZE (rust/crates/libc-0.2.43.tar.gz) = 353810
-SHA256 (rust/crates/libressl-pnacl-sys-2.1.6.tar.gz) = cbc058951ab6a3ef35ca16462d7642c4867e6403520811f28537a4e2f2db3e71
-SIZE (rust/crates/libressl-pnacl-sys-2.1.6.tar.gz) = 2697179
 SHA256 (rust/crates/log-0.3.9.tar.gz) = e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b
 SIZE (rust/crates/log-0.3.9.tar.gz) = 16686
 SHA256 (rust/crates/log-0.4.5.tar.gz) = d4fcce5fa49cc693c312001daf1d13411c4a5283796bac1084299ea3e567113f
@@ -67,20 +57,8 @@ SHA256 (rust/crates/num-traits-0.1.43.tar.gz) = 92e5113e9fd4cc14ded8e499429f396a
 SIZE (rust/crates/num-traits-0.1.43.tar.gz) = 7659
 SHA256 (rust/crates/num-traits-0.2.5.tar.gz) = 630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe
 SIZE (rust/crates/num-traits-0.2.5.tar.gz) = 39136
-SHA256 (rust/crates/openssl-0.7.14.tar.gz) = c4117b6244aac42ed0150a6019b4d953d28247c5dd6ae6f46ae469b5f2318733
-SIZE (rust/crates/openssl-0.7.14.tar.gz) = 63824
-SHA256 (rust/crates/openssl-sys-0.7.17.tar.gz) = 89c47ee94c352eea9ddaf8e364be7f978a3bb6d66d73176572484238dd5a5c3f
-SIZE (rust/crates/openssl-sys-0.7.17.tar.gz) = 12097
-SHA256 (rust/crates/openssl-sys-extras-0.7.14.tar.gz) = 11c5e1dba7d3d03d80f045bf0d60111dc69213b67651e7c889527a3badabb9fa
-SIZE (rust/crates/openssl-sys-extras-0.7.14.tar.gz) = 3871
 SHA256 (rust/crates/percent-encoding-1.0.1.tar.gz) = 31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831
 SIZE (rust/crates/percent-encoding-1.0.1.tar.gz) = 10057
-SHA256 (rust/crates/pkg-config-0.3.14.tar.gz) = 676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c
-SIZE (rust/crates/pkg-config-0.3.14.tar.gz) = 13565
-SHA256 (rust/crates/pnacl-build-helper-1.4.11.tar.gz) = dfbe13ee77c06fb633d71c72438bd983286bb3521863a753ade8e951c7efb090
-SIZE (rust/crates/pnacl-build-helper-1.4.11.tar.gz) = 5447
-SHA256 (rust/crates/rand-0.4.3.tar.gz) = 8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd
-SIZE (rust/crates/rand-0.4.3.tar.gz) = 76094
 SHA256 (rust/crates/rand-0.5.5.tar.gz) = e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c
 SIZE (rust/crates/rand-0.5.5.tar.gz) = 137359
 SHA256 (rust/crates/rand_core-0.2.1.tar.gz) = edecf0f94da5551fc9b492093e30b041a891657db7940ee221f9d2f66e82eef2
@@ -93,18 +71,12 @@ SHA256 (rust/crates/regex-0.1.80.tar.gz) = 4fd4ace6a8cf7860714a2c2280d6c1f7e6a41
 SIZE (rust/crates/regex-0.1.80.tar.gz) = 185806
 SHA256 (rust/crates/regex-syntax-0.3.9.tar.gz) = f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957
 SIZE (rust/crates/regex-syntax-0.3.9.tar.gz) = 117427
-SHA256 (rust/crates/remove_dir_all-0.5.1.tar.gz) = 3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5
-SIZE (rust/crates/remove_dir_all-0.5.1.tar.gz) = 8726
 SHA256 (rust/crates/rustc-demangle-0.1.9.tar.gz) = bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395
 SIZE (rust/crates/rustc-demangle-0.1.9.tar.gz) = 11463
 SHA256 (rust/crates/rustc-serialize-0.3.24.tar.gz) = dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda
 SIZE (rust/crates/rustc-serialize-0.3.24.tar.gz) = 45926
-SHA256 (rust/crates/same-file-0.1.3.tar.gz) = d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7
-SIZE (rust/crates/same-file-0.1.3.tar.gz) = 7078
 SHA256 (rust/crates/strsim-0.7.0.tar.gz) = bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550
 SIZE (rust/crates/strsim-0.7.0.tar.gz) = 8435
-SHA256 (rust/crates/tempdir-0.3.7.tar.gz) = 15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8
-SIZE (rust/crates/tempdir-0.3.7.tar.gz) = 11468
 SHA256 (rust/crates/termion-1.5.1.tar.gz) = 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096
 SIZE (rust/crates/termion-1.5.1.tar.gz) = 20659
 SHA256 (rust/crates/textwrap-0.10.0.tar.gz) = 307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6
@@ -121,14 +93,10 @@ SHA256 (rust/crates/unicode-width-0.1.5.tar.gz) = 882386231c45df4700b275c7ff55b6
 SIZE (rust/crates/unicode-width-0.1.5.tar.gz) = 15761
 SHA256 (rust/crates/url-1.7.1.tar.gz) = 2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6
 SIZE (rust/crates/url-1.7.1.tar.gz) = 68266
-SHA256 (rust/crates/user32-sys-0.2.0.tar.gz) = 4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47
-SIZE (rust/crates/user32-sys-0.2.0.tar.gz) = 10624
 SHA256 (rust/crates/utf8-ranges-0.1.3.tar.gz) = a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f
 SIZE (rust/crates/utf8-ranges-0.1.3.tar.gz) = 8422
 SHA256 (rust/crates/vec_map-0.8.1.tar.gz) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a
 SIZE (rust/crates/vec_map-0.8.1.tar.gz) = 14959
-SHA256 (rust/crates/walkdir-1.0.7.tar.gz) = bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff
-SIZE (rust/crates/walkdir-1.0.7.tar.gz) = 17883
 SHA256 (rust/crates/winapi-0.2.8.tar.gz) = 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a
 SIZE (rust/crates/winapi-0.2.8.tar.gz) = 455145
 SHA256 (rust/crates/winapi-0.3.5.tar.gz) = 773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd
diff --git a/net/rabbiteer/files/patch-Cargo.lock b/net/rabbiteer/files/patch-Cargo.lock
deleted file mode 100644
index 23721d4e95d5..000000000000
--- a/net/rabbiteer/files/patch-Cargo.lock
+++ /dev/null
@@ -1,282 +0,0 @@
---- Cargo.lock.orig	2018-10-14 19:59:45 UTC
-+++ Cargo.lock
-@@ -27,6 +27,7 @@ dependencies = [
-  "amq-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
-  "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -76,6 +77,11 @@ source = "registry+https://github.com/rust-lang/crates
- 
- [[package]]
- name = "bitflags"
-+version = "0.7.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "bitflags"
- version = "1.0.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
-@@ -164,6 +170,20 @@ version = "0.3.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
-+name = "gcc"
-+version = "0.3.55"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "gdi32-sys"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
- name = "idna"
- version = "0.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -183,11 +203,24 @@ dependencies = [
- ]
- 
- [[package]]
-+name = "lazy_static"
-+version = "0.2.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
- name = "libc"
- version = "0.2.43"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
-+name = "libressl-pnacl-sys"
-+version = "2.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "pnacl-build-helper 1.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
- name = "log"
- version = "0.3.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -230,11 +263,60 @@ version = "0.2.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
-+name = "openssl"
-+version = "0.7.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys-extras 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "openssl-sys"
-+version = "0.7.17"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "openssl-sys-extras"
-+version = "0.7.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
- name = "percent-encoding"
- version = "1.0.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
-+name = "pkg-config"
-+version = "0.3.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "pnacl-build-helper"
-+version = "1.4.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
- name = "rabbiteer"
- version = "1.4.1"
- dependencies = [
-@@ -248,6 +330,16 @@ dependencies = [
- 
- [[package]]
- name = "rand"
-+version = "0.4.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand"
- version = "0.5.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-@@ -294,6 +386,14 @@ version = "0.3.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
-+name = "remove_dir_all"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
- name = "rustc-demangle"
- version = "0.1.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -304,11 +404,29 @@ version = "0.3.24"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
-+name = "same-file"
-+version = "0.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
- name = "strsim"
- version = "0.7.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
-+name = "tempdir"
-+version = "0.3.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
- name = "termion"
- version = "1.5.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -372,6 +490,15 @@ dependencies = [
- ]
- 
- [[package]]
-+name = "user32-sys"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
- name = "utf8-ranges"
- version = "0.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -382,6 +509,16 @@ version = "0.8.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
-+name = "walkdir"
-+version = "1.0.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
- name = "winapi"
- version = "0.2.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -419,6 +556,7 @@ source = "registry+https://github.com/rust-lang/crates
- "checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
- "checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
- "checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
-+"checksum bitflags 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab1c7dc97f39523ffa63f3096291612e630cf3ed75aa6b9fad436bac4c700274"
- "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
- "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
- "checksum cc 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "70f2a88c2e69ceee91c209d8ef25b81fc1a65f42c7f14dfd59d1fed189e514d1"
-@@ -431,25 +569,38 @@ source = "registry+https://github.com/rust-lang/crates
- "checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
- "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
- "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-+"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-+"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
- "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
- "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
- "checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
-+"checksum libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "cbc058951ab6a3ef35ca16462d7642c4867e6403520811f28537a4e2f2db3e71"
- "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
- "checksum log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fcce5fa49cc693c312001daf1d13411c4a5283796bac1084299ea3e567113f"
- "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
- "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
- "checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
- "checksum num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe"
-+"checksum openssl 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)" = "c4117b6244aac42ed0150a6019b4d953d28247c5dd6ae6f46ae469b5f2318733"
-+"checksum openssl-sys 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "89c47ee94c352eea9ddaf8e364be7f978a3bb6d66d73176572484238dd5a5c3f"
-+"checksum openssl-sys-extras 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)" = "11c5e1dba7d3d03d80f045bf0d60111dc69213b67651e7c889527a3badabb9fa"
- "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-+"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
-+"checksum pnacl-build-helper 1.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dfbe13ee77c06fb633d71c72438bd983286bb3521863a753ade8e951c7efb090"
-+"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
- "checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
- "checksum rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "edecf0f94da5551fc9b492093e30b041a891657db7940ee221f9d2f66e82eef2"
- "checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1"
- "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
- "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
- "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
-+"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
- "checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
- "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-+"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
- "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
-+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
- "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
- "checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
- "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
-@@ -458,8 +609,10 @@ source = "registry+https://github.com/rust-lang/crates
- "checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
- "checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
- "checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6"
-+"checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47"
- "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
- "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-+"checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff"
- "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
- "checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd"
- "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
diff --git a/net/rabbiteer/files/patch-Cargo.toml b/net/rabbiteer/files/patch-Cargo.toml
deleted file mode 100644
index 1cf73bb57c27..000000000000
--- a/net/rabbiteer/files/patch-Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
---- Cargo.toml.orig	2018-10-14 19:59:53 UTC
-+++ Cargo.toml
-@@ -1,6 +1,6 @@
- [package]
- name = "rabbiteer"
--version = "1.4.1"
-+version = "1.4.1"
- authors = ["Martin Algesten <martin@algesten.se>"]
- description = "AMQP/RabbitMQ input/output CLI tool"
- repository = "https://github.com/algesten/rabbiteer-rs"
-@@ -20,4 +20,5 @@ url = "1"
- #branch = "rabbiteer"
- #path = "/Users/martin/dev/_dist/rust-amqp"
- version = "0.1"
--default-features = false
-+# commented out so we have TLS-enabled AMQP via OpenSSL
-+# default-features = false