From 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 May 2018 15:22:17 +0100 Subject: gentoo resync : 25.05.2018 --- net-libs/Manifest.gz | Bin 34219 -> 34220 bytes net-libs/libgadu/Manifest | 7 +- net-libs/libgadu/files/libgadu-1.12.0-tests.patch | 12 --- net-libs/libgadu/libgadu-1.11.4.ebuild | 4 +- net-libs/libgadu/libgadu-1.12.0.ebuild | 76 ---------------- net-libs/libgadu/libgadu-1.12.1.ebuild | 76 ---------------- net-libs/loudmouth/Manifest | 2 +- net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild | 2 +- net-libs/miniupnpc/Manifest | 2 +- net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild | 2 +- net-libs/pjproject/Manifest | 3 +- .../pjproject/files/pjproject-2.7.2-libressl.patch | 98 +++++++++++++++++++++ net-libs/pjproject/pjproject-2.7.2.ebuild | 12 ++- 13 files changed, 116 insertions(+), 180 deletions(-) delete mode 100644 net-libs/libgadu/files/libgadu-1.12.0-tests.patch delete mode 100644 net-libs/libgadu/libgadu-1.12.0.ebuild delete mode 100644 net-libs/libgadu/libgadu-1.12.1.ebuild create mode 100644 net-libs/pjproject/files/pjproject-2.7.2-libressl.patch (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index 20e815517e48..a09aab977471 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest index 126a38282d32..700a121d2ba0 100644 --- a/net-libs/libgadu/Manifest +++ b/net-libs/libgadu/Manifest @@ -1,10 +1,5 @@ -AUX libgadu-1.12.0-tests.patch 453 BLAKE2B 6d2111cd4e59ca2aa971734ed817b17011ac26d783dc9535c3cf769b84d7ed34bad0308c189ce0ba172b991d3c3867550bb4978ecb5b8dd00701a740c70ad6a5 SHA512 e024677ac361675e02518c692c9ecf2b1ea2a74fba3ed55506c67f70c911821421128214691487b09a8c315776f11afe5390135afcc7c33e04175f419ee69b39 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639 -DIST libgadu-1.12.0.tar.gz 290361 BLAKE2B 7dc517b0704bd525aa2e71dc49bd64daee65cff6c4084776c01a48f806cebe57ce933a8be557ecf94648de0920765efeb293ba8d30d8a46cd1590f97fa40a877 SHA512 62d1db0e0a59ce7e9a27a2002eea26e69b476a5bddeec129ec6e37d6141dc74e51b177a2cacd232031253d19d223f20ae68df1981f1f673485447950a0bc6670 -DIST libgadu-1.12.1.tar.gz 296079 BLAKE2B 0420e3a4e0d7180f0fd78fb8c5dd19c406d8f0d9880adca643301410c261ca9367f31ed72a3f9d27c07a4b6dcf0f3d6d5dd0e6b1025082f70c9442a5518557b3 SHA512 4786bcc517dcead278fed05c35e254d963ee42f029b09a59bfe01052cbe438fa4a0d86c17dcfa2ee39d2365f28864f887d28772a5e70ce2ece190714bec45590 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677 -EBUILD libgadu-1.11.4.ebuild 1299 BLAKE2B 8ae4199cdefee341d9593eec668ec6d4fe53d340863869399a866c38d22810f117ce33fd58473caa19a2c02cacd46167c34800e52279866316877abebec9814c SHA512 77fce206ce7324e7a10b6c7e1c4e49fcc3815b3c4442ff9ba1b80460fef971f487aaf6504cbeb4f2162e912f87d565f052f5e859d22806bd122cace801a969bb -EBUILD libgadu-1.12.0.ebuild 1421 BLAKE2B fa83fb7b137cae397024abde603e8839cbfffe0e54130298eda458b1354cae08fe3b9bb875bf4179cc39fba5d4c10b92ce57b8918a07958c06331ba862207706 SHA512 1601544bbd6e29c6c134bdb7e2e94e4dafce2b845d6e5d13bdb6ab2f955b718bb90b91217c2c42460834997be3d0c216e8df4a3ea84ec0ed0ff1257aa868add0 -EBUILD libgadu-1.12.1.ebuild 1435 BLAKE2B 56ab1bc6b8f003354096b25290a17af6245331cee34dfbb676fa37f478aa03cfc6510a2f785dd84569b60cfdad63310a0004ce751753a28e1756a338128d4a7e SHA512 6a2f97e833816e212202b8e21a45fe9505371e4c1060670000fffc9ac77852baefb729dc46f2431b9e63acbc4759caebcbfdec650e84a7c0e32d8252314e8531 +EBUILD libgadu-1.11.4.ebuild 1301 BLAKE2B c5e78bcf29f9cf44871f66bbac467d5af33abae86c2ac456c8bfdb760fd8a6b1d589df7db6eb389b82d226c696222edbf90b69db358f5a0b3e521ae73d78ed0e SHA512 513bc3032113c4edaba532198eff84c04e34d158f68a6477a7cd7521ad7cbe99f04f33811f56a5c8fcca448b19fed97579fb519e12779874b8de031e62ad5324 EBUILD libgadu-1.12.2.ebuild 1393 BLAKE2B ae6c1bc6c49b3d2e5c0800ba0bf72240141154830a15b3dc609a64c91b0ffa04d4c33f5dc0052d8bee443b27d39b852d72e7878768541838f6616fd99b2d20ce SHA512 944b3d1f2f70ef67e154415edaec6c044bd777771473de7d1b464a7ad51622e7ac7665e1bfaab053729fe77b7ae9f9ee1286ee5139577211d3096ddac2332f74 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e diff --git a/net-libs/libgadu/files/libgadu-1.12.0-tests.patch b/net-libs/libgadu/files/libgadu-1.12.0-tests.patch deleted file mode 100644 index 56e1da45b096..000000000000 --- a/net-libs/libgadu/files/libgadu-1.12.0-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN libgadu-1.12.0/test/manual/lib/base64.c my/test/manual/lib/base64.c ---- libgadu-1.12.0/test/manual/lib/base64.c 2014-06-13 20:41:37.000000000 +0200 -+++ my/test/manual/lib/base64.c 2014-08-13 03:08:00.612006311 +0200 -@@ -30,7 +30,7 @@ - #include - #include - --char *gg_base64_encode(const char *input, ssize_t len) -+char *gg_base64_encode2(const char *input, ssize_t len) - { - BIO *bmem, *b64; - BUF_MEM *bptr; diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild index 7c85cae4fd94..e269958d970a 100644 --- a/net-libs/libgadu/libgadu-1.11.4.ebuild +++ b/net-libs/libgadu/libgadu-1.11.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,7 +26,7 @@ COMMON_DEPEND=" sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/openssl-0.9.6m ) + !gnutls? ( >=dev-libs/openssl-0.9.6m:0 ) ) " DEPEND="${COMMON_DEPEND} diff --git a/net-libs/libgadu/libgadu-1.12.0.ebuild b/net-libs/libgadu/libgadu-1.12.0.ebuild deleted file mode 100644 index 1448b9f64340..000000000000 --- a/net-libs/libgadu/libgadu-1.12.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils - -DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol" -HOMEPAGE="http://toxygen.net/libgadu/" -SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -SLOT="0" -IUSE="doc gnutls ssl static-libs test threads" - -REQUIRED_USE=" - gnutls? ( ssl ) -" -COMMON_DEPEND=" - >=dev-libs/protobuf-c-0.15 - sys-libs/zlib - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/openssl-0.9.6m ) - ) -" -DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen ) - test? ( - dev-libs/expat - dev-libs/libxml2:2 - net-misc/curl - ) -" -RDEPEND="${COMMON_DEPEND} - !=net-im/kadu-0.6.0.2 - !=net-im/kadu-0.6.0.1 -" - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}/${P}-tests.patch" -) - -DOCS=(AUTHORS ChangeLog NEWS README) - -src_configure() { - local myeconfargs=( - --with-protobuf - $(use_enable test tests) - $(use_with threads pthread) - ) - - if use ssl; then - myeconfargs+=( - $(use_with gnutls gnutls) - $(use_with !gnutls openssl) - ) - else - myeconfargs+=( - --without-gnutls - --without-openssl - ) - fi - - autotools-utils_src_configure -} - -src_install() { - use doc && HTML_DOCS=(docs/html/) - autotools-utils_src_install -} diff --git a/net-libs/libgadu/libgadu-1.12.1.ebuild b/net-libs/libgadu/libgadu-1.12.1.ebuild deleted file mode 100644 index bde28ad49fc6..000000000000 --- a/net-libs/libgadu/libgadu-1.12.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils - -DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol" -HOMEPAGE="http://toxygen.net/libgadu/" -SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -SLOT="0" -IUSE="doc gnutls ssl static-libs test threads" - -REQUIRED_USE=" - gnutls? ( ssl ) -" -COMMON_DEPEND=" - >=dev-libs/protobuf-c-0.15 - sys-libs/zlib - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/openssl-0.9.6m ) - ) -" -DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen ) - test? ( - dev-libs/expat - dev-libs/libxml2:2 - net-misc/curl - ) -" -RDEPEND="${COMMON_DEPEND} - !=net-im/kadu-0.6.0.2 - !=net-im/kadu-0.6.0.1 -" - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}/${PN}-1.12.0-tests.patch" -) - -DOCS=(AUTHORS ChangeLog NEWS README) - -src_configure() { - local myeconfargs=( - --with-protobuf - $(use_enable test tests) - $(use_with threads pthread) - ) - - if use ssl; then - myeconfargs+=( - $(use_with gnutls gnutls) - $(use_with !gnutls openssl) - ) - else - myeconfargs+=( - --without-gnutls - --without-openssl - ) - fi - - autotools-utils_src_configure -} - -src_install() { - use doc && HTML_DOCS=(docs/html/) - autotools-utils_src_install -} diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest index 420483ae4a17..a751b03c4762 100644 --- a/net-libs/loudmouth/Manifest +++ b/net-libs/loudmouth/Manifest @@ -2,6 +2,6 @@ AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a58 DIST loudmouth-1.5.2.tar.gz 115940 BLAKE2B cf9134fb68e09c4f03e605227a42b9fc092d5f4f5524a39e044f6bd573e7b9a0e7ba1161cda2655cdc513a05673dfa3600d0548209230314a9455c7a912123b7 SHA512 54c3eb7ef99604d7e2d5560dc6e5be176a188e6a0d82ae6c2f488e30f06553039aa03d6f818cec25f354479a2624f60f2233d7e63b54f331e934d554de9bfc87 DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7 EBUILD loudmouth-1.5.2-r1.ebuild 1159 BLAKE2B e36ed32efdf19275bc74694a814c814e92f0533da216d8a8a80cf731b40fa51f63377db99bbebf5900810be0b4d69d4dbb81c6d18c18ba5932fb5b59be35a68f SHA512 e53ddf6fa0c513671fddca1996c51f70b7cb4d83910ee9754b70d040872f38d63b54a054350e3b542869ba87140243a29af8e7e724c2102b75873b7004887b8e -EBUILD loudmouth-1.5.3-r1.ebuild 1158 BLAKE2B 56cc3a368c123cd614c53c8b52f722adea26c4b8aceac95c88a9a5eed2107f1697e91659c38ec9665017ea78eeb31c6217d3dc7a813244cad94e0d1ac6f82862 SHA512 5bf39cbf261b4c63a039cb56cd6508376fd0d5d23d864709e0c465e0b1599a52d720f575208691b3c890ccea116526aa54abe123c09e2269f8284a747901f7fa +EBUILD loudmouth-1.5.3-r1.ebuild 1157 BLAKE2B ca5ff3d2eaeacf823355a74ad2bb50aa8e7c1c3d0e50b6e988d834f03e238e0127b91ee1a1527dde7bffd1a828b9ec09952606babc752fbabe103daa8da2f09a SHA512 d1c4dcba6ebfd4a54119e69063ba45bfd66f906aff39aabc7bdc93c0efccc3b9d5be1c213464d18a163e806ee572a38a79b08c461c21fb0da8709817fedbc14c EBUILD loudmouth-1.5.3.ebuild 1204 BLAKE2B 3e5c33e9408cc1f1ecc93dcb7c05c4e6e407b79661f18d9e6c2cb3f5ef00c1d4363d5411e78669e868947e8aab1dd0675b98ee7c4a69f81402da0574f908b8b1 SHA512 3a8814478be13d64ef265ad92f5400638299d9497391bf36e40424b079dcf963e69dae6e08fee83adb9a6df196025daa6ad23bf232fb6490774d2aeb5a2a0d96 MISC metadata.xml 561 BLAKE2B 25fe241cbe49f3c8a85c331659dde548dc8dc3dd4e7f904921ee7cf75ad3ef4f794823b937ff5d32c11260fdab1ec0f6162a9f90707e7d6abcfe7e0c7e004383 SHA512 69e89d7b5ffc2045a760a8b094bdc6fd230c10539550f9c0efb657a480bdee487f3e6cd5c87b2e037a1b1078274ebaa25efde6535aed4dfe57876a60a2faf4aa diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild index 46433a1d78f2..76ee3d614710 100644 --- a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild +++ b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/mcabber/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" IUSE="asyncns ssl openssl static-libs test" diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest index 3e6c61d6aa49..d5ec956f8f36 100644 --- a/net-libs/miniupnpc/Manifest +++ b/net-libs/miniupnpc/Manifest @@ -6,6 +6,6 @@ DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc11 EBUILD miniupnpc-2.0.20170509.ebuild 1266 BLAKE2B 275a77b2813007c8055df57d2e8d74c05c02e7f81af1b1ad766a4c9f274f955c7d56779184983a1e45962bbc38e9ff58f15f4bfc076ed86cc1400eabac4f2dcb SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271 EBUILD miniupnpc-2.0.20171212.ebuild 1266 BLAKE2B 0fec3f1639a678ca9a119713e62dfde5b8d3b361a6887a85a16d4f202376423a3fbe8910400467e3da91cf368b3628d001a1c5450d4c624471202a56d57d5139 SHA512 5f46f5b41a88c39d560eb8db872b8e3266142dbce18024fd05761f4be8c144475d8b444eef0848db1ad51934f39924b71950b39f660bc47d523d7186f05b158d EBUILD miniupnpc-2.0.20180203.ebuild 1339 BLAKE2B be0965e64f83087fffb495b3c3de74d691b2575fd8d14b36c56284404e912b623baea93027c61d58d354ef00c8fb31f4581b01959606683e1d23563e75b72891 SHA512 af3b05b0af780f4b8707209b7d1bbd26c8952c0f9314f613569f6da6e03a5bac9961d19e16e6c0876abee7006401c909b02e5c058daba7e2dbd6922aba98110e -EBUILD miniupnpc-2.0.20180222.ebuild 1333 BLAKE2B f762b531021f78f3aa93475585e8a1e487904c9dc3318bac1e909583082b5a83016fe7133729da4adfdcd25ed8d7140ebc285f6462e763abbe10793730b949e8 SHA512 c26e847103ae46119663cc66674104b19a32b6c12294572701862e1315b40c299b35944de2d3c505d6805246b13685a436e7a9d2fc8eaaea41826ca84fa685d3 +EBUILD miniupnpc-2.0.20180222.ebuild 1332 BLAKE2B b4ff98efe5a1e52ac0e10cfb0b4b46df1e3ac2d5916054de4a83737232e29cd548d2a873338379b88eb353122133688c2cb76c039af0cd34d1b257575f3c5498 SHA512 e19fb20718123716197a8a857759cd8dfc791662289e55a1014e9fd647a3384c3bcb78912375bf3176ed844d666c5947a8385581053c270c2c320a081de8ba44 EBUILD miniupnpc-2.0.20180503.ebuild 1339 BLAKE2B 697f1d38525ead8b41b0b5ad8b88b59bcb5281ebb1e5685e1caa94b9b0d350c2b2d9c3f2e46b37a4a2b74214079fe8d9c4c52c3dc81d1072f2d603f1f4d2e9f3 SHA512 93714f9e816f487b4d130c81e5149af4126245b8901a4e669026956e00510e465a098d92bc85b574c8b576f6b81bc42616fe1e220aa58256dcd7ffb93dd092b2 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28 diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild index adca70a097dd..93cbb63e9b2e 100644 --- a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild +++ b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" LICENSE="BSD" SLOT="0/16" -KEYWORDS="amd64 arm ~arm64 hppa ~mips ~ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd" IUSE="ipv6 kernel_linux static-libs" RDEPEND="" diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest index 44f641535dd5..8acd0f0e8cf7 100644 --- a/net-libs/pjproject/Manifest +++ b/net-libs/pjproject/Manifest @@ -1,7 +1,8 @@ AUX pjproject-2.7.1-ssl-flipflop.patch 4345 BLAKE2B b52f5a2cb86abdae86e9cfe58fe63b187f615b39ea4991768d0937e8b6e353a8496f1ad24f3cbaff92a09847c1ec444b81f9e470f1e78325ea26ca04456579e7 SHA512 00e7b8b347f73929f52015e102286f0631699de4c0e3631c53df6b00130d5b6760492748454ae7315eb9df0b182019901c59b9ed15c8fdd578548f9039080050 +AUX pjproject-2.7.2-libressl.patch 3446 BLAKE2B 47b21f621ffd1990e276459d9692ed7e8a083b93fc8dd0f44225af7cbf8f8390f9790efd61c8c790a0f20da64cb7f47db4fd83a8f0604de9a1bce30d54b3079f SHA512 173fc80e85673c4036b433cbf8152c58862d4716d4d98688cfaebf4c5ed3df76b8d4893709577c1dfff82a02baeeb0220dcae1dafc2e69ea9472056727b0d0fc AUX pjproject-2.7.2-ssl-flipflop.patch 4336 BLAKE2B 999150475bd24989f64bb718d082ff1c40d5ba383103371550d2c682578a9c57d58b4029e512ac5a064fae3a526bd6e62fb645ba45b4067c47fd148bcce668aa SHA512 438a61353c0200d3f230b81cc13f565a178d078b4580aa468a9241b5b95f5a2336d039f4aaf99cd57e7b1042f4c0a1cafd00c29191e36c08f2194d984811b8d6 DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd EBUILD pjproject-2.7.1.ebuild 2610 BLAKE2B a67e4c4c21bea82aba8fd25cdc152329734d6d9aa6550c8bcba951b997e6ee9db0e509ff344ab296dc401422ce6d2fcc4c675cd8101dae30bf254b99aee621f9 SHA512 d0d93d97ac40394416ad4e7286e226160ccb9652922a318e1293610361355130f95cabc4133e2144b62bb59d57fa8bfc2d3e5742832dbd420b87c7a7ee48ed75 -EBUILD pjproject-2.7.2.ebuild 2612 BLAKE2B 54521f7df9bda11dd925820bf39c0136bf5850f89ddc9a2cab517fa86be2a3eb93c8bf0c277109ea6d6fd47fb5a11aedbd944178a481258996ab5e3eab329326 SHA512 c4842f91ecce45548929f2504829a68bb00d7eb2e45c4a1cddc80a8acea4ef215ae32f5c7a17540f4fbabe89b90b79b68d86dad6aa40071da74f561f2780bb44 +EBUILD pjproject-2.7.2.ebuild 2713 BLAKE2B b319682f4850080fe47828e291ade7eb27a182f80c26deb5be81d85c55e23335e085f0a3a5053cc435fbbf2c6491bfa05614e75592b56328c30225ef7239cbe0 SHA512 4603a1fa9a66e27d203d4d2f2c6f72224935762477f1b59e77eca24c300beb16edea39a58b78c456aaf9d3b136e1eba82b5b55bc688619172ec4000c14e20a97 MISC metadata.xml 1157 BLAKE2B 1b40ee1b635cb8cdafaf001ad458264c4e55344393fd76ac7263521069bd355e4febd7ef534b24bd3879a75e5229863d8b93b8d89019639c49bb7511e1044ca5 SHA512 1171e638d0320d07b0bf3d6a6d31a75722dd659b296d9f451cfe1d3cc12016ff5b1c94b690054bb3772462d7a8d70b47fcb8b5c760c8677a727743ecebb57dce diff --git a/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch b/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch new file mode 100644 index 000000000000..07efa9ccb8fd --- /dev/null +++ b/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch @@ -0,0 +1,98 @@ +Index: /third_party/srtp/crypto/hash/hmac_ossl.c +=================================================================== +--- /third_party/srtp/crypto/hash/hmac_ossl.c (revision 5725) ++++ /third_party/srtp/crypto/hash/hmac_ossl.c (revision 5726) +@@ -52,6 +52,8 @@ + #include + #include ++#include + + #define SHA1_DIGEST_SIZE 20 ++#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER)) + + /* the debug module for authentiation */ +@@ -77,5 +79,5 @@ + /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated + using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L + { + /* allocate memory for auth and HMAC_CTX structures */ +@@ -122,5 +124,5 @@ + hmac_ctx = (HMAC_CTX*)a->state; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L + HMAC_CTX_cleanup(hmac_ctx); + +Index: /pjlib/src/pj/ssl_sock_ossl.c +=================================================================== +--- /pjlib/src/pj/ssl_sock_ossl.c (revision 5725) ++++ /pjlib/src/pj/ssl_sock_ossl.c (revision 5726) +@@ -56,6 +56,10 @@ + #include + #include +- +-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#include ++ ++#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER)) ++ ++#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \ ++ && OPENSSL_VERSION_NUMBER >= 0x1000200fL + + # include +@@ -115,5 +119,5 @@ + + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x10100000L + # define OPENSSL_NO_SSL2 /* seems to be removed in 1.1.0 */ + # define M_ASN1_STRING_data(x) ASN1_STRING_get0_data(x) +@@ -539,5 +543,5 @@ + + /* Init OpenSSL lib */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L + SSL_library_init(); + SSL_load_error_strings(); +@@ -560,5 +564,7 @@ + const char *cname; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\ ++ || OPENSSL_VERSION_NUMBER < 0x10100000L ++ + meth = (SSL_METHOD*)SSLv23_server_method(); + if (!meth) +@@ -603,5 +609,6 @@ + SSL_set_session(ssl, SSL_SESSION_new()); + +-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \ ++ && OPENSSL_VERSION_NUMBER >= 0x1000200fL + openssl_curves_num = SSL_get_shared_curve(ssl,-1); + if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves)) +@@ -795,5 +802,6 @@ + + /* Determine SSL method to use */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\ ++ || OPENSSL_VERSION_NUMBER < 0x10100000L + switch (ssock->param.proto) { + case PJ_SSL_SOCK_PROTO_TLS1: +@@ -1232,5 +1240,6 @@ + static pj_status_t set_curves_list(pj_ssl_sock_t *ssock) + { +-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \ ++ && OPENSSL_VERSION_NUMBER >= 0x1000200fL + int ret; + int curves[PJ_SSL_SOCK_MAX_CURVES]; +@@ -1263,5 +1272,5 @@ + static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock) + { +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x1000200fL + int ret; + diff --git a/net-libs/pjproject/pjproject-2.7.2.ebuild b/net-libs/pjproject/pjproject-2.7.2.ebuild index e4d25565824a..ee569db2b4e1 100644 --- a/net-libs/pjproject/pjproject-2.7.2.ebuild +++ b/net-libs/pjproject/pjproject-2.7.2.ebuild @@ -15,9 +15,12 @@ SLOT="0" CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16" VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv" SOUND_FLAGS="alsa oss portaudio" -IUSE="amr debug doc epoll examples ipv6 opus resample silk ssl static-libs webrtc ${CODEC_FLAGS} ${VIDEO_FLAGS} ${SOUND_FLAGS}" +IUSE="amr debug doc epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc ${CODEC_FLAGS} ${VIDEO_FLAGS} ${SOUND_FLAGS}" -PATCHES=( "${FILESDIR}"/${P}-ssl-flipflop.patch ) +PATCHES=( + "${FILESDIR}"/${P}-ssl-flipflop.patch + "${FILESDIR}"/${P}-libressl.patch +) RDEPEND="alsa? ( media-libs/alsa-lib ) oss? ( media-libs/portaudio[oss] ) @@ -34,7 +37,10 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) openh264? ( media-libs/openh264 ) resample? ( media-libs/libsamplerate ) - ssl? ( dev-libs/openssl:= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) net-libs/libsrtp:0" DEPEND="${RDEPEND} -- cgit v1.2.3