Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libetpan/, net-libs/libetpan/files/
Date: Thu, 30 Jul 2020 21:15:42
Message-Id: 1596143733.8bd0471b2367f4fa7a9f12bf333178b4f7e33f90.polynomial-c@gentoo
1 commit: 8bd0471b2367f4fa7a9f12bf333178b4f7e33f90
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 30 21:15:03 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 21:15:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bd0471b
7
8 net-libs/libetpan: Security cleanup
9
10 Bug: https://bugs.gentoo.org/734130
11 Package-Manager: Portage-3.0.1, Repoman-2.3.23
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 net-libs/libetpan/Manifest | 1 -
15 .../files/libetpan-1.9.3-missing-stddev_h.patch | 30 ---------
16 net-libs/libetpan/libetpan-1.9.3.ebuild | 77 ----------------------
17 net-libs/libetpan/libetpan-1.9.4.ebuild | 77 ----------------------
18 4 files changed, 185 deletions(-)
19
20 diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
21 index d37beb8e3f4..667fb19ac96 100644
22 --- a/net-libs/libetpan/Manifest
23 +++ b/net-libs/libetpan/Manifest
24 @@ -1,2 +1 @@
25 -DIST libetpan-1.9.3.tar.gz 5000049 BLAKE2B 1664d93b112410a86935438aae5ff40202a9c10675701d40b60edf81e4f8bac45fb1f407e03714a37465c41a22c1b9fcbbc517d76dc47f812e154c932e05e600 SHA512 66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6
26 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
27
28 diff --git a/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch b/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch
29 deleted file mode 100644
30 index 9d53f90190b..00000000000
31 --- a/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch
32 +++ /dev/null
33 @@ -1,30 +0,0 @@
34 -commit da9fd7839c9affea48f74a159a789fbb183b4be1
35 -Author: maxice8 <30738253+maxice8@××××××××××××××××××××.com>
36 -Date: Fri Feb 1 01:58:08 2019 -0200
37 -
38 - add missing stddef.h include for 'NULL' (#322)
39 -
40 - clientid.c: In function 'mailimap_clientid':
41 - clientid.c:66:38: error: 'NULL' undeclared (first use in this function)
42 - if (mailimap_read_line(session) == NULL)
43 - ^~~~
44 - clientid.c:66:38: note: 'NULL' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'?
45 - clientid.c:39:1:
46 - +#include <stddef.h>
47 -
48 - clientid.c:66:38:
49 - if (mailimap_read_line(session) == NULL)
50 -
51 -diff --git a/src/low-level/imap/clientid.c b/src/low-level/imap/clientid.c
52 -index 1c34637..38880dd 100644
53 ---- a/src/low-level/imap/clientid.c
54 -+++ b/src/low-level/imap/clientid.c
55 -@@ -33,6 +33,8 @@
56 - # include <config.h>
57 - #endif
58 -
59 -+#include <stdlib.h>
60 -+
61 - #include "mailimap_sender.h"
62 - #include "clientid_sender.h"
63 - #include "clientid.h"
64
65 diff --git a/net-libs/libetpan/libetpan-1.9.3.ebuild b/net-libs/libetpan/libetpan-1.9.3.ebuild
66 deleted file mode 100644
67 index 8fb6d3cd1d9..00000000000
68 --- a/net-libs/libetpan/libetpan-1.9.3.ebuild
69 +++ /dev/null
70 @@ -1,77 +0,0 @@
71 -# Copyright 1999-2020 Gentoo Authors
72 -# Distributed under the terms of the GNU General Public License v2
73 -
74 -EAPI=7
75 -inherit autotools
76 -
77 -DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
78 -HOMEPAGE="http://libetpan.sourceforge.net/"
79 -SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
80 -
81 -LICENSE="BSD"
82 -SLOT="0"
83 -KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
84 -IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
85 -
86 -# BerkDB is only supported up to version 6.0
87 -DEPEND="sys-libs/zlib
88 - !lmdb? ( berkdb? ( <sys-libs/db-6.1:= ) )
89 - lmdb? ( dev-db/lmdb )
90 - ssl? (
91 - gnutls? ( net-libs/gnutls:= )
92 - !gnutls? (
93 - !libressl? ( dev-libs/openssl:0= )
94 - libressl? ( dev-libs/libressl:0= )
95 - )
96 - )
97 - sasl? ( dev-libs/cyrus-sasl:2 )
98 - liblockfile? ( net-libs/liblockfile )"
99 -RDEPEND="${DEPEND}"
100 -
101 -PATCHES=(
102 - "${FILESDIR}"/${PN}-1.0-nonnull.patch
103 - "${FILESDIR}"/${PN}-1.9.3-missing-stddev_h.patch
104 -)
105 -
106 -pkg_pretend() {
107 - if use gnutls && ! use ssl ; then
108 - ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
109 - ewarn "No ssl support will be available in ${PN}."
110 - fi
111 -
112 - if use berkdb && use lmdb ; then
113 - ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
114 - ewarn "Using lmdb as cache DB!"
115 - fi
116 -}
117 -
118 -src_prepare() {
119 - default
120 - eautoreconf
121 -}
122 -
123 -src_configure() {
124 - # in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
125 - # libtool recognises it as valid shell (bug #300211)
126 - use prefix && export CONFIG_SHELL=${BASH}
127 - local myeconfargs=(
128 - # --enable-debug simply injects "-O2 -g" into CFLAGS
129 - --disable-debug
130 - $(use_enable berkdb db)
131 - $(use_enable ipv6)
132 - $(use_enable liblockfile lockfile)
133 - $(use_enable lmdb)
134 - $(use_enable static-libs static)
135 - $(use_with sasl)
136 - $(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
137 - )
138 - econf "${myeconfargs[@]}"
139 -}
140 -
141 -src_install() {
142 - default
143 - find "${ED}" -name "*.la" -delete || die
144 - if ! use static-libs ; then
145 - find "${ED}" -name "*.a" -delete || die
146 - fi
147 -}
148
149 diff --git a/net-libs/libetpan/libetpan-1.9.4.ebuild b/net-libs/libetpan/libetpan-1.9.4.ebuild
150 deleted file mode 100644
151 index 373a43129b3..00000000000
152 --- a/net-libs/libetpan/libetpan-1.9.4.ebuild
153 +++ /dev/null
154 @@ -1,77 +0,0 @@
155 -# Copyright 1999-2019 Gentoo Authors
156 -# Distributed under the terms of the GNU General Public License v2
157 -
158 -EAPI=7
159 -inherit autotools
160 -
161 -DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
162 -HOMEPAGE="http://libetpan.sourceforge.net/"
163 -SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
164 -
165 -LICENSE="BSD"
166 -SLOT="0"
167 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
168 -IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
169 -
170 -# BerkDB is only supported up to version 6.0
171 -DEPEND="sys-libs/zlib
172 - !lmdb? ( berkdb? ( sys-libs/db:= ) )
173 - lmdb? ( dev-db/lmdb )
174 - ssl? (
175 - gnutls? ( net-libs/gnutls:= )
176 - !gnutls? (
177 - !libressl? ( dev-libs/openssl:0= )
178 - libressl? ( dev-libs/libressl:0= )
179 - )
180 - )
181 - sasl? ( dev-libs/cyrus-sasl:2 )
182 - liblockfile? ( net-libs/liblockfile )"
183 -RDEPEND="${DEPEND}"
184 -
185 -PATCHES=(
186 - "${FILESDIR}"/${PN}-1.0-nonnull.patch
187 - "${FILESDIR}"/${PN}-1.9.4-berkdb_lookup.patch #519846
188 - "${FILESDIR}"/${PN}-1.9.4-pkgconfig_file_no_ldflags.patch
189 -)
190 -
191 -pkg_pretend() {
192 - if use gnutls && ! use ssl ; then
193 - ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
194 - ewarn "No ssl support will be available in ${PN}."
195 - fi
196 -
197 - if use berkdb && use lmdb ; then
198 - ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
199 - ewarn "Using lmdb as cache DB!"
200 - fi
201 -}
202 -
203 -src_prepare() {
204 - default
205 - eautoreconf
206 -}
207 -
208 -src_configure() {
209 - # in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
210 - # libtool recognises it as valid shell (bug #300211)
211 - use prefix && export CONFIG_SHELL=${BASH}
212 - local myeconfargs=(
213 - # --enable-debug simply injects "-O2 -g" into CFLAGS
214 - --disable-debug
215 - $(use_enable ipv6)
216 - $(use_enable liblockfile lockfile)
217 - $(use_enable static-libs static)
218 - $(use_with sasl)
219 - $(usex lmdb '--enable-lmdb --disable-db' "$(use_enable berkdb db) --disable-lmdb")
220 - $(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
221 - )
222 - econf "${myeconfargs[@]}"
223 -}
224 -
225 -src_install() {
226 - default
227 - find "${ED}" -name "*.la" -delete || die
228 - if ! use static-libs ; then
229 - find "${ED}" -name "*.a" -delete || die
230 - fi
231 -}