summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/cargo-audit/cargo-audit-0.14.1.ebuild5
-rw-r--r--dev-util/cargo-audit/files/0.13.1-libressl.patch35
-rw-r--r--dev-util/cargo-audit/metadata.xml8
-rw-r--r--dev-util/cargo-c/cargo-c-0.6.2.ebuild6
-rw-r--r--dev-util/cargo-c/cargo-c-0.7.2.ebuild4
-rw-r--r--dev-util/cargo-c/cargo-c-0.8.0.ebuild4
-rw-r--r--dev-util/oprofile/oprofile-1.4.0.ebuild4
-rw-r--r--dev-util/ostree/ostree-2020.7.ebuild7
-rw-r--r--dev-util/ostree/ostree-2020.8.ebuild5
-rw-r--r--dev-util/sysdig/sysdig-0.27.0.ebuild7
-rw-r--r--dev-util/sysdig/sysdig-0.27.1-r100.ebuild7
-rw-r--r--dev-util/sysdig/sysdig-0.27.1.ebuild7
12 files changed, 64 insertions, 35 deletions
diff --git a/dev-util/cargo-audit/cargo-audit-0.14.1.ebuild b/dev-util/cargo-audit/cargo-audit-0.14.1.ebuild
index 1b829893e7c4..241c049b3e5c 100644
--- a/dev-util/cargo-audit/cargo-audit-0.14.1.ebuild
+++ b/dev-util/cargo-audit/cargo-audit-0.14.1.ebuild
@@ -241,10 +241,11 @@ SRC_URI="https://github.com/RustSec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT MPL-2.0 Unlicense"
SLOT="0"
KEYWORDS="~amd64 ~ppc64"
-IUSE="fix"
+IUSE="fix libressl"
RDEPEND="
- dev-libs/openssl:0=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
dev-libs/libgit2:=
"
DEPEND="${RDEPEND}"
diff --git a/dev-util/cargo-audit/files/0.13.1-libressl.patch b/dev-util/cargo-audit/files/0.13.1-libressl.patch
new file mode 100644
index 000000000000..84762ad45b15
--- /dev/null
+++ b/dev-util/cargo-audit/files/0.13.1-libressl.patch
@@ -0,0 +1,35 @@
+From 0493f57a9878fd4d92fc419358173fd31b95bda8 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 11 Oct 2020 22:09:39 -0700
+Subject: [PATCH] Support LibreSSL 3.2.x
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ vendor/openssl-sys/build/main.rs | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs
+index 49f26d2..2de8ea5 100644
+--- a/vendor/openssl-sys/build/main.rs
++++ b/vendor/openssl-sys/build/main.rs
+@@ -220,7 +220,7 @@ See rust-openssl README for more information:
+ (3, 0, _) => ('3', '0', 'x'),
+ (3, 1, 0) => ('3', '1', '0'),
+ (3, 1, _) => ('3', '1', 'x'),
+- (3, 2, 0) => ('3', '2', '0'),
++ (3, 2, _) => ('3', '2', 'x'),
+ _ => version_error(),
+ };
+
+@@ -261,7 +261,7 @@ fn version_error() -> ! {
+ "
+
+ This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
+-through 3.2.0, but a different version of OpenSSL was found. The build is now aborting
++through 3.2.x, but a different version of OpenSSL was found. The build is now aborting
+ due to this version mismatch.
+
+ "
+--
+2.28.0
+
diff --git a/dev-util/cargo-audit/metadata.xml b/dev-util/cargo-audit/metadata.xml
index 791f71bc28ea..f4d2bdc11131 100644
--- a/dev-util/cargo-audit/metadata.xml
+++ b/dev-util/cargo-audit/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>dev@liguros.net</email>
+ <name>Development</name>
+ </maintainer>
<maintainer type="person">
<email>gyakovlev@gentoo.org</email>
<name>Georgy Yakovlev</name>
@@ -15,5 +19,5 @@
<use>
<flag name="fix">Add support for 'fix' subcommand (experimental)</flag>
</use>
- <origin>gentoo-staging</origin>
-</pkgmetadata> \ No newline at end of file
+ <origin>ports</origin>
+</pkgmetadata>
diff --git a/dev-util/cargo-c/cargo-c-0.6.2.ebuild b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
index 9407e488e670..f189c46f62a1 100644
--- a/dev-util/cargo-c/cargo-c-0.6.2.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Auto-Generated by cargo-ebuild 0.3.0
@@ -154,12 +154,10 @@ RESTRICT="mirror"
LICENSE="Apache-2.0 MIT"
SLOT="0"
KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="libressl"
DEPEND=""
RDEPEND="sys-libs/zlib
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
net-libs/libssh2
net-misc/curl[ssl]
"
diff --git a/dev-util/cargo-c/cargo-c-0.7.2.ebuild b/dev-util/cargo-c/cargo-c-0.7.2.ebuild
index 7d804f9a64e2..58cf5ad39816 100644
--- a/dev-util/cargo-c/cargo-c-0.7.2.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.7.2.ebuild
@@ -157,12 +157,10 @@ RESTRICT="mirror"
LICENSE="Apache-2.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="libressl"
DEPEND=""
RDEPEND="sys-libs/zlib
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
net-libs/libssh2
net-misc/curl[ssl]
"
diff --git a/dev-util/cargo-c/cargo-c-0.8.0.ebuild b/dev-util/cargo-c/cargo-c-0.8.0.ebuild
index 3839844573b8..568e8eacff0d 100644
--- a/dev-util/cargo-c/cargo-c-0.8.0.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.8.0.ebuild
@@ -157,12 +157,10 @@ RESTRICT="mirror"
LICENSE="Apache-2.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="libressl"
DEPEND=""
RDEPEND="sys-libs/zlib
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
net-libs/libssh2
net-misc/curl[ssl]
"
diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild b/dev-util/oprofile/oprofile-1.4.0.ebuild
index d2e970436e6d..ffc03dda79cd 100644
--- a/dev-util/oprofile/oprofile-1.4.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ IUSE="apidoc java pch static-libs"
BDEPEND="
apidoc? ( app-doc/doxygen[dot] )
- java? ( >=virtual/jdk-1.5:= )
+ java? ( >=virtual/jdk-1.8:= )
"
CDEPEND="
>=dev-libs/popt-1.7-r1
diff --git a/dev-util/ostree/ostree-2020.7.ebuild b/dev-util/ostree/ostree-2020.7.ebuild
index 65675eb0f6bb..8d249133593a 100644
--- a/dev-util/ostree/ostree-2020.7.ebuild
+++ b/dev-util/ostree/ostree-2020.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
LICENSE="LGPL-2+"
SLOT="0"
-IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount libressl selinux sodium ssl soup systemd zeroconf"
+IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl soup systemd zeroconf"
RESTRICT="test"
REQUIRED_USE="httpd? ( || ( curl soup ) )"
@@ -34,8 +34,7 @@ COMMON_DEPEND="
ssl? (
gnutls? ( net-libs/gnutls )
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
>=sys-fs/fuse-2.9.2:0
diff --git a/dev-util/ostree/ostree-2020.8.ebuild b/dev-util/ostree/ostree-2020.8.ebuild
index 19462abbce9e..dbca860caa99 100644
--- a/dev-util/ostree/ostree-2020.8.ebuild
+++ b/dev-util/ostree/ostree-2020.8.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
LICENSE="LGPL-2+"
SLOT="0"
-IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount libressl selinux sodium ssl soup systemd zeroconf"
+IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl soup systemd zeroconf"
RESTRICT="test"
REQUIRED_USE="httpd? ( || ( curl soup ) )"
@@ -34,8 +34,7 @@ COMMON_DEPEND="
ssl? (
gnutls? ( net-libs/gnutls )
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
>=sys-fs/fuse-2.9.2:0
diff --git a/dev-util/sysdig/sysdig-0.27.0.ebuild b/dev-util/sysdig/sysdig-0.27.0.ebuild
index 55a20f694f42..f415c1f52770 100644
--- a/dev-util/sysdig/sysdig-0.27.0.ebuild
+++ b/dev-util/sysdig/sysdig-0.27.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules test"
+IUSE="+modules test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -26,8 +26,7 @@ RDEPEND="
net-libs/grpc:0=
sys-libs/ncurses:0=
sys-libs/zlib:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
+ dev-libs/openssl:0=
net-misc/curl:0="
DEPEND="${RDEPEND}
virtual/os-headers
diff --git a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
index a554cf18daa2..999942e1dc15 100644
--- a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
+++ b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules test"
+IUSE="+modules test"
REQUIRED_USE="${LUA_REQUIRED_USE}"
RESTRICT="!test? ( test )"
@@ -31,8 +31,7 @@ RDEPEND="${LUA_DEPS}
net-libs/grpc:0=
sys-libs/ncurses:0=
sys-libs/zlib:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
+ dev-libs/openssl:0=
net-misc/curl:0="
DEPEND="${RDEPEND}
virtual/os-headers
diff --git a/dev-util/sysdig/sysdig-0.27.1.ebuild b/dev-util/sysdig/sysdig-0.27.1.ebuild
index 55a20f694f42..f415c1f52770 100644
--- a/dev-util/sysdig/sysdig-0.27.1.ebuild
+++ b/dev-util/sysdig/sysdig-0.27.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules test"
+IUSE="+modules test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -26,8 +26,7 @@ RDEPEND="
net-libs/grpc:0=
sys-libs/ncurses:0=
sys-libs/zlib:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
+ dev-libs/openssl:0=
net-misc/curl:0="
DEPEND="${RDEPEND}
virtual/os-headers