Gentoo Archives: gentoo-commits

From: Stefan Strogin <stefan.strogin@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-cpp/commoncpp2/, dev-cpp/commoncpp2/files/
Date: Thu, 28 Feb 2019 23:13:40
Message-Id: 1551395435.193076f4126a8ce06a971549dabc48c080d0f9d5.steils@gentoo
commit:     193076f4126a8ce06a971549dabc48c080d0f9d5
Author:     Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
AuthorDate: Thu Feb 28 23:08:30 2019 +0000
Commit:     Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
CommitDate: Thu Feb 28 23:10:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=193076f4

dev-cpp/commoncpp2: drop; fixed in gentoo.git

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com>

 dev-cpp/commoncpp2/Manifest                        |  1 -
 dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild      | 73 ---------------------
 dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild      | 76 ----------------------
 dev-cpp/commoncpp2/files/1.8.0-glibc212.patch      | 12 ----
 .../commoncpp2/files/1.8.1-autoconf-update.patch   | 61 -----------------
 .../files/1.8.1-configure_detect_netfilter.patch   | 14 ----
 .../files/1.8.1-fix-buffer-overflow.patch          | 13 ----
 dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch     | 52 ---------------
 dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch    | 36 ----------
 dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch     | 48 --------------
 dev-cpp/commoncpp2/files/1.8.1-no-ssl3.patch       | 11 ----
 .../commoncpp2/files/1.8.1-parallel-build.patch    | 11 ----
 dev-cpp/commoncpp2/metadata.xml                    |  8 ---
 13 files changed, 416 deletions(-)

diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
deleted file mode 100644
index 28191af..0000000
--- a/dev-cpp/commoncpp2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST commoncpp2-1.8.1.tar.gz 908678 SHA256 53ced4aff74e28a1d8018eb2b4974519028db3c12471ab6dff1c873578c9af4e SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe WHIRLPOOL 1844cf39ce0a087aaea1cfac1e712b52f81de594278facb70306d68cd3e3343c0d2c581886b4fe3ce7607eb52150c5cf1c9558d0fac0ee7d8730eff39b46bb64

diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild
deleted file mode 100644
index f8d9a0e..0000000
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="C++ library offering portable support for system-related services"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-HOMEPAGE="https://www.gnu.org/software/commoncpp/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc examples ipv6 gnutls libressl ssl static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:0=
-			net-libs/gnutls:=
-		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.3.6 )"
-
-PATCHES=(
-	"${FILESDIR}/1.8.1-no-ssl3.patch"
-	"${FILESDIR}/1.8.1-configure_detect_netfilter.patch"
-	"${FILESDIR}/1.8.0-glibc212.patch"
-	"${FILESDIR}/1.8.1-autoconf-update.patch"
-	"${FILESDIR}/1.8.1-fix-buffer-overflow.patch"
-	"${FILESDIR}/1.8.1-parallel-build.patch"
-	"${FILESDIR}/1.8.1-libgcrypt.patch"
-	"${FILESDIR}/1.8.1-fix-c++14.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use ssl && local myconf=( $(usex gnutls '--with-gnutls' '--with-openssl') )
-
-	econf \
-		$(use_enable debug) \
-		$(use_with ipv6) \
-		$(use_enable static-libs static) \
-		$(use_with doc doxygen) \
-		"${myconf[@]}"
-}
-
-src_install () {
-	# Only install html docs
-	# man and latex available, but seems a little wasteful
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	dodoc COPYING.addendum
-
-	if use examples; then
-		docinto examples
-		dodoc demo/{*.cpp,*.h,*.xml,README}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}

diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild
deleted file mode 100644
index f381318..0000000
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="C++ library offering portable support for system-related services"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-HOMEPAGE="https://www.gnu.org/software/commoncpp/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc examples ipv6 gnutls libressl ssl static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:0=
-			net-libs/gnutls:=
-		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.3.6 )"
-
-HTML_DOCS=()
-
-PATCHES=(
-	"${FILESDIR}/1.8.1-no-ssl3.patch"
-	"${FILESDIR}/1.8.1-configure_detect_netfilter.patch"
-	"${FILESDIR}/1.8.0-glibc212.patch"
-	"${FILESDIR}/1.8.1-autoconf-update.patch"
-	"${FILESDIR}/1.8.1-fix-buffer-overflow.patch"
-	"${FILESDIR}/1.8.1-parallel-build.patch"
-	"${FILESDIR}/1.8.1-libgcrypt.patch"
-	"${FILESDIR}/1.8.1-fix-c++14.patch"
-	"${FILESDIR}/1.8.1-gnutls-3.4.patch"
-)
-
-pkg_setup() {
-	use doc && HTML_DOCS+=( doc/html/. )
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use ssl && local myconf=( $(usex gnutls '--with-gnutls' '--with-openssl') )
-
-	econf \
-		$(use_enable debug) \
-		$(use_with ipv6) \
-		$(use_enable static-libs static) \
-		$(use_with doc doxygen) \
-		"${myconf[@]}"
-}
-
-src_install () {
-	default
-	prune_libtool_files
-
-	dodoc COPYING.addendum
-
-	if use examples; then
-		docinto examples
-		dodoc demo/{*.cpp,*.h,*.xml,README}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}

diff --git a/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch b/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch
deleted file mode 100644
index 5132554..0000000
--- a/dev-cpp/commoncpp2/files/1.8.0-glibc212.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/334135
-
---- a/src/applog.cpp
-+++ b/src/applog.cpp
-@@ -44,6 +44,7 @@
- #include <cstdio>
- #include <stdarg.h>
- #include <errno.h>
-+#include <sys/stat.h>
- 
- // TODO sc: test if has to move up now that it is into commoncpp
- // NOTE: the order of inclusion is important do not move following include line

