diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
| commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
| tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /dev-cpp/commoncpp2 | |
| parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) | |
gentoo resync : 04.05.2021
Diffstat (limited to 'dev-cpp/commoncpp2')
| -rw-r--r-- | dev-cpp/commoncpp2/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild | 8 | ||||
| -rw-r--r-- | dev-cpp/commoncpp2/files/1.8.1-libressl.patch | 15 |
3 files changed, 4 insertions, 22 deletions
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest index 1c37a50dd8a0..628cf8fe6e8f 100644 --- a/dev-cpp/commoncpp2/Manifest +++ b/dev-cpp/commoncpp2/Manifest @@ -6,8 +6,7 @@ AUX 1.8.1-fix-c++14.patch 1220 BLAKE2B 10df79cc01b26b5df35ede979743cc2d18598fb47 AUX 1.8.1-fix-gcc9.patch 1222 BLAKE2B d5f93bb1f34ef563d6cf88007f859891e49a8e5bb561a9f702346407c1b3e6bd3fa535b6d0c3ceaefb6b50ef094aa2e91895565b893b453e774de8cc62fa5843 SHA512 b8c2b4a530418bedfa73b89fe8b4e659e38141ca9f4998d4f5217cfc05355263408e7ec2f726e5f8e8283165725c38c454ce92dd8d3cdf920858d70e63070199 AUX 1.8.1-gnutls-3.4.patch 1229 BLAKE2B a4936cce4fff5a7935c2bd077add555fa8d9b229afaaec545e78c1f6a7d34f35f7168c2381183ceaf4fd56bd1318a9505305ae59e77c87d9813f485e1aa6936d SHA512 92db4deba0ae612fda5873224641d35d5637a48d553d0afee7749c5477ca19a62640656d4781d101db5b545ddd962ce7c11a6edf33d128b031cafebf3cf6db77 AUX 1.8.1-libgcrypt.patch 1054 BLAKE2B fc96efbbc132972035ca9622cd21427e8d662a3ee3aa3972690305ca14da04d7665b17d33f4b9d16e5128575ee4d378e031b57cc579d777845fc65c3cbab4abe SHA512 76f444739b370681d1b619b78cc77867da197f149c19d036d9d8b430a7a59d697c7ab30529582c308f77bc584a003dc0701d8c06003329589ade652babe5edd2 -AUX 1.8.1-libressl.patch 427 BLAKE2B 2943df26ccd7401b845200ab263a531dbeacab4bfd6a280b0597191b391d45e218946fc5cf1e5230bd066b30270b6fd5f9d2e78e26472598ddedb4eb81827417 SHA512 9ef9a53cc4eb60e72a0049e7b3012df487ca3383c2a1908998df04dd37743125057614a235f9995c3840ade4bd96c19f13e1fa2c726b44c9a0f4fdbcb707a874 AUX 1.8.1-parallel-build.patch 261 BLAKE2B 71e639f976d1c1893f7e3285cecda841f4c90b1c2a153edda527c47804df8821a14a3c340544a9e0860fb4047af2772f036c0e10380b4025b4538e40082046b2 SHA512 e06ca32ffd811897859ef7bf06f3b7998eaa56c7fcbb01f971ec32b6e75c4242e3a2ed5a1bdaa28c02bae08bfbb386d65ebed3e50e2de759d056f085f1f49c1f DIST commoncpp2-1.8.1.tar.gz 908678 BLAKE2B 93868286230b4b0507127627f0a1c24b4f340e4af50d7592774b57bfc7a8f1e31bacc0cee5d17b4237aac85be0265cf3aabd65708e988159daaac85b4145c398 SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe -EBUILD commoncpp2-1.8.1-r4.ebuild 1650 BLAKE2B 632f5f153cceed58a850675a0a6c74959435cc657204966052fdd9f1424bc90fb90b42474ea75d17f5f1b4c1d6858741c58f8a4e8ea598e05ee7027971be2dec SHA512 4c871d508b722beef2df44c2f29f42988ae487f360b1a7206f58f32313d37dac1e6101b4141ae9c0e2cba925af5d219899816820cb025d73cffbe58a02e0fecd +EBUILD commoncpp2-1.8.1-r4.ebuild 1539 BLAKE2B 8aabbad57624f37806a75f3db758d1903d28b8746feedf30a500cd77e9f2dc9e7a8bf866e8437d3075bf6e2c72844b522cd1a9da66af07a876a48952ba99ec5f SHA512 0ceccc0a461b7874e01f340a39e4c061df3b006e8f173f79b23547e950208625c9f921556ad64d48fc0a65484c10faec88bc35bcc6bb3c7b18d983586157ca12 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild index d8c63727a4e3..aaa9e49a4ed9 100644 --- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild +++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="debug doc examples gnutls ipv6 libressl ssl static-libs" +IUSE="debug doc examples gnutls ipv6 ssl static-libs" RDEPEND=" sys-libs/zlib:= @@ -22,8 +22,7 @@ RDEPEND=" net-libs/gnutls:= ) !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) )" DEPEND="${RDEPEND} @@ -38,7 +37,6 @@ PATCHES=( "${FILESDIR}/1.8.1-libgcrypt.patch" "${FILESDIR}/1.8.1-fix-c++14.patch" "${FILESDIR}/1.8.1-gnutls-3.4.patch" - "${FILESDIR}/1.8.1-libressl.patch" # bug 674416 "${FILESDIR}/1.8.1-fix-gcc9.patch" # bug 686012 ) diff --git a/dev-cpp/commoncpp2/files/1.8.1-libressl.patch b/dev-cpp/commoncpp2/files/1.8.1-libressl.patch deleted file mode 100644 index 9779a53d8fa0..000000000000 --- a/dev-cpp/commoncpp2/files/1.8.1-libressl.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [bug-commoncpp@gnu.org] - -diff --git a/src/ssl.cpp b/src/ssl.cpp -index 5bf526d..3cd7040 100644 ---- a/src/ssl.cpp -+++ b/src/ssl.cpp -@@ -386,7 +386,7 @@ bool SSLStream::getSession(void) - 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; |