Gentoo Archives: gentoo-commits

From: Quentin Retornaz <gentoo@××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: net-libs/libnice/files/, net-libs/libnice/
Date: Sun, 03 Jul 2022 17:47:37
Message-Id: 1656870420.152b56d59a0a94ca1b311f0a0b884006fc57a867.quentin@gentoo
1 commit: 152b56d59a0a94ca1b311f0a0b884006fc57a867
2 Author: orbea <orbea <AT> riseup <DOT> net>
3 AuthorDate: Sun Jul 3 02:34:55 2022 +0000
4 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
5 CommitDate: Sun Jul 3 17:47:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=152b56d5
7
8 net-libs/libnice: Remove package
9
10 Works with libressl-3.5.x and libnice-0.1.18::gentoo.
11
12 Signed-off-by: orbea <orbea <AT> riseup.net>
13 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
14
15 net-libs/libnice/Manifest | 1 -
16 .../libnice/files/libnice-0.1.15-libressl.patch | 57 ----------------------
17 net-libs/libnice/libnice-0.1.15.ebuild | 56 ---------------------
18 net-libs/libnice/metadata.xml | 8 ---
19 4 files changed, 122 deletions(-)
20
21 diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
22 deleted file mode 100644
23 index dc6cbc3..0000000
24 --- a/net-libs/libnice/Manifest
25 +++ /dev/null
26 @@ -1 +0,0 @@
27 -DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
28
29 diff --git a/net-libs/libnice/files/libnice-0.1.15-libressl.patch b/net-libs/libnice/files/libnice-0.1.15-libressl.patch
30 deleted file mode 100644
31 index 6c38069..0000000
32 --- a/net-libs/libnice/files/libnice-0.1.15-libressl.patch
33 +++ /dev/null
34 @@ -1,57 +0,0 @@
35 -From 926afef019ca9f297cebbe13479159ac5c087f00 Mon Sep 17 00:00:00 2001
36 -From: Stefan Strogin <stefan.strogin@×××××.com>
37 -Date: Fri, 15 Feb 2019 20:45:34 +0200
38 -Subject: [PATCH] stun: Fix LibreSSL support
39 -
40 -Closes #71
41 ----
42 - stun/stunhmac.c | 12 ++++++++----
43 - 1 file changed, 8 insertions(+), 4 deletions(-)
44 -
45 -diff --git a/stun/stunhmac.c b/stun/stunhmac.c
46 -index c7d1432..c9d183f 100644
47 ---- a/stun/stunhmac.c
48 -+++ b/stun/stunhmac.c
49 -@@ -75,7 +75,8 @@ void stun_sha1 (const uint8_t *msg, size_t len, size_t msg_len, uint8_t *sha,
50 - assert (ret == 1);
51 - #endif
52 -
53 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
54 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
55 -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
56 - HMAC_CTX stackctx;
57 - HMAC_CTX *ctx = &stackctx;
58 - HMAC_CTX_init (ctx);
59 -@@ -101,7 +102,8 @@ void stun_sha1 (const uint8_t *msg, size_t len, size_t msg_len, uint8_t *sha,
60 -
61 - TRY (HMAC_Final (ctx, sha, NULL));
62 -
63 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
64 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
65 -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
66 - HMAC_CTX_cleanup (ctx);
67 - #else
68 - HMAC_CTX_free (ctx);
69 -@@ -172,7 +174,8 @@ void stun_hash_creds (const uint8_t *realm, size_t realm_len,
70 - #ifdef HAVE_OPENSSL
71 - EVP_MD_CTX *ctx;
72 -
73 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
74 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
75 -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
76 - ctx = EVP_MD_CTX_create ();
77 - #else
78 - ctx = EVP_MD_CTX_new ();
79 -@@ -186,7 +189,8 @@ void stun_hash_creds (const uint8_t *realm, size_t realm_len,
80 - EVP_DigestUpdate (ctx, password_trimmed, password_len);
81 - EVP_DigestFinal_ex (ctx, md5, NULL);
82 -
83 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
84 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
85 -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
86 - EVP_MD_CTX_destroy (ctx);
87 - #else
88 - EVP_MD_CTX_free (ctx);
89 ---
90 -2.20.1
91 -
92
93 diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
94 deleted file mode 100644
95 index f9bde46..0000000
96 --- a/net-libs/libnice/libnice-0.1.15.ebuild
97 +++ /dev/null
98 @@ -1,56 +0,0 @@
99 -# Copyright 1999-2021 Gentoo Authors
100 -# Distributed under the terms of the GNU General Public License v2
101 -
102 -EAPI=6
103 -inherit multilib-minimal xdg
104 -
105 -DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
106 -HOMEPAGE="https://nice.freedesktop.org/wiki/"
107 -SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
108 -
109 -LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
110 -SLOT="0"
111 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
112 -IUSE="+gnutls +introspection +upnp"
113 -
114 -RDEPEND="
115 - >=dev-libs/glib-2.48:2[${MULTILIB_USEDEP}]
116 - introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
117 - gnutls? ( >=net-libs/gnutls-2.12.0:0=[${MULTILIB_USEDEP}] )
118 - !gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
119 - upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
120 -"
121 -DEPEND="${RDEPEND}
122 - dev-util/glib-utils
123 - >=dev-util/gtk-doc-am-1.10
124 - virtual/pkgconfig
125 -"
126 -
127 -PATCHES=( "${FILESDIR}/${P}-libressl.patch" ) # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/50
128 -
129 -multilib_src_configure() {
130 - # gstreamer plugin split off into media-plugins/gst-plugins-libnice
131 - ECONF_SOURCE=${S} \
132 - econf \
133 - --enable-compile-warnings=yes \
134 - --disable-static \
135 - --disable-static-plugins \
136 - --without-gstreamer \
137 - --without-gstreamer-0.10 \
138 - --with-crypto-library=$(usex gnutls gnutls openssl) \
139 - $(multilib_native_use_enable introspection) \
140 - $(use_enable upnp gupnp)
141 -
142 - if multilib_is_native_abi; then
143 - ln -s {"${S}"/,}docs/reference/libnice/html || die
144 - fi
145 -}
146 -
147 -multilib_src_install_all() {
148 - einstalldocs
149 - find "${ED}" -name '*.la' -delete || die
150 -}
151 -
152 -multilib_src_test() {
153 - emake -j1 check
154 -}
155
156 diff --git a/net-libs/libnice/metadata.xml b/net-libs/libnice/metadata.xml
157 deleted file mode 100644
158 index 3998080..0000000
159 --- a/net-libs/libnice/metadata.xml
160 +++ /dev/null
161 @@ -1,8 +0,0 @@
162 -<?xml version="1.0" encoding="UTF-8"?>
163 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
164 -<pkgmetadata>
165 -<maintainer type="project">
166 - <email>gnome@g.o</email>
167 - <name>Gentoo GNOME Desktop</name>
168 -</maintainer>
169 -</pkgmetadata>