diff options
Diffstat (limited to 'net-libs')
-rw-r--r-- | net-libs/Manifest.gz | bin | 30650 -> 30652 bytes | |||
-rw-r--r-- | net-libs/libnftnl/Manifest | 3 | ||||
-rw-r--r-- | net-libs/libnftnl/files/libnftnl-1.2.8-valgrind-tests.patch | 47 | ||||
-rw-r--r-- | net-libs/libnftnl/libnftnl-1.2.8.ebuild | 6 | ||||
-rw-r--r-- | net-libs/libquotient/Manifest | 7 | ||||
-rw-r--r-- | net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch | 34 | ||||
-rw-r--r-- | net-libs/libquotient/libquotient-0.8.2-r1.ebuild | 58 | ||||
-rw-r--r-- | net-libs/libquotient/libquotient-0.9.3.ebuild (renamed from net-libs/libquotient/libquotient-0.9.1.ebuild) | 2 |
8 files changed, 57 insertions, 100 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex dff921ae8a5a..1f3b5e619e73 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest index d24567f4b809..3bbcf8d18634 100644 --- a/net-libs/libnftnl/Manifest +++ b/net-libs/libnftnl/Manifest @@ -1,3 +1,4 @@ +AUX libnftnl-1.2.8-valgrind-tests.patch 1681 BLAKE2B 07068688afd6df2c5209d47efa76abfa6b09cfa6f98ffea1604fb743f0b47f9169fb36c07bbf6c40c996f80cdf0bcbc05fa27a23ec5903c5c2208b59a991718c SHA512 7d4554ab5ceac7c5a13b93d75ea556544ab5a0ff492df3d128360b62ba3fee4d67dcc98e4e580c5807de6a5829ed590bb5be7e919f6157da81ed2c1d65a5dfb6 DIST libnftnl-1.2.6.tar.xz 336684 BLAKE2B a08010b26db0c7a5429f33a92ca4f17e8e158005befa5f7e3f37d60456d1b481a3f95f46c0bcec74e98ab040940f533acc279672226f0abc6ce73a26ff56718a SHA512 0c8c369eec84b0c568f0067598bece6e3be9a0fbd977e443ae3b14a5a6d842a6086ceb5426a65f8c77204709655f148c1241193f1a928f8c12154a57e3548b34 DIST libnftnl-1.2.6.tar.xz.sig 566 BLAKE2B 8ad336d0d8c693beb6335e874ad62040257e0c4527f8acb32fcc8b4889eea88ba3a42c9b2b795db6f6e3d148066ee0a9217b1e30c7e784c793458dd480ee624a SHA512 61288aa03fb80d43d09866ce549815202f682b30b283cf3119ced0fe59536d10f1c029e433651d1cb31115e977b660886a153f3361f5cafdbb0ed6da602e5b2f DIST libnftnl-1.2.7.tar.xz 343876 BLAKE2B 42decbfdfce07c4743e7a55cf3d5d03a244ab6ac5e0f33107322ab44edcc96d360ac02f0376786656a5f7d43986499474e20a5b835f838e06d12efb017dd8eb4 SHA512 24ff3e7e97f51cb5dfda2fbd2f5e175abcec0dd58f94936022800ec356ff004a531f0915df72278b867769ba71473d407b01d52cc33a3cafb043d9a90b051f9d @@ -7,6 +8,6 @@ DIST libnftnl-1.2.8.tar.xz.sig 566 BLAKE2B 2c8eae671d41f84b1ded96f7dc98e214a240c EBUILD libnftnl-1.2.6-r1.ebuild 1556 BLAKE2B 90973ac652e4d91cd124d79cb292388feb45100594a56a4e4f3c7a37b44ad8e3561847dffc044c19056e97862d630731b1739b30bb262772338bd22ae22711a3 SHA512 713ebaf3a02812a483502fe563f4a3c05cbc012b3a048bb7cc1225a43dc31ee92e76047c311586480b4e139abc0111e42b7f2f62e9d59db37a753fe600b11daa EBUILD libnftnl-1.2.6.ebuild 1597 BLAKE2B 46322df3e8858340d9bace49d376f96bb1730f15bbcc41a7ccf9d0e244b501c591f06c426b293a5bede1c474da1360d561bb6af76861e57a6cd3bb0b2044323a SHA512 bb61baa34478c799fe53ef6b51716c204ba569e37b459a218bb3148fccd05a40484cdb6e098fdb05b24bb6661d2aa3ed6541da30a97a0e925751efdd9f47da51 EBUILD libnftnl-1.2.7.ebuild 1556 BLAKE2B 90973ac652e4d91cd124d79cb292388feb45100594a56a4e4f3c7a37b44ad8e3561847dffc044c19056e97862d630731b1739b30bb262772338bd22ae22711a3 SHA512 713ebaf3a02812a483502fe563f4a3c05cbc012b3a048bb7cc1225a43dc31ee92e76047c311586480b4e139abc0111e42b7f2f62e9d59db37a753fe600b11daa -EBUILD libnftnl-1.2.8.ebuild 1556 BLAKE2B 90973ac652e4d91cd124d79cb292388feb45100594a56a4e4f3c7a37b44ad8e3561847dffc044c19056e97862d630731b1739b30bb262772338bd22ae22711a3 SHA512 713ebaf3a02812a483502fe563f4a3c05cbc012b3a048bb7cc1225a43dc31ee92e76047c311586480b4e139abc0111e42b7f2f62e9d59db37a753fe600b11daa +EBUILD libnftnl-1.2.8.ebuild 1610 BLAKE2B fd02629d5085a4ccfe547ef6d10f4c55cfd593d082515202c60e46eddbca5699cdd5f89f0b4b828d14a88344bf07412c507aa079719056512774e4944e253f41 SHA512 07f2a13ec4fc30d5ee1de479bedd76fbcfcca64a342a4ffb0361df530b69d0792ac100f830960aa3fe78c921c2ecb95c5f9dd825a7a6cca2246260d8aa057b94 EBUILD libnftnl-9999.ebuild 1564 BLAKE2B d2bc07055b525f502f44e11184ce599aa985ad0760671a916771992a739229c388f0c4a1d3adc714bf81bce03d95221cec568795464fde3c31905ee9703c0413 SHA512 7715f480f3e63eaa6ee72c5edc9d919634ae4e094c601b6b57fd96da60174195074a3486eae1432af7170cdf4bf5f50b6f4cf926d545a00f127b66ec7285356a MISC metadata.xml 338 BLAKE2B fc63cdfa0a08b5933c6606290f44c4aee56f65224222425b6bf3b1c88427d17b5222a31126c38b326bbf8095786cacce65121103fcd45ce27aa16f9bde979a82 SHA512 1875b393684566e8dee08cfaa9fb0f19196121e500bab6deef6895784d33cdf2e2a7a96469ae57a02654f7dbc22e8af03b15f5a8a3dd840743ef077dc68edc71 diff --git a/net-libs/libnftnl/files/libnftnl-1.2.8-valgrind-tests.patch b/net-libs/libnftnl/files/libnftnl-1.2.8-valgrind-tests.patch new file mode 100644 index 000000000000..62f69a1feedf --- /dev/null +++ b/net-libs/libnftnl/files/libnftnl-1.2.8-valgrind-tests.patch @@ -0,0 +1,47 @@ +https://git.netfilter.org/libnftnl/commit/?id=ff37c01480cd0b938658d180ff5c7b1958ad250f + +From ff37c01480cd0b938658d180ff5c7b1958ad250f Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Wed, 27 Nov 2024 18:54:53 +0100 +Subject: tests: Fix for ASAN + +The 'data' arrays in match and target expression tests were undersized +as they did not cover for the terminating NUL-char of the string used to +initialize them. When passing such array to strdup(), the latter reads +until after the defined array boundary. + +Fixes: 93483364369d8 ("src: get rid of cached copies of x_tables.h and xt_LOG.h") +Signed-off-by: Phil Sutter <phil@nwl.cc> +--- + tests/nft-expr_match-test.c | 2 +- + tests/nft-expr_target-test.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/nft-expr_match-test.c b/tests/nft-expr_match-test.c +index 53a8b84..bc9f6ac 100644 +--- a/tests/nft-expr_match-test.c ++++ b/tests/nft-expr_match-test.c +@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) + char buf[4096]; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; +- char data[16] = "0123456789abcdef"; ++ char data[] = "0123456789abcdef"; + + a = nftnl_rule_alloc(); + b = nftnl_rule_alloc(); +diff --git a/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c +index 89de945..a483e7a 100644 +--- a/tests/nft-expr_target-test.c ++++ b/tests/nft-expr_target-test.c +@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) + char buf[4096]; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; +- char data[16] = "0123456789abcdef"; ++ char data[] = "0123456789abcdef"; + + a = nftnl_rule_alloc(); + b = nftnl_rule_alloc(); +-- +cgit v1.2.3 diff --git a/net-libs/libnftnl/libnftnl-1.2.8.ebuild b/net-libs/libnftnl/libnftnl-1.2.8.ebuild index ec50cf89c560..382d2095c3b4 100644 --- a/net-libs/libnftnl/libnftnl-1.2.8.ebuild +++ b/net-libs/libnftnl/libnftnl-1.2.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,6 +35,10 @@ BDEPEND+=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-valgrind-tests.patch +) + pkg_setup() { if kernel_is ge 3 13; then CONFIG_CHECK="~NF_TABLES" diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest index 2547ceff0c9a..e455fea1cc11 100644 --- a/net-libs/libquotient/Manifest +++ b/net-libs/libquotient/Manifest @@ -1,9 +1,6 @@ AUX libquotient-0.8.0-no-android.patch 993 BLAKE2B 119a902b67ac0c101a84217e52f3438f83c474322d75b9ccc5fa8a2375bbf55c8910da65b6b7eac645eef840fa69e356343bc78fac88d14582fca395867050f7 SHA512 be757da77733eec67111c5e5f96c6459018aabbe863abdfbc7029e548b75f52f7a2754ee6eb93eaea6d08d7a2978ea9470585192ba95186358b02ec1df9f6f10 -AUX libquotient-0.8.0-no-tests.patch 1215 BLAKE2B 4749dfb1b6e2be0f59b83a73092e7b4191458ad7220faefe0db71846d3d5fcbd59eb4adfcf97c0d779bc074fb0ccd1faef8eccfc44e4ad53750f79da6524b7dc SHA512 2923d0cec567378e1ddd9c7a50667a28bb79cdf871ce328b6db1ee0eb457b6c7d1a376b7659cb92f13483c29baa4991f410b3c5c478c881f80443a7eb4003b7f -DIST libquotient-0.8.2.tar.gz 744095 BLAKE2B c33016e4eda22e0a363f06ab4545d17010519b8d778566c1bae29e4c7d6563280f4ce3c1235f7d75f55ce4a8971ef5ce23e45f1d3a0edc043e23857d805a824f SHA512 3d971439f8a89609930ca1648f6cf1bdb59f3ad492af1a15a7f8a13d06c81bd5bfffa1dd732ef5156fab8a9ea2ba3e98376bf76511db17bdeee17641a772b762 -DIST libquotient-0.9.1.tar.gz 772882 BLAKE2B f43da0833baa1242f29fb7ed1dd1065b673497d8e2d8358b60d67da0fef8f382ac3fdda8cdc9ed0ac67b5cd423527ef418d0a574fd30e46fe9337214509b1dc2 SHA512 f998b187a1168381c7868400fec73f68ab95af29d1d648921a507fac8782f8c69fd8aab7916466ad9d6b85edadf5168659d7b78a876daa30798891d84afcfa5a DIST libquotient-0.9.2.tar.gz 777025 BLAKE2B f616283a7ebd493caba57de950c8dd1a53213b54ff3183ffd436a4d901439607d086020256955375208d3c311e20f3e3fd0b55e3164961bd885b5a0882296919 SHA512 c179b1ca670f9b75b945d50026b02c34dabbd58056abb6f210998229dae80dba8f00de157d9c3fc32254b613c5db149ca497a9b9695cdf5e61255e82be73db0c -EBUILD libquotient-0.8.2-r1.ebuild 1259 BLAKE2B 2dd080c2123cbf68e5b8f4a47072e28fc922e2fd0f7bedcf3a12ffe43d7bdc395c6dc9a23789bae2f34271f8fcb0a23fa490856fc20f8fb7f06d946db414e4bf SHA512 e693f5ac759fb02cc7628462e0774e22d5f4ef3be0a72c90919a76ca06f59f21967efbf41e2353e95d42f8e416272962b4803e8d9433339e841899292a5e002f -EBUILD libquotient-0.9.1.ebuild 1183 BLAKE2B 09c333ed88f31b0886e67062bdc1602233b4645a868e0915be3ab9ea707bab5fbcb2ccebf83e9cb4e6b5a8fae10897969bd8f369b8defc59413538e411c45b65 SHA512 502874e754bb2e9e362e4d0a8fa7db7548fe6425e37f3c2035684606f139451de3959c0944d853338987699357fbfbda27f84e26423b093bcdad9fe84b819d59 +DIST libquotient-0.9.3.tar.gz 777778 BLAKE2B 5a775321eb194e25af29a9c30ed7f2ff20a4fd98ff33fad1d2275cae9188c93e1c6c0700d3a82a98470902fb9457c116737756c68ca405ba564292fb6097a8da SHA512 d9ec85cb8af11100806bced4ef084427bf508cbf1ecc22a884aab84a020a8955e5dc747ea7cda20e8de8fac1b7a5f0f98ddfc88396baa7f930000c783cb2d0ce EBUILD libquotient-0.9.2.ebuild 1182 BLAKE2B 0e5a19dde0aff9342de1b8b78a042419ef02b715760db0c451bb0531affb4ff6f108c411c521ae080d88495408fa9b86ccbcd5b1af2aa0d91c05df3aba527cd4 SHA512 39e2ebc0f0452dd22cb9b7a982d57ca243646234a9f2fa5e72183663030b957c053b6b96e9ff601832eff612b3fbbe2f7c53ca0c18c2efff7720bcfa7a81cae7 +EBUILD libquotient-0.9.3.ebuild 1185 BLAKE2B 4ec3836f6ffd4b3edd752f373ed2143c6b09b877e5bcc3214ded52e94817570534dc0756a70da9f60335d25e87750d8dbfee2db98a7a581ddf1ee1779c901c4a SHA512 a32cd8cddcc88d1d6e159586b42e76002452a60adfb5f2f4e5990e9d209897d3429ddee6661f8ecaa4553eb2e72416b40fda886a9de8f70f02da3806e355a5ab MISC metadata.xml 338 BLAKE2B 84af57de6f4faeb65a9a9bd272a29e6cb4491e8eff3d79c4704566baa4af7cfa2f9c6c14a52a0a44e8751848b9e89f30807a6d0c304eb28d8b2cb9f43f0b37c5 SHA512 f93f27e29f09f8e6e6c0038a403990260c8998213c8248c2acbfc1f7e76faa07c296d4b30214c746f30d42b37d636be92720e692280098d4d72d3d542b5004aa diff --git a/net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch b/net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch deleted file mode 100644 index 96fe1029c826..000000000000 --- a/net-libs/libquotient/files/libquotient-0.8.0-no-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c35f062d1c9975ec0bdfdcbcdeb6b9973b73f86b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sat, 24 Dec 2022 22:51:12 +0100 -Subject: [PATCH 2/2] Put Qt5Test dependency behind -DBUILD_TESTING - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7e03085f..f2ab0ae7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ else() - set(QtExtraModules "Multimedia") # See #483 - endif() - string(REGEX REPLACE "^(.).*" "Qt\\1" Qt ${QtMinVersion}) # makes "Qt5" or "Qt6" --find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui Test ${QtExtraModules}) -+find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui ${QtExtraModules}) - get_filename_component(Qt_Prefix "${${Qt}_DIR}/../../../.." ABSOLUTE) - - find_package(${Qt}Keychain REQUIRED) -@@ -344,6 +344,7 @@ configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${QUOTIENT_LIB_ - # Configure testing - - if (BUILD_TESTING) -+ find_package(${Qt}Test ${QtMinVersion} REQUIRED) - enable_testing() - add_subdirectory(quotest) - add_subdirectory(autotests) --- -2.41.0 - diff --git a/net-libs/libquotient/libquotient-0.8.2-r1.ebuild b/net-libs/libquotient/libquotient-0.8.2-r1.ebuild deleted file mode 100644 index ea3fa2bf7d41..000000000000 --- a/net-libs/libquotient/libquotient-0.8.2-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Qt-based SDK to develop applications for Matrix" -HOMEPAGE="https://github.com/quotient-im/libQuotient" -SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/libQuotient-${PV}" - -LICENSE="LGPL-2+" -SLOT="0/${PV}" # FIXME: check soname on next version bump -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/olm - dev-libs/openssl:= - >=dev-libs/qtkeychain-0.14.1-r1:=[qt6] - dev-qt/qtbase:6[gui,network,sql,ssl] - dev-qt/qtmultimedia:6 -" -DEPEND="${RDEPEND} - test? ( dev-qt/qtbase:6[concurrent] ) -" - -PATCHES=( - # downstream patches - "${FILESDIR}"/${PN}-0.8.0-no-android.patch - "${FILESDIR}"/${PN}-0.8.0-no-tests.patch -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DQuotient_ENABLE_E2EE=ON - -DBUILD_WITH_QT6=ON - ) - - use test && mycmakeargs+=( - -DQuotient_INSTALL_TESTS=OFF - ) - cmake_src_configure -} - -src_test() { - # https://github.com/quotient-im/libQuotient/issues/435 - # testolmaccount requires network connection/server set up - local myctestargs=( - -j1 - -E "(testolmaccount)" - ) - cmake_src_test -} diff --git a/net-libs/libquotient/libquotient-0.9.1.ebuild b/net-libs/libquotient/libquotient-0.9.3.ebuild index 37f04804234f..cafd0f8faefe 100644 --- a/net-libs/libquotient/libquotient-0.9.1.ebuild +++ b/net-libs/libquotient/libquotient-0.9.3.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/libQuotient-${PV}" LICENSE="LGPL-2+" SLOT="0/${PV}" # FIXME: check soname on next version bump -KEYWORDS="amd64 arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="test" RESTRICT="!test? ( test )" |