diff --git a/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch b/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch
deleted file mode 100644
index c64ba2f..0000000
--- a/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,7 +9,8 @@
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
--AC_INIT(src/thread.cpp)
-+AC_INIT
-+AC_CONFIG_SRCDIR([src/thread.cpp])
- AC_CONFIG_MACRO_DIR([m4])
- m4_pattern_allow(LT_VERSION)
- 
-@@ -81,17 +82,17 @@
- AC_SUBST(ccincludedir)
- 
- AC_CONFIG_AUX_DIR(autoconf)
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET
- AC_PROG_CPP
- AC_PROG_CC
- AC_PROG_CXXCPP
- AC_PROG_CXX
- OST_PROG_CC_POSIX
- NP_PROG_MSC
--AC_LIBTOOL_WIN32_DLL
--AM_PROG_LIBTOOL
-+
-+LT_INIT([win32-dll,disable-static])
- AM_INIT_AUTOMAKE(commoncpp2, [$VERSION])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- 
- AC_C_RESTRICT
- AC_C_VOLATILE
-@@ -395,10 +396,11 @@
- #endif
- 
- ])
--
-+AC_ARG_WITH([doxygen],
-+    AS_HELP_STRING([--without-doxygen], [Do not build documentation]))
- AC_PATH_PROG(DOXYGEN, doxygen, no)
- AC_SUBST(DOXYGEN)
--AM_CONDITIONAL(DOXY, test "$DOXYGEN" != "no")
-+AM_CONDITIONAL([DOXY], [test "x$with_doxygen" != "xno"])
- 
- AM_CONDITIONAL(GETOPT_LONG, [test ! -z "$LIBGETOPTOBJS"])
- 
-@@ -408,10 +410,11 @@
- AC_SUBST(LIB_VERSION)
- AC_SUBST(LIB_MAJOR)
- 
--AC_OUTPUT([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
-+AC_CONFIG_FILES([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
- src/Makefile w32/Makefile w32/vs2008/Makefile w32/vs2008/ccext2.vcproj w32/vs2008/ccgnu2.vcproj w32/vs2008/common.sln m4/Makefile doc/Doxyfile
- doc/Makefile demo/Makefile inc/Makefile inc/cc++/Makefile Makefile
- commoncpp2.spec tests/Makefile commoncpp2.list w32/ccgnu2.dsp w32/ccext2.dsp w32/ccgnu2.vcproj w32/ccext2.vcproj])
-+AC_OUTPUT
- 
- # if test ! -f inc/cc++/thread.h ; then
- #   cp ${srcdir}/inc/cc++/*.h inc/cc++ ; fi

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
deleted file mode 100644
index b6ebf0e..0000000
--- a/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/m4/ost_socket.m4 b/m4/ost_socket.m4
-index bd9db7c..122c938 100644
---- a/m4/ost_socket.m4
-+++ b/m4/ost_socket.m4
-@@ -93,6 +93,9 @@ AC_DEFUN([OST_SYS_SOCKET],[
-                 AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,,
-                     [#ifdef HAVE_LIMITS_H
-                     #include <limits.h>
-+                    #endif
-+                    #ifdef HAVE_NETINET_IN_H
-+                    #include <netinet/in.h>
-                     #endif])
-                 if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" &&
-                    [ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" &&

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
deleted file mode 100644
index e68b005..0000000
--- a/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/inaddr.cpp b/src/inaddr.cpp
-index 5a4b9c4..50127f3 100644
---- a/src/inaddr.cpp
-+++ b/src/inaddr.cpp
-@@ -333,7 +333,7 @@ void IPV4Address::setAddress(const char *host)
-             if(ipaddr)
-                 delete[] ipaddr;
-             ipaddr = new struct in_addr[1];
--            memset((void *)&ipaddr[0], 0, sizeof(ipaddr));
-+            memset((void *)&ipaddr[0], 0, sizeof(*ipaddr));
-             return;
-         }
- 

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
deleted file mode 100644
index cc92106..0000000
--- a/dev-cpp/commoncpp2/files/1.8.1-fix-c++14.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix building with C++14, which errors out due changed noexcept()
-semantics for dtors caught by -Werror=terminate.
-
-See also: https://bugs.gentoo.org/show_bug.cgi?id=595422
-
---- a/src/nat.cpp
-+++ b/src/nat.cpp
-@@ -145,11 +145,11 @@
-     "nat lookup successful",
-     "nat address not in table",
-     "nat not supported/implemented",
--    "unable to open device "NAT_DEVICE,
-+    "unable to open device " NAT_DEVICE,
-     "unable to get socket name",
-     "unable to get peer name",
-     "unable to get socket type",
--    "unable to lookup, nat "NAT_SYSCALL" failed",
-+    "unable to lookup, nat " NAT_SYSCALL " failed",
-     "unkown nat error code"
- };
- 
---- a/src/socket.cpp
-+++ b/src/socket.cpp
-@@ -2971,12 +2971,7 @@
- 
- TCPStream::~TCPStream()
- {
--#ifdef  CCXX_EXCEPTIONS
--        try { endStream(); }
--        catch( ... ) { if ( ! std::uncaught_exception()) throw;};
--#else
--        endStream();
--#endif
-+    endStream();
- }
- 
- #ifdef  HAVE_GETADDRINFO
---- a/src/ssl.cpp
-+++ b/src/ssl.cpp
-@@ -441,12 +441,7 @@
- 
- SSLStream::~SSLStream()
- {
--#ifdef  CCXX_EXCEPTIONS
--    try { endStream(); }
--    catch( ...) { if ( ! std::uncaught_exception()) throw;};
--#else
-     endStream();
--#endif
- }
- 
- #ifdef  CCXX_NAMESPACES

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
deleted file mode 100644
index b7365b8..0000000
--- a/dev-cpp/commoncpp2/files/1.8.1-gnutls-3.4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ba702b6034444c2e30b0990d06e28bb2dea8ecb7 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@×××××.com>
-Date: Sat, 4 Mar 2017 01:36:23 +0200
-Subject: [PATCH] ssl: support gnutls-3.4
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com>
----
- src/ssl.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/ssl.cpp b/src/ssl.cpp
-index 5bf526d..38ef0a7 100644
---- a/src/ssl.cpp
-+++ b/src/ssl.cpp
-@@ -344,9 +344,6 @@ ssize_t SSLStream::readData(void *target, size_t size, char separator, timeout_t
- #ifdef  CCXX_GNUTLS
- bool SSLStream::getSession(void)
- {
--        const int cert_priority[3] =
--        {GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0};
--
-     if(ssl)
-         return true;
- 
-@@ -362,7 +359,7 @@ bool SSLStream::getSession(void)
- 
-     gnutls_set_default_priority(ssl->session);
-     gnutls_certificate_allocate_credentials(&ssl->xcred);
--    gnutls_certificate_type_set_priority(ssl->session, cert_priority);
-+    gnutls_priority_set_direct(ssl->session, "NORMAL:+CTYPE-OPENPGP", NULL);
-     gnutls_credentials_set(ssl->session, GNUTLS_CRD_CERTIFICATE, ssl->xcred);
-     gnutls_transport_set_ptr(ssl->session, (gnutls_transport_ptr)so);
-     if(gnutls_handshake(ssl->session)) {
--- 
-2.10.2
-

diff --git a/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch b/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch
deleted file mode 100644
index 08e24e1..0000000
--- a/dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/src/ssl.cpp
-+++ b/src/ssl.cpp
-@@ -99,35 +99,7 @@
-     return 0;
- }
- 
--extern "C" {
--    static int _wrap_mutex_init(void **priv)
--    {
--        return _gcry_mutex_init((Mutex **)(priv));
--    }
--
--    static int _wrap_mutex_destroy(void **priv)
--    {
--        return _gcry_mutex_destroy((Mutex **)(priv));
--    }
--
--    static int _wrap_mutex_lock(void **priv)
--    {
--        return _gcry_mutex_lock((Mutex **)(priv));
--    }
--
--    static int _wrap_mutex_unlock(void **priv)
--    {
--        return _gcry_mutex_unlock((Mutex **)(priv));
--    }
--
--    static struct gcry_thread_cbs _gcry_threads =
--    {
--        GCRY_THREAD_OPTION_PTHREAD, NULL,
--        _wrap_mutex_init, _wrap_mutex_destroy,
--        _wrap_mutex_lock, _wrap_mutex_unlock
--    };
--
--};
-+GCRY_THREAD_OPTION_PTHREAD_IMPL;
- 
- #endif
- 
-@@ -135,7 +107,7 @@
- public:
-     _ssl_global() {
- #ifndef WIN32
--        gcry_control(GCRYCTL_SET_THREAD_CBS, &_gcry_threads);
-+        gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
- #endif
-         gnutls_global_init();
-     }

diff --git a/dev-cpp/commoncpp2/files/1.8.1-no-ssl3.patch b/dev-cpp/commoncpp2/files/1.8.1-no-ssl3.patch
deleted file mode 100644
index 565b78e..0000000
--- a/dev-cpp/commoncpp2/files/1.8.1-no-ssl3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/ssl.cpp	2010-11-01 09:42:51.000000000 +0000
-+++ b/src/ssl.cpp	2015-12-27 15:23:27.911040525 +0000
-@@ -386,7 +386,7 @@
-     if(so == INVALID_SOCKET)
-         return false;
- 
--    ctx = SSL_CTX_new(SSLv3_client_method());
-+    ctx = SSL_CTX_new(SSLv23_client_method());
-     if(!ctx) {
-         SSL_CTX_free(ctx);
-         return false;

diff --git a/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch b/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch
deleted file mode 100644
index 149677c..0000000
--- a/dev-cpp/commoncpp2/files/1.8.1-parallel-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -47,6 +47,7 @@
- 
- if EXTRAS
- libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@
-+libccext2_la_DEPENDENCIES = libccgnu2.la
- libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
- 
- if GETOPT_LONG
-

diff --git a/dev-cpp/commoncpp2/metadata.xml b/dev-cpp/commoncpp2/metadata.xml
deleted file mode 100644
index 41cd682..0000000
--- a/dev-cpp/commoncpp2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cpp@g.o</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
-</pkgmetadata>