svn commit: r528221 - in head/net/findomain: . files

[Tobias Kortkamp]

Author: tobik
Date: Wed Mar 11 08:59:40 2020
New Revision: 528221
URL: https://svnweb.freebsd.org/changeset/ports/528221

Log:
  net/findomain: Unbreak build on i386 and use system OpenSSL
  
  Due to a Cargo bug(?) the "vendored" feature seems to leak even
  outside of targeting arm-unknown-linux-gnu-eabhif or
  aarch64-unknown-linux-gnu.  Remove those lines from Cargo.toml to
  make sure we are building with the system OpenSSL instead of the
  bundled one.
  
  openssl-src build on i386 was failing because for some reason it
  is hardcoded to use "gmake" only when the host is x86_64-unknown-freebsd.

Added:
  head/net/findomain/files/
  head/net/findomain/files/patch-Cargo.toml   (contents, props changed)
Modified:
  head/net/findomain/Makefile
  head/net/findomain/distinfo

Modified: head/net/findomain/Makefile
==============================================================================
--- head/net/findomain/Makefile	Wed Mar 11 08:27:30 2020	(r528220)
+++ head/net/findomain/Makefile	Wed Mar 11 08:59:40 2020	(r528221)
@@ -2,6 +2,7 @@
 
 PORTNAME=	findomain
 DISTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	net security
 
 MAINTAINER=	vulcan at wired.sh
@@ -10,11 +11,9 @@ COMMENT=	Cross-platform subdomain enumerator
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cargo gmake perl5 ssl:build
-
+USES=		cargo ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	Edu4rdSHL
-USE_PERL5=	build
 
 CARGO_CRATES=	ansi_term-0.11.0 \
 		anyhow-1.0.26 \
@@ -110,7 +109,6 @@ CARGO_CRATES=	ansi_term-0.11.0 \
 		opaque-debug-0.2.3 \
 		openssl-0.10.28 \
 		openssl-probe-0.1.2 \
-		openssl-src-111.6.1+1.1.1d \
 		openssl-sys-0.9.54 \
 		parking_lot-0.10.0 \
 		parking_lot_core-0.7.0 \

Modified: head/net/findomain/distinfo
==============================================================================
--- head/net/findomain/distinfo	Wed Mar 11 08:27:30 2020	(r528220)
+++ head/net/findomain/distinfo	Wed Mar 11 08:59:40 2020	(r528221)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1583094197
+TIMESTAMP = 1583911344
 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
 SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087
 SHA256 (rust/crates/anyhow-1.0.26.tar.gz) = 7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c
@@ -187,8 +187,6 @@ SHA256 (rust/crates/openssl-0.10.28.tar.gz) = 97329374
 SIZE (rust/crates/openssl-0.10.28.tar.gz) = 189106
 SHA256 (rust/crates/openssl-probe-0.1.2.tar.gz) = 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de
 SIZE (rust/crates/openssl-probe-0.1.2.tar.gz) = 6427
-SHA256 (rust/crates/openssl-src-111.6.1+1.1.1d.tar.gz) = c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005
-SIZE (rust/crates/openssl-src-111.6.1+1.1.1d.tar.gz) = 5076802
 SHA256 (rust/crates/openssl-sys-0.9.54.tar.gz) = 1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986
 SIZE (rust/crates/openssl-sys-0.9.54.tar.gz) = 45751
 SHA256 (rust/crates/parking_lot-0.10.0.tar.gz) = 92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc

Added: head/net/findomain/files/patch-Cargo.toml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/findomain/files/patch-Cargo.toml	Wed Mar 11 08:59:40 2020	(r528221)
@@ -0,0 +1,18 @@
+Cargo bug?  "vendored" feature seems to leak even outside of targeting
+arm-unknown-linux-gnu-eabhif or aarch64-unknown-linux-gnu.
+
+This makes sure we are building with the system OpenSSL instead of
+the bundled one.
+
+--- Cargo.toml.orig	2020-03-01 12:14:21 UTC
++++ Cargo.toml
+@@ -26,9 +26,3 @@ postgres = "0.17.1"
+ failure = "0.1.6"
+ rayon = "1.3.0"
+ semver = "0.9.0"
+-
+-[target.arm-unknown-linux-gnueabihf.dependencies]
+-openssl = { version = "0.10.28", features = ["vendored"] }
+-
+-[target.aarch64-unknown-linux-gnu.dependencies]
+-openssl = { version = "0.10.28", features = ["vendored"] }