1 |
commit: 193076f4126a8ce06a971549dabc48c080d0f9d5 |
2 |
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Feb 28 23:08:30 2019 +0000 |
4 |
Commit: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Feb 28 23:10:35 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=193076f4 |
7 |
|
8 |
dev-cpp/commoncpp2: drop; fixed in gentoo.git |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com> |
12 |
|
13 |
dev-cpp/commoncpp2/Manifest | 1 - |
14 |
dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild | 73 --------------------- |
15 |
dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild | 76 ---------------------- |
16 |
dev-cpp/commoncpp2/files/1.8.0-glibc212.patch | 12 ---- |
17 |
.../commoncpp2/files/1.8.1-autoconf-update.patch | 61 ----------------- |
18 |
.../files/1.8.1-configure_detect_netfilter.patch | 14 ---- |
19 |
.../files/1.8.1-fix-buffer-overflow.patch | 13 ---- |
20 |
dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch | 52 --------------- |
21 |
dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch | 36 ---------- |
22 |
dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch | 48 -------------- |
23 |
dev-cpp/commoncpp2/files/1.8.1-no-ssl3.patch | 11 ---- |
24 |
.../commoncpp2/files/1.8.1-parallel-build.patch | 11 ---- |
25 |
dev-cpp/commoncpp2/metadata.xml | 8 --- |
26 |
13 files changed, 416 deletions(-) |
27 |
|
28 |
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest |
29 |
deleted file mode 100644 |
30 |
index 28191af..0000000 |
31 |
--- a/dev-cpp/commoncpp2/Manifest |
32 |
+++ /dev/null |
33 |
@@ -1 +0,0 @@ |
34 |
-DIST commoncpp2-1.8.1.tar.gz 908678 SHA256 53ced4aff74e28a1d8018eb2b4974519028db3c12471ab6dff1c873578c9af4e SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe WHIRLPOOL 1844cf39ce0a087aaea1cfac1e712b52f81de594278facb70306d68cd3e3343c0d2c581886b4fe3ce7607eb52150c5cf1c9558d0fac0ee7d8730eff39b46bb64 |
35 |
|
36 |
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild |
37 |
deleted file mode 100644 |
38 |
index f8d9a0e..0000000 |
39 |
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild |
40 |
+++ /dev/null |
41 |
@@ -1,73 +0,0 @@ |
42 |
-# Copyright 1999-2017 Gentoo Foundation |
43 |
-# Distributed under the terms of the GNU General Public License v2 |
44 |
- |
45 |
-EAPI=6 |
46 |
- |
47 |
-inherit autotools |
48 |
- |
49 |
-DESCRIPTION="C++ library offering portable support for system-related services" |
50 |
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" |
51 |
-HOMEPAGE="https://www.gnu.org/software/commoncpp/" |
52 |
-LICENSE="GPL-2" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="amd64 ppc ppc64 x86" |
55 |
-IUSE="debug doc examples ipv6 gnutls libressl ssl static-libs" |
56 |
- |
57 |
-RDEPEND=" |
58 |
- sys-libs/zlib |
59 |
- ssl? ( |
60 |
- gnutls? ( |
61 |
- dev-libs/libgcrypt:0= |
62 |
- net-libs/gnutls:= |
63 |
- ) |
64 |
- !gnutls? ( |
65 |
- !libressl? ( dev-libs/openssl:0= ) |
66 |
- libressl? ( dev-libs/libressl:= ) |
67 |
- ) |
68 |
- )" |
69 |
-DEPEND="${RDEPEND} |
70 |
- doc? ( >=app-doc/doxygen-1.3.6 )" |
71 |
- |
72 |
-PATCHES=( |
73 |
- "${FILESDIR}/1.8.1-no-ssl3.patch" |
74 |
- "${FILESDIR}/1.8.1-configure_detect_netfilter.patch" |
75 |
- "${FILESDIR}/1.8.0-glibc212.patch" |
76 |
- "${FILESDIR}/1.8.1-autoconf-update.patch" |
77 |
- "${FILESDIR}/1.8.1-fix-buffer-overflow.patch" |
78 |
- "${FILESDIR}/1.8.1-parallel-build.patch" |
79 |
- "${FILESDIR}/1.8.1-libgcrypt.patch" |
80 |
- "${FILESDIR}/1.8.1-fix-c++14.patch" |
81 |
-) |
82 |
- |
83 |
-src_prepare() { |
84 |
- default |
85 |
- eautoreconf |
86 |
-} |
87 |
- |
88 |
-src_configure() { |
89 |
- use ssl && local myconf=( $(usex gnutls '--with-gnutls' '--with-openssl') ) |
90 |
- |
91 |
- econf \ |
92 |
- $(use_enable debug) \ |
93 |
- $(use_with ipv6) \ |
94 |
- $(use_enable static-libs static) \ |
95 |
- $(use_with doc doxygen) \ |
96 |
- "${myconf[@]}" |
97 |
-} |
98 |
- |
99 |
-src_install () { |
100 |
- # Only install html docs |
101 |
- # man and latex available, but seems a little wasteful |
102 |
- use doc && HTML_DOCS=( doc/html/. ) |
103 |
- default |
104 |
- dodoc COPYING.addendum |
105 |
- |
106 |
- if use examples; then |
107 |
- docinto examples |
108 |
- dodoc demo/{*.cpp,*.h,*.xml,README} |
109 |
- docompress -x /usr/share/doc/${PF}/examples |
110 |
- fi |
111 |
- |
112 |
- # package provides .pc files |
113 |
- find "${D}" -name '*.la' -delete || die |
114 |
-} |
115 |
|
116 |
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild |
117 |
deleted file mode 100644 |
118 |
index f381318..0000000 |
119 |
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild |
120 |
+++ /dev/null |
121 |
@@ -1,76 +0,0 @@ |
122 |
-# Copyright 1999-2017 Gentoo Foundation |
123 |
-# Distributed under the terms of the GNU General Public License v2 |
124 |
- |
125 |
-EAPI=6 |
126 |
- |
127 |
-inherit autotools eutils |
128 |
- |
129 |
-DESCRIPTION="C++ library offering portable support for system-related services" |
130 |
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" |
131 |
-HOMEPAGE="https://www.gnu.org/software/commoncpp/" |
132 |
-LICENSE="GPL-2" |
133 |
-SLOT="0" |
134 |
-KEYWORDS="amd64 ppc ppc64 x86" |
135 |
-IUSE="debug doc examples ipv6 gnutls libressl ssl static-libs" |
136 |
- |
137 |
-RDEPEND=" |
138 |
- sys-libs/zlib |
139 |
- ssl? ( |
140 |
- gnutls? ( |
141 |
- dev-libs/libgcrypt:0= |
142 |
- net-libs/gnutls:= |
143 |
- ) |
144 |
- !gnutls? ( |
145 |
- !libressl? ( dev-libs/openssl:0= ) |
146 |
- libressl? ( dev-libs/libressl:= ) |
147 |
- ) |
148 |
- )" |
149 |
-DEPEND="${RDEPEND} |
150 |
- doc? ( >=app-doc/doxygen-1.3.6 )" |
151 |
- |
152 |
-HTML_DOCS=() |
153 |
- |
154 |
-PATCHES=( |
155 |
- "${FILESDIR}/1.8.1-no-ssl3.patch" |
156 |
- "${FILESDIR}/1.8.1-configure_detect_netfilter.patch" |
157 |
- "${FILESDIR}/1.8.0-glibc212.patch" |
158 |
- "${FILESDIR}/1.8.1-autoconf-update.patch" |
159 |
- "${FILESDIR}/1.8.1-fix-buffer-overflow.patch" |
160 |
- "${FILESDIR}/1.8.1-parallel-build.patch" |
161 |
- "${FILESDIR}/1.8.1-libgcrypt.patch" |
162 |
- "${FILESDIR}/1.8.1-fix-c++14.patch" |
163 |
- "${FILESDIR}/1.8.1-gnutls-3.4.patch" |
164 |
-) |
165 |
- |
166 |
-pkg_setup() { |
167 |
- use doc && HTML_DOCS+=( doc/html/. ) |
168 |
-} |
169 |
- |
170 |
-src_prepare() { |
171 |
- default |
172 |
- eautoreconf |
173 |
-} |
174 |
- |
175 |
-src_configure() { |
176 |
- use ssl && local myconf=( $(usex gnutls '--with-gnutls' '--with-openssl') ) |
177 |
- |
178 |
- econf \ |
179 |
- $(use_enable debug) \ |
180 |
- $(use_with ipv6) \ |
181 |
- $(use_enable static-libs static) \ |
182 |
- $(use_with doc doxygen) \ |
183 |
- "${myconf[@]}" |
184 |
-} |
185 |
- |
186 |
-src_install () { |
187 |
- default |
188 |
- prune_libtool_files |
189 |
- |
190 |
- dodoc COPYING.addendum |
191 |
- |
192 |
- if use examples; then |
193 |
- docinto examples |
194 |
- dodoc demo/{*.cpp,*.h,*.xml,README} |
195 |
- docompress -x /usr/share/doc/${PF}/examples |
196 |
- fi |
197 |
-} |
198 |
|
199 |
diff --git a/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch b/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch |
200 |
deleted file mode 100644 |
201 |
index 5132554..0000000 |
202 |
--- a/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch |
203 |
+++ /dev/null |
204 |
@@ -1,12 +0,0 @@ |
205 |
-http://bugs.gentoo.org/334135 |
206 |
- |
207 |
---- a/src/applog.cpp |
208 |
-+++ b/src/applog.cpp |
209 |
-@@ -44,6 +44,7 @@ |
210 |
- #include <cstdio> |
211 |
- #include <stdarg.h> |
212 |
- #include <errno.h> |
213 |
-+#include <sys/stat.h> |
214 |
- |
215 |
- // TODO sc: test if has to move up now that it is into commoncpp |
216 |
- // NOTE: the order of inclusion is important do not move following include line |
217 |
|
218 |
diff --git a/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch b/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch |
219 |
deleted file mode 100644 |
220 |
index c64ba2f..0000000 |
221 |
--- a/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch |
222 |
+++ /dev/null |
223 |
@@ -1,61 +0,0 @@ |
224 |
---- a/configure.ac |
225 |
-+++ b/configure.ac |
226 |
-@@ -9,7 +9,8 @@ |
227 |
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the |
228 |
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
229 |
- |
230 |
--AC_INIT(src/thread.cpp) |
231 |
-+AC_INIT |
232 |
-+AC_CONFIG_SRCDIR([src/thread.cpp]) |
233 |
- AC_CONFIG_MACRO_DIR([m4]) |
234 |
- m4_pattern_allow(LT_VERSION) |
235 |
- |
236 |
-@@ -81,17 +82,17 @@ |
237 |
- AC_SUBST(ccincludedir) |
238 |
- |
239 |
- AC_CONFIG_AUX_DIR(autoconf) |
240 |
--AC_CANONICAL_SYSTEM |
241 |
-+AC_CANONICAL_TARGET |
242 |
- AC_PROG_CPP |
243 |
- AC_PROG_CC |
244 |
- AC_PROG_CXXCPP |
245 |
- AC_PROG_CXX |
246 |
- OST_PROG_CC_POSIX |
247 |
- NP_PROG_MSC |
248 |
--AC_LIBTOOL_WIN32_DLL |
249 |
--AM_PROG_LIBTOOL |
250 |
-+ |
251 |
-+LT_INIT([win32-dll,disable-static]) |
252 |
- AM_INIT_AUTOMAKE(commoncpp2, [$VERSION]) |
253 |
--AM_CONFIG_HEADER(config.h) |
254 |
-+AC_CONFIG_HEADERS([config.h]) |
255 |
- |
256 |
- AC_C_RESTRICT |
257 |
- AC_C_VOLATILE |
258 |
-@@ -395,10 +396,11 @@ |
259 |
- #endif |
260 |
- |
261 |
- ]) |
262 |
-- |
263 |
-+AC_ARG_WITH([doxygen], |
264 |
-+ AS_HELP_STRING([--without-doxygen], [Do not build documentation])) |
265 |
- AC_PATH_PROG(DOXYGEN, doxygen, no) |
266 |
- AC_SUBST(DOXYGEN) |
267 |
--AM_CONDITIONAL(DOXY, test "$DOXYGEN" != "no") |
268 |
-+AM_CONDITIONAL([DOXY], [test "x$with_doxygen" != "xno"]) |
269 |
- |
270 |
- AM_CONDITIONAL(GETOPT_LONG, [test ! -z "$LIBGETOPTOBJS"]) |
271 |
- |
272 |
-@@ -408,10 +410,11 @@ |
273 |
- AC_SUBST(LIB_VERSION) |
274 |
- AC_SUBST(LIB_MAJOR) |
275 |
- |
276 |
--AC_OUTPUT([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc |
277 |
-+AC_CONFIG_FILES([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc |
278 |
- src/Makefile w32/Makefile w32/vs2008/Makefile w32/vs2008/ccext2.vcproj w32/vs2008/ccgnu2.vcproj w32/vs2008/common.sln m4/Makefile doc/Doxyfile |
279 |
- doc/Makefile demo/Makefile inc/Makefile inc/cc++/Makefile Makefile |
280 |
- commoncpp2.spec tests/Makefile commoncpp2.list w32/ccgnu2.dsp w32/ccext2.dsp w32/ccgnu2.vcproj w32/ccext2.vcproj]) |
281 |
-+AC_OUTPUT |
282 |
- |
283 |
- # if test ! -f inc/cc++/thread.h ; then |
284 |
- # cp ${srcdir}/inc/cc++/*.h inc/cc++ ; fi |
285 |
|
286 |
diff --git a/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch b/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch |
287 |
deleted file mode 100644 |
288 |
index b6ebf0e..0000000 |
289 |
--- a/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch |
290 |
+++ /dev/null |
291 |
@@ -1,14 +0,0 @@ |
292 |
-diff --git a/m4/ost_socket.m4 b/m4/ost_socket.m4 |
293 |
-index bd9db7c..122c938 100644 |
294 |
---- a/m4/ost_socket.m4 |
295 |
-+++ b/m4/ost_socket.m4 |
296 |
-@@ -93,6 +93,9 @@ AC_DEFUN([OST_SYS_SOCKET],[ |
297 |
- AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,, |
298 |
- [#ifdef HAVE_LIMITS_H |
299 |
- #include <limits.h> |
300 |
-+ #endif |
301 |
-+ #ifdef HAVE_NETINET_IN_H |
302 |
-+ #include <netinet/in.h> |
303 |
- #endif]) |
304 |
- if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" && |
305 |
- [ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" && |
306 |
|
307 |
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch |
308 |
deleted file mode 100644 |
309 |
index e68b005..0000000 |
310 |
--- a/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch |
311 |
+++ /dev/null |
312 |
@@ -1,13 +0,0 @@ |
313 |
-diff --git a/src/inaddr.cpp b/src/inaddr.cpp |
314 |
-index 5a4b9c4..50127f3 100644 |
315 |
---- a/src/inaddr.cpp |
316 |
-+++ b/src/inaddr.cpp |
317 |
-@@ -333,7 +333,7 @@ void IPV4Address::setAddress(const char *host) |
318 |
- if(ipaddr) |
319 |
- delete[] ipaddr; |
320 |
- ipaddr = new struct in_addr[1]; |
321 |
-- memset((void *)&ipaddr[0], 0, sizeof(ipaddr)); |
322 |
-+ memset((void *)&ipaddr[0], 0, sizeof(*ipaddr)); |
323 |
- return; |
324 |
- } |
325 |
- |
326 |
|
327 |
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch |
328 |
deleted file mode 100644 |
329 |
index cc92106..0000000 |
330 |
--- a/dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch |
331 |
+++ /dev/null |
332 |
@@ -1,52 +0,0 @@ |
333 |
-Fix building with C++14, which errors out due changed noexcept() |
334 |
-semantics for dtors caught by -Werror=terminate. |
335 |
- |
336 |
-See also: https://bugs.gentoo.org/show_bug.cgi?id=595422 |
337 |
- |
338 |
---- a/src/nat.cpp |
339 |
-+++ b/src/nat.cpp |
340 |
-@@ -145,11 +145,11 @@ |
341 |
- "nat lookup successful", |
342 |
- "nat address not in table", |
343 |
- "nat not supported/implemented", |
344 |
-- "unable to open device "NAT_DEVICE, |
345 |
-+ "unable to open device " NAT_DEVICE, |
346 |
- "unable to get socket name", |
347 |
- "unable to get peer name", |
348 |
- "unable to get socket type", |
349 |
-- "unable to lookup, nat "NAT_SYSCALL" failed", |
350 |
-+ "unable to lookup, nat " NAT_SYSCALL " failed", |
351 |
- "unkown nat error code" |
352 |
- }; |
353 |
- |
354 |
---- a/src/socket.cpp |
355 |
-+++ b/src/socket.cpp |
356 |
-@@ -2971,12 +2971,7 @@ |
357 |
- |
358 |
- TCPStream::~TCPStream() |
359 |
- { |
360 |
--#ifdef CCXX_EXCEPTIONS |
361 |
-- try { endStream(); } |
362 |
-- catch( ... ) { if ( ! std::uncaught_exception()) throw;}; |
363 |
--#else |
364 |
-- endStream(); |
365 |
--#endif |
366 |
-+ endStream(); |
367 |
- } |
368 |
- |
369 |
- #ifdef HAVE_GETADDRINFO |
370 |
---- a/src/ssl.cpp |
371 |
-+++ b/src/ssl.cpp |
372 |
-@@ -441,12 +441,7 @@ |
373 |
- |
374 |
- SSLStream::~SSLStream() |
375 |
- { |
376 |
--#ifdef CCXX_EXCEPTIONS |
377 |
-- try { endStream(); } |
378 |
-- catch( ...) { if ( ! std::uncaught_exception()) throw;}; |
379 |
--#else |
380 |
- endStream(); |
381 |
--#endif |
382 |
- } |
383 |
- |
384 |
- #ifdef CCXX_NAMESPACES |
385 |
|
386 |
diff --git a/dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch b/dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch |
387 |
deleted file mode 100644 |
388 |
index b7365b8..0000000 |
389 |
--- a/dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch |
390 |
+++ /dev/null |
391 |
@@ -1,36 +0,0 @@ |
392 |
-From ba702b6034444c2e30b0990d06e28bb2dea8ecb7 Mon Sep 17 00:00:00 2001 |
393 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
394 |
-Date: Sat, 4 Mar 2017 01:36:23 +0200 |
395 |
-Subject: [PATCH] ssl: support gnutls-3.4 |
396 |
- |
397 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
398 |
---- |
399 |
- src/ssl.cpp | 5 +---- |
400 |
- 1 file changed, 1 insertion(+), 4 deletions(-) |
401 |
- |
402 |
-diff --git a/src/ssl.cpp b/src/ssl.cpp |
403 |
-index 5bf526d..38ef0a7 100644 |
404 |
---- a/src/ssl.cpp |
405 |
-+++ b/src/ssl.cpp |
406 |
-@@ -344,9 +344,6 @@ ssize_t SSLStream::readData(void *target, size_t size, char separator, timeout_t |
407 |
- #ifdef CCXX_GNUTLS |
408 |
- bool SSLStream::getSession(void) |
409 |
- { |
410 |
-- const int cert_priority[3] = |
411 |
-- {GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0}; |
412 |
-- |
413 |
- if(ssl) |
414 |
- return true; |
415 |
- |
416 |
-@@ -362,7 +359,7 @@ bool SSLStream::getSession(void) |
417 |
- |
418 |
- gnutls_set_default_priority(ssl->session); |
419 |
- gnutls_certificate_allocate_credentials(&ssl->xcred); |
420 |
-- gnutls_certificate_type_set_priority(ssl->session, cert_priority); |
421 |
-+ gnutls_priority_set_direct(ssl->session, "NORMAL:+CTYPE-OPENPGP", NULL); |
422 |
- gnutls_credentials_set(ssl->session, GNUTLS_CRD_CERTIFICATE, ssl->xcred); |
423 |
- gnutls_transport_set_ptr(ssl->session, (gnutls_transport_ptr)so); |
424 |
- if(gnutls_handshake(ssl->session)) { |
425 |
--- |
426 |
-2.10.2 |
427 |
- |
428 |
|
429 |
diff --git a/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch b/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch |
430 |
deleted file mode 100644 |
431 |
index 08e24e1..0000000 |
432 |
--- a/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch |
433 |
+++ /dev/null |
434 |
@@ -1,48 +0,0 @@ |
435 |
---- a/src/ssl.cpp |
436 |
-+++ b/src/ssl.cpp |
437 |
-@@ -99,35 +99,7 @@ |
438 |
- return 0; |
439 |
- } |
440 |
- |
441 |
--extern "C" { |
442 |
-- static int _wrap_mutex_init(void **priv) |
443 |
-- { |
444 |
-- return _gcry_mutex_init((Mutex **)(priv)); |
445 |
-- } |
446 |
-- |
447 |
-- static int _wrap_mutex_destroy(void **priv) |
448 |
-- { |
449 |
-- return _gcry_mutex_destroy((Mutex **)(priv)); |
450 |
-- } |
451 |
-- |
452 |
-- static int _wrap_mutex_lock(void **priv) |
453 |
-- { |
454 |
-- return _gcry_mutex_lock((Mutex **)(priv)); |
455 |
-- } |
456 |
-- |
457 |
-- static int _wrap_mutex_unlock(void **priv) |
458 |
-- { |
459 |
-- return _gcry_mutex_unlock((Mutex **)(priv)); |
460 |
-- } |
461 |
-- |
462 |
-- static struct gcry_thread_cbs _gcry_threads = |
463 |
-- { |
464 |
-- GCRY_THREAD_OPTION_PTHREAD, NULL, |
465 |
-- _wrap_mutex_init, _wrap_mutex_destroy, |
466 |
-- _wrap_mutex_lock, _wrap_mutex_unlock |
467 |
-- }; |
468 |
-- |
469 |
--}; |
470 |
-+GCRY_THREAD_OPTION_PTHREAD_IMPL; |
471 |
- |
472 |
- #endif |
473 |
- |
474 |
-@@ -135,7 +107,7 @@ |
475 |
- public: |
476 |
- _ssl_global() { |
477 |
- #ifndef WIN32 |
478 |
-- gcry_control(GCRYCTL_SET_THREAD_CBS, &_gcry_threads); |
479 |
-+ gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); |
480 |
- #endif |
481 |
- gnutls_global_init(); |
482 |
- } |
483 |
|
484 |
diff --git a/dev-cpp/commoncpp2/files/1.8.1-no-ssl3.patch b/dev-cpp/commoncpp2/files/1.8.1-no-ssl3.patch |
485 |
deleted file mode 100644 |
486 |
index 565b78e..0000000 |
487 |
--- a/dev-cpp/commoncpp2/files/1.8.1-no-ssl3.patch |
488 |
+++ /dev/null |
489 |
@@ -1,11 +0,0 @@ |
490 |
---- a/src/ssl.cpp 2010-11-01 09:42:51.000000000 +0000 |
491 |
-+++ b/src/ssl.cpp 2015-12-27 15:23:27.911040525 +0000 |
492 |
-@@ -386,7 +386,7 @@ |
493 |
- if(so == INVALID_SOCKET) |
494 |
- return false; |
495 |
- |
496 |
-- ctx = SSL_CTX_new(SSLv3_client_method()); |
497 |
-+ ctx = SSL_CTX_new(SSLv23_client_method()); |
498 |
- if(!ctx) { |
499 |
- SSL_CTX_free(ctx); |
500 |
- return false; |
501 |
|
502 |
diff --git a/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch b/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch |
503 |
deleted file mode 100644 |
504 |
index 149677c..0000000 |
505 |
--- a/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch |
506 |
+++ /dev/null |
507 |
@@ -1,11 +0,0 @@ |
508 |
---- a/src/Makefile.am |
509 |
-+++ b/src/Makefile.am |
510 |
-@@ -47,6 +47,7 @@ |
511 |
- |
512 |
- if EXTRAS |
513 |
- libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@ |
514 |
-+libccext2_la_DEPENDENCIES = libccgnu2.la |
515 |
- libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS) |
516 |
- |
517 |
- if GETOPT_LONG |
518 |
- |
519 |
|
520 |
diff --git a/dev-cpp/commoncpp2/metadata.xml b/dev-cpp/commoncpp2/metadata.xml |
521 |
deleted file mode 100644 |
522 |
index 41cd682..0000000 |
523 |
--- a/dev-cpp/commoncpp2/metadata.xml |
524 |
+++ /dev/null |
525 |
@@ -1,8 +0,0 @@ |
526 |
-<?xml version="1.0" encoding="UTF-8"?> |
527 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
528 |
-<pkgmetadata> |
529 |
-<maintainer type="project"> |
530 |
- <email>cpp@g.o</email> |
531 |
- <name>Gentoo C++ Project</name> |
532 |
-</maintainer> |
533 |
-</pkgmetadata> |