Gentoo Archives: gentoo-commits

From: Quentin Retornaz <gentoo@××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: sys-block/open-isns/, sys-block/open-isns/files/
Date: Sun, 03 Jul 2022 17:47:37
Message-Id: 1656870421.a812d2eecafcf4e5a65bad5ff720a6933b65c867.quentin@gentoo
1 commit: a812d2eecafcf4e5a65bad5ff720a6933b65c867
2 Author: orbea <orbea <AT> riseup <DOT> net>
3 AuthorDate: Sun Jul 3 03:21:02 2022 +0000
4 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
5 CommitDate: Sun Jul 3 17:47:01 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a812d2ee
7
8 sys-block/open-isns: Remove package
9
10 Works with libress-3.5.x and open-isns-0.101::gentoo.
11
12 Signed-off-by: orbea <orbea <AT> riseup.net>
13 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
14
15 sys-block/open-isns/Manifest | 3 --
16 .../files/open-isns-0.100-no_Werror.patch | 41 -----------------
17 .../files/open-isns-0.100-respect-AR.patch | 30 ------------
18 .../open-isns-0.98-libressl-compatibility.patch | 11 -----
19 sys-block/open-isns/metadata.xml | 11 -----
20 sys-block/open-isns/open-isns-0.100.ebuild | 53 ----------------------
21 sys-block/open-isns/open-isns-0.98.ebuild | 36 ---------------
22 sys-block/open-isns/open-isns-0.99.ebuild | 43 ------------------
23 8 files changed, 228 deletions(-)
24
25 diff --git a/sys-block/open-isns/Manifest b/sys-block/open-isns/Manifest
26 deleted file mode 100644
27 index 7aa31df..0000000
28 --- a/sys-block/open-isns/Manifest
29 +++ /dev/null
30 @@ -1,3 +0,0 @@
31 -DIST open-isns-0.100.tar.gz 300611 BLAKE2B a40e8d2bd6e5ac8ed8475d3d50ed6256871134547a044a6b51102ad47c66c335f06372b29e5585df4e59ecd7a817e5f2e48c5e944eea31333ab9f45d51040306 SHA512 ccf49ba1c60d46ae49b75424a966abc1f7e104c8ffa13013951a58a8f0ccaa1cf550f24fd2743fcaba1211a0ec8033c5df5249b7a108ae5974d4f1144dd3b169
32 -DIST open-isns-0.98.tar.gz 278410 BLAKE2B f90df85de4d5fd2abdcd267e3c873dff62fcac523ee280e21def057eca366bbba21c2b3bfbf5cc0798b8d0f3b0d5028ebb49000cccc850abdfb85142a7b66c34 SHA512 04263b9ace9d272f4e3776c4e1a034815475590d4b4864217a6200fcd5baea391cd788723db3c17fe0d764efc9769a70a3d2167b00e5998fb4bcb8d5fe2547ed
33 -DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
34
35 diff --git a/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch b/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch
36 deleted file mode 100644
37 index 2d966dd..0000000
38 --- a/sys-block/open-isns/files/open-isns-0.100-no_Werror.patch
39 +++ /dev/null
40 @@ -1,41 +0,0 @@
41 -From 40eb9ce75518817762a0eac4a93016ab817add89 Mon Sep 17 00:00:00 2001
42 -From: Lee Duncan <lduncan@××××.com>
43 -Date: Sat, 1 Feb 2020 10:23:04 -0800
44 -Subject: [PATCH] Fix 586 compile issue and remove -Werror
45 -
46 -Using -Werror causes any issue to break the build, whereas
47 -I'd rather let the build continue and address the issue.
48 -
49 -Also, fixed one signed-vs-unsigned compare for time_t, which
50 -shows up only on 586 (32-bit).
51 ----
52 - configure.ac | 2 +-
53 - isnsdd.c | 2 +-
54 - 2 files changed, 2 insertions(+), 2 deletions(-)
55 -
56 -diff --git a/configure.ac b/configure.ac
57 -index e4f3995..d956e58 100644
58 ---- a/configure.ac
59 -+++ b/configure.ac
60 -@@ -17,7 +17,7 @@ AC_PATH_PROG(SH, sh)
61 - dnl C Compiler features
62 - AC_C_INLINE
63 - if test "$GCC" = "yes"; then
64 -- CFLAGS="-Wall -Werror -Wextra $CFLAGS"
65 -+ CFLAGS="-Wall -Wextra $CFLAGS"
66 - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
67 - fi
68 -
69 -diff --git a/isnsdd.c b/isnsdd.c
70 -index 58825cc..9cedb9f 100644
71 ---- a/isnsdd.c
72 -+++ b/isnsdd.c
73 -@@ -401,7 +401,7 @@ check_portal_registration(__attribute__((unused))void *ptr)
74 - continue;
75 -
76 - last_modified = isns_object_last_modified(obj);
77 -- if (last_modified + 2 * interval > now) {
78 -+ if ((time_t)(last_modified + 2 * interval) > now) {
79 - good_portals++;
80 - continue;
81 - }
82
83 diff --git a/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch b/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch
84 deleted file mode 100644
85 index 66e52e5..0000000
86 --- a/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch
87 +++ /dev/null
88 @@ -1,30 +0,0 @@
89 ---- a/Makefile.in
90 -+++ b/Makefile.in
91 -@@ -33,6 +33,7 @@ else
92 - SOLIB_VERSION_OPTS =
93 - endif
94 -
95 -+AR = @AR@
96 - CC = @CC@
97 - CPPFLAGS= @CPPFLAGS@
98 - CFLAGS = @CFLAGS@ -I. -Iinclude -I$(srcdir) -I$(srcdir)/include
99 -@@ -161,7 +162,7 @@ solib-message.o: message.c
100 -
101 - ifeq ($(BUILD_STATIC),1)
102 - $(LIB): $(LIBOBJS)
103 -- ar cr $@ $(LIBOBJS)
104 -+ $(AR) cr $@ $(LIBOBJS)
105 - else
106 - $(LIB):
107 - endif
108 ---- a/configure.ac
109 -+++ b/configure.ac
110 -@@ -4,6 +4,7 @@ AC_CONFIG_AUX_DIR([aclocal])
111 -
112 - AC_CONFIG_HEADER(config.h)
113 -
114 -+AM_PROG_AR
115 - AC_PROG_CC
116 - AC_CANONICAL_HOST
117 - AC_C_BIGENDIAN
118 -
119
120 diff --git a/sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch b/sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch
121 deleted file mode 100644
122 index b4d5ae6..0000000
123 --- a/sys-block/open-isns/files/open-isns-0.98-libressl-compatibility.patch
124 +++ /dev/null
125 @@ -1,11 +0,0 @@
126 ---- a/pki.c.orig
127 -+++ b/pki.c
128 -@@ -30,7 +30,7 @@
129 - #endif
130 - /* OpenSSL 1.1 made a lot of structures opaque, so we need to
131 - * define the 1.1 wrappers in previous versions. */
132 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
133 -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
134 - #define EVP_PKEY_base_id(o) ((o)->type)
135 - #define EVP_PKEY_get0_DSA(o) ((o)->pkey.dsa)
136 - static EVP_MD_CTX *EVP_MD_CTX_new(void)
137
138 diff --git a/sys-block/open-isns/metadata.xml b/sys-block/open-isns/metadata.xml
139 deleted file mode 100644
140 index c347079..0000000
141 --- a/sys-block/open-isns/metadata.xml
142 +++ /dev/null
143 @@ -1,11 +0,0 @@
144 -<?xml version='1.0' encoding='UTF-8'?>
145 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
146 -<pkgmetadata>
147 - <maintainer type="project">
148 - <email>base-system@g.o</email>
149 - <name>Gentoo Base System</name>
150 - </maintainer>
151 - <upstream>
152 - <remote-id type="github">open-iscsi/open-isns</remote-id>
153 - </upstream>
154 -</pkgmetadata>
155
156 diff --git a/sys-block/open-isns/open-isns-0.100.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild
157 deleted file mode 100644
158 index da07280..0000000
159 --- a/sys-block/open-isns/open-isns-0.100.ebuild
160 +++ /dev/null
161 @@ -1,53 +0,0 @@
162 -# Copyright 1999-2021 Gentoo Authors
163 -# Distributed under the terms of the GNU General Public License v2
164 -
165 -EAPI=7
166 -
167 -inherit autotools flag-o-matic
168 -
169 -DESCRIPTION="iSNS server and client for Linux"
170 -HOMEPAGE="https://github.com/open-iscsi/open-isns"
171 -SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
172 -
173 -LICENSE="LGPL-2.1"
174 -SLOT="0"
175 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
176 -IUSE="debug ssl static"
177 -
178 -DEPEND="ssl? ( dev-libs/openssl:0= )"
179 -RDEPEND="${DEPEND}"
180 -
181 -PATCHES=(
182 - "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch"
183 -
184 - "${FILESDIR}/${PN}-0.100-respect-AR.patch"
185 -
186 - # Upstream patches (can usually be removed with next version bump)
187 - "${FILESDIR}"/${P}-no_Werror.patch
188 -)
189 -
190 -src_prepare() {
191 - default
192 - eautoreconf
193 -}
194 -
195 -src_configure() {
196 - use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
197 - append-lfs-flags
198 - local myeconfargs=(
199 - --without-slp
200 - $(use_with ssl security)
201 - $(use_enable !static shared)
202 - )
203 - econf "${myeconfargs[@]}"
204 -}
205 -
206 -src_install() {
207 - default
208 - emake DESTDIR="${D}" install_hdrs
209 - emake DESTDIR="${D}" install_lib
210 - keepdir /var/lib/${PN/open-}
211 - if ! use static ; then
212 - find "${ED}" -type f -name "*.a" -delete || die
213 - fi
214 -}
215
216 diff --git a/sys-block/open-isns/open-isns-0.98.ebuild b/sys-block/open-isns/open-isns-0.98.ebuild
217 deleted file mode 100644
218 index d0c69f7..0000000
219 --- a/sys-block/open-isns/open-isns-0.98.ebuild
220 +++ /dev/null
221 @@ -1,36 +0,0 @@
222 -# Copyright 1999-2021 Gentoo Authors
223 -# Distributed under the terms of the GNU General Public License v2
224 -
225 -EAPI=6
226 -
227 -inherit flag-o-matic
228 -
229 -DESCRIPTION="iSNS server and client for Linux"
230 -HOMEPAGE="https://github.com/open-iscsi/open-isns"
231 -SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
232 -
233 -LICENSE="LGPL-2.1"
234 -SLOT="0"
235 -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
236 -IUSE="debug slp ssl static"
237 -
238 -DEPEND="
239 - ssl? ( dev-libs/openssl:0= )
240 - slp? ( net-libs/openslp )"
241 -RDEPEND="${DEPEND}"
242 -
243 -PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" )
244 -
245 -src_configure() {
246 - use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
247 - append-lfs-flags
248 - econf $(use_with slp) \
249 - $(use_with ssl security) \
250 - $(use_enable !static shared)
251 -}
252 -
253 -src_install() {
254 - default
255 - emake DESTDIR="${D}" install_hdrs
256 - emake DESTDIR="${D}" install_lib
257 -}
258
259 diff --git a/sys-block/open-isns/open-isns-0.99.ebuild b/sys-block/open-isns/open-isns-0.99.ebuild
260 deleted file mode 100644
261 index 0c9d2c7..0000000
262 --- a/sys-block/open-isns/open-isns-0.99.ebuild
263 +++ /dev/null
264 @@ -1,43 +0,0 @@
265 -# Copyright 1999-2021 Gentoo Authors
266 -# Distributed under the terms of the GNU General Public License v2
267 -
268 -EAPI=7
269 -
270 -inherit flag-o-matic
271 -
272 -DESCRIPTION="iSNS server and client for Linux"
273 -HOMEPAGE="https://github.com/open-iscsi/open-isns"
274 -SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
275 -
276 -LICENSE="LGPL-2.1"
277 -SLOT="0"
278 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
279 -IUSE="debug slp ssl static"
280 -
281 -DEPEND="
282 - ssl? ( dev-libs/openssl:0= )
283 - slp? ( net-libs/openslp )"
284 -RDEPEND="${DEPEND}"
285 -
286 -PATCHES=( "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch" )
287 -
288 -src_configure() {
289 - use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
290 - append-lfs-flags
291 - local myeconfargs=(
292 - $(use_with slp)
293 - $(use_with ssl security)
294 - $(use_enable !static shared)
295 - )
296 - econf "${myeconfargs[@]}"
297 -}
298 -
299 -src_install() {
300 - default
301 - emake DESTDIR="${D}" install_hdrs
302 - emake DESTDIR="${D}" install_lib
303 - keepdir /var/lib/${PN/open-}
304 - if ! use static ; then
305 - find "${ED}" -type f -name "*.a" -delete || die
306 - fi
307 -}