commit: 7270b339ac68eb09ed8ec9df1cdf4e70beb78b60 parent bd91a9b58eb4f18949a4e241968a586965429467 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Wed, 17 Mar 2021 05:46:55 +0100 Remove LibreSSL supportDiffstat:
16 files changed, 25 insertions(+), 57 deletions(-)
diff --git a/app-crypt/acme-sh/acme-sh-2.8.1.ebuild b/app-crypt/acme-sh/acme-sh-2.8.1.ebuild @@ -20,7 +20,7 @@ SLOT="0" IUSE="standalone" RDEPEND=" net-misc/curl - || ( dev-libs/libressl dev-libs/openssl:0 ) + || ( dev-libs/openssl:0 ) standalone? ( net-misc/socat ) virtual/cron " diff --git a/app-crypt/acme-sh/acme-sh-9999.ebuild b/app-crypt/acme-sh/acme-sh-9999.ebuild @@ -20,7 +20,7 @@ SLOT="0" IUSE="standalone" RDEPEND=" net-misc/curl - || ( dev-libs/libressl dev-libs/openssl:0 ) + || ( dev-libs/openssl:0 ) standalone? ( net-misc/socat ) virtual/cron " diff --git a/app-crypt/netpgp/netpgp-20140220.ebuild b/app-crypt/netpgp/netpgp-20140220.ebuild @@ -9,13 +9,11 @@ LICENSE="ISC" SRC_URI="http://netpgp.com/src/${P}.tar.gz" SLOT="0" KEYWORDS="~amd64" -IUSE="libressl" # OpenSSL 0.9.8 or newer # TODO: bzlib ? DEPEND=" - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:= sys-libs/zlib " RDEPEND="${DEPEND}" diff --git a/games-action/teeworlds/teeworlds-0.7.3.1.ebuild b/games-action/teeworlds/teeworlds-0.7.3.1.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/teeworlds/teeworlds/releases/download/${PV}/${P}-src LICENSE="ZLIB CC-BY-SA-3.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="dedicated libressl test" +IUSE="dedicated test" S="${WORKDIR}/${P}-src" DEPEND=" @@ -31,8 +31,7 @@ DEPEND=" media-sound/wavpack:= x11-libs/libX11:= ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:= ) + dev-libs/openssl:= test? ( dev-cpp/gtest ) " RDEPEND="${DEPEND}" diff --git a/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild @@ -13,13 +13,12 @@ SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz" LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" SLOT="0" KEYWORDS="~amd64" -IUSE="libressl pam +mta" +IUSE="pam +mta" DEPEND=" acct-user/smtpd acct-user/smtpq - !libressl? ( >=dev-libs/openssl-1.1.0:0= ) - libressl? ( >=dev-libs/libressl-3.0.2 ) + >=dev-libs/openssl-1.1.0:0= sys-libs/zlib pam? ( sys-libs/pam ) elibc_musl? ( diff --git a/net-dns/getdns/getdns-1.3.0.ebuild b/net-dns/getdns/getdns-1.3.0.ebuild @@ -10,12 +10,11 @@ SRC_URI="https://getdnsapi.net/releases/getdns-1-3-0/getdns-1.3.0.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="stubby libressl" +IUSE="stubby" DEPEND=" dev-libs/libyaml:= - !libressl? ( >=dev-libs/openssl-1.0.2:= ) - libressl? ( dev-libs/libressl:= ) + >=dev-libs/openssl-1.0.2:= " RDEPEND="${DEPEND}" diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://www.bitlbee.org/" LICENSE="GPL-2" SLOT="0" IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" -IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd +IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" REQUIRED_USE=" @@ -35,10 +35,7 @@ COMMON_DEPEND=" gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) - !nss? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) - ) + !nss? ( dev-libs/openssl:0= ) ) " DEPEND="${COMMON_DEPEND} diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://www.bitlbee.org/" LICENSE="GPL-2" SLOT="0" IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" -IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd +IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" REQUIRED_USE=" @@ -35,10 +35,7 @@ COMMON_DEPEND=" gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) - !nss? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) - ) + !nss? ( dev-libs/openssl:0= ) ) " DEPEND="${COMMON_DEPEND} diff --git a/net-irc/unrealircd/unrealircd-4.2.0.ebuild b/net-irc/unrealircd/unrealircd-4.2.0.ebuild @@ -14,11 +14,10 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux" IUSE="class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq - showlistmodes shunnotices topicisnuhost +usermod libressl" + showlistmodes shunnotices topicisnuhost +usermod" RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:0= dev-libs/libpcre2 dev-libs/tre >=net-dns/c-ares-1.7:= diff --git a/net-libs/glib-networking/glib-networking-2.66.0.ebuild b/net-libs/glib-networking/glib-networking-2.66.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://ftp.gnome.org/pub/GNOME/sources/${PN}/$(ver_cut 1-2)/${P}.tar.x LICENSE="LGPL-2.1+" SLOT="0" -IUSE="gnome gnutls +libproxy libressl +openssl test ssl" +IUSE="gnome gnutls +libproxy +openssl test ssl" KEYWORDS="~amd64" REQUIRED_USE="ssl? ( || ( gnutls openssl ) )" @@ -20,10 +20,7 @@ DEPEND=" >=dev-libs/glib-2.63.0:2[${MULTILIB_USEDEP}] libproxy? ( >=net-libs/libproxy-0.3.1:=[${MULTILIB_USEDEP}] ) gnutls? ( >=net-libs/gnutls-3.4.6:=[${MULTILIB_USEDEP}] ) - openssl? ( - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - ) + openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) " multilib_src_configure() { diff --git a/net-libs/libasr/libasr-1.0.2.ebuild b/net-libs/libasr/libasr-1.0.2.ebuild @@ -12,14 +12,8 @@ SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz" LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="libressl" -RDEPEND="libressl? ( dev-libs/libressl:= )" DEPEND=" ${RDEPEND} sys-devel/automake:1.14 " - -src_prepare() { - use libressl && epatch "${FILESDIR}/${PV}-Replace-res_randomid_with_arc4random.patch" -} diff --git a/net-libs/libasr/libasr-9999.ebuild b/net-libs/libasr/libasr-9999.ebuild @@ -14,12 +14,8 @@ EGIT_REPO_URI="${HOMEPAGE}.git" LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" SLOT="0" KEYWORDS="" -IUSE="libressl" -RDEPEND="libressl? ( dev-libs/libressl:= )" -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" src_prepare() { default diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild @@ -12,12 +12,12 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="1" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="kerberos static-libs libressl" +IUSE="kerberos static-libs" RESTRICT="test" RDEPEND="dev-libs/apr:1= dev-libs/apr-util:1= - !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )" DEPEND="${RDEPEND} diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml @@ -19,7 +19,4 @@ NTP servers and can act as NTP server itself, redistributing the local clock. </longdescription> - <use> - <flag name="libressl">Enable HTTPS TLS time constraint support using <pkg>dev-libs/libressl</pkg></flag> - </use> </pkgmetadata> diff --git a/net-misc/openntpd/openntpd-6.0_p1.ebuild b/net-misc/openntpd/openntpd-6.0_p1.ebuild @@ -12,11 +12,10 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="libressl selinux" +IUSE="selinux" DEPEND="!<=net-misc/ntp-4.2.0-r2 - !net-misc/ntp[-openntpd] - libressl? ( >=dev-libs/libressl-2.3.2 )" + !net-misc/ntp[-openntpd]" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-ntp )" @@ -50,7 +49,7 @@ src_prepare() { } src_configure() { - econf --with-privsep-user=ntp --with-privsep-path=${NTP_HOME} $(use_enable libressl https-constraint) + econf --with-privsep-user=ntp --with-privsep-path=${NTP_HOME} } src_install() { diff --git a/net-nntp/suck/suck-4.3.4.ebuild b/net-nntp/suck/suck-4.3.4.ebuild @@ -10,14 +10,11 @@ SRC_URI="https://github.com/lazarus-pkgs/suck/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="perl ssl libressl" +IUSE="perl ssl" RDEPEND=" sys-libs/gdbm:= - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) + ssl? ( dev-libs/openssl:0= ) " DEPEND="${RDEPEND} sys-libs/db