gentoo auto-resync : 22:04:2024 - 23:59:31

6 files changed, 205 insertions, 0 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 2d85ce6cce79..86d973fce6a5 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 8cfef8445a8b..06dbd2dee2bf 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,7 +1,9 @@
 AUX libetpan-1.0-nonnull.patch 404 BLAKE2B 485fa277a9b5a9f1f74e2bb658a68da3d6781d8cf243df019ae945a69fb96e5ddad36d83e00294e1abfb983525dbbc483686882653e55713686099d839fa7fc3 SHA512 3800d6e2dbb50985290b8a141ee2fe6ff92bee8516567f55ea14e634b41e11d1074cd8df6e6de30996e0d86e54cd659300da0d61ad63fc10f713d672aa3b4f6e
 AUX libetpan-1.9.4-CVE-2020-15953.patch 2880 BLAKE2B a31fcc50b16d6644ce091aaf7f3c7e2717c8413e21e7ec5f425100fa7987248c60de34d7bb81eaabddd401e93498daf868d5f78f6b0a65f4940faf4fff6ba493 SHA512 00a1d56b2a01665f070dcfe13d9b24db9ba98ca0fd0f83594a095b980d13cae241e246fb3a477923fd871ead551d13d9d4651cfc07a4d333250c0956cbf58238
+AUX libetpan-1.9.4-CVE-2022-4121.patch 1007 BLAKE2B d35b5fc459aa6f64ffa335928fd766cafcec865eba0702aa97e944f86c6a89075d961ab6401978e35365496be5f903eda7a153fa18a3b617e87f189ac1161410 SHA512 79b82d1f54807244738c9db7b15c39e7c48dbb2d4041ac84870cc153698807be3d0b439fda67fa0a88b0bf3bf363e0dbb4aeec612f5aeb78969d06c011162516
 AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f344fb22d2fa7c5c6cf75d2bd6c890d4117bda5978738d98a3ee3adf69f9ddb41922e36cd261ee71e9d8f012423cd99acc19a9 SHA512 561e0b82e080a31e668cc354be36e54101742b8d32f1067f53536afdd9e0cde2eecbd5516b93e8c304f60a1b083c6e68b4442afcca88235471f0038144202194
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
 EBUILD libetpan-1.9.4-r1.ebuild 2182 BLAKE2B ea16f4956c00faee65677e9ed1af52adb2efca6ca471010912840f311e8d7c685389665c8cbc5d488cd824a42685fa8621fadf721c4b125f5a50b16c0b123185 SHA512 2d2561afb7f2b36ad3013574b078fbe55a044df09be8f6d5e25ea12371187b19a07267d89b1c2c62bbe3bc40445dcd83f6fee6c32a1f3fe3e0dc3365987ae6ab
+EBUILD libetpan-1.9.4-r2.ebuild 2237 BLAKE2B 40b3d4817cada90244c08b7df107b79b1e612c75c851dcde3df158f0b72cdbe444e16ffce26ba65d1c826b7bb1bf826b73d0522448ab9ef50b18defe092e4bda SHA512 7c5e13eace209b56c4f5a1839ac5f6392425b77231ce08e735407051433c0b09e62f8148b24de14652e122f64afa780ff26387aa88d11a34709f8e28b477f771
 MISC metadata.xml 830 BLAKE2B ecbe9abd08e475cee86443cd2dda3ac13dd2d35000d1dbd9540c70ecfd9d17caf5e62d4054c89ec7377d06739d9744eb84869c656e5cb46689a7d8616373fcae SHA512 de9612383d1734ed824323cc4b5c72ea55f2f0bf38f6fc25c8830851fe7d06100fbdb5175ba70a333d611d95590ef69da5bae4d44d310cce48118668131f6267
diff --git a/net-libs/libetpan/files/libetpan-1.9.4-CVE-2022-4121.patch b/net-libs/libetpan/files/libetpan-1.9.4-CVE-2022-4121.patch
new file mode 100644
index 000000000000..2d97ac8e972e
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.9.4-CVE-2022-4121.patch
@@ -0,0 +1,29 @@
+From 5c9eb6b6ba64c4eb927d7a902317410181aacbba Mon Sep 17 00:00:00 2001
+From: Hoa Dinh <hoa@dinhvh.me>
+Date: Mon, 19 Dec 2022 08:16:32 -0800
+Subject: [PATCH] Fixed crash when st_info_list is NULL. Fixes #420. Fixes
+ CVE-2022-4121.
+
+---
+ src/low-level/imap/mailimap_types.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/low-level/imap/mailimap_types.c b/src/low-level/imap/mailimap_types.c
+index 9923125c..79a0cc23 100644
+--- a/src/low-level/imap/mailimap_types.c
++++ b/src/low-level/imap/mailimap_types.c
+@@ -1389,9 +1389,11 @@ void
+ mailimap_mailbox_data_status_free(struct mailimap_mailbox_data_status * info)
+ {
+   mailimap_mailbox_free(info->st_mailbox);
+-  clist_foreach(info->st_info_list, (clist_func) mailimap_status_info_free,
+-		 NULL);
+-  clist_free(info->st_info_list);
++  if (info->st_info_list != NULL) {
++    clist_foreach(info->st_info_list, (clist_func) mailimap_status_info_free,
++      NULL);
++    clist_free(info->st_info_list);
++  }
+   free(info);
+ }
+ 
diff --git a/net-libs/libetpan/libetpan-1.9.4-r2.ebuild b/net-libs/libetpan/libetpan-1.9.4-r2.ebuild
new file mode 100644
index 000000000000..149c51e7ac5f
--- /dev/null
+++ b/net-libs/libetpan/libetpan-1.9.4-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools
+
+DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
+HOMEPAGE="https://libetpan.sourceforge.net/"
+SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="berkdb gnutls ipv6 liblockfile lmdb sasl ssl static-libs"
+
+# BerkDB is only supported up to version 6.0
+DEPEND="sys-libs/zlib
+	!lmdb? ( berkdb? ( sys-libs/db:= ) )
+	lmdb? ( dev-db/lmdb )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	liblockfile? ( net-libs/liblockfile )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-nonnull.patch
+	"${FILESDIR}"/${PN}-1.9.4-berkdb_lookup.patch #519846
+	"${FILESDIR}"/${PN}-1.9.4-pkgconfig_file_no_ldflags.patch
+	"${FILESDIR}"/${P}-CVE-2020-15953.patch #734130
+	"${FILESDIR}"/${P}-CVE-2022-4121.patch #891263
+)
+
+pkg_pretend() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
+		ewarn "No ssl support will be available in ${PN}."
+	fi
+
+	if use berkdb && use lmdb ; then
+		ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
+		ewarn "Using lmdb as cache DB!"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
+	# libtool recognises it as valid shell (bug #300211)
+	use prefix && export CONFIG_SHELL=${BASH}
+	local myeconfargs=(
+		# --enable-debug simply injects "-O2 -g" into CFLAGS
+		--disable-debug
+		$(use_enable ipv6)
+		$(use_enable liblockfile lockfile)
+		$(use_enable static-libs static)
+		$(use_with sasl)
+		$(usex lmdb '--enable-lmdb --disable-db' "$(use_enable berkdb db) --disable-lmdb")
+		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 990bd25fd11a..95deff6c49af 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,5 +1,7 @@
 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.1.2.tar.gz 730435 BLAKE2B 7c43bc394d46ddb600c683d771add48f9a20d205ce61796b27a34933521e38be2b3b331263ffc6bb00fd1197a195b295e3311d52d8d74cdfe51453954cb79ae1 SHA512 ff11f1e9093004461425179fcab630237bf1d28f6e5abe6486d657b455b560884047715fccff5b31f26275ffd423df787014aaac35c556eddb1842e8e68841ce
+DIST libquotient-0.8.2.tar.gz 744095 BLAKE2B c33016e4eda22e0a363f06ab4545d17010519b8d778566c1bae29e4c7d6563280f4ce3c1235f7d75f55ce4a8971ef5ce23e45f1d3a0edc043e23857d805a824f SHA512 3d971439f8a89609930ca1648f6cf1bdb59f3ad492af1a15a7f8a13d06c81bd5bfffa1dd732ef5156fab8a9ea2ba3e98376bf76511db17bdeee17641a772b762
 EBUILD libquotient-0.8.1.2-r1.ebuild 1926 BLAKE2B a5104973ab5d280f35f5a4af480faa02404bcc8ae13a7a1cfa8c1cbb0b152bcf92aac092d243ae1266a24bd3334bdb43ab9e772c47783e37b35150400c156eb9 SHA512 1ec198a0cf6e08f34dd18339f2159eb7c7fca4fe3f9d6163110b30488acde7f2792ac31c40ea43923240595ae040c593a7c28c4e533cd87299a508ae552001b8
+EBUILD libquotient-0.8.2.ebuild 1929 BLAKE2B 24ef83a0759f34d692748ac911ba3b1df8ba7afd5cbb2a7a7134b9dadcfa4a7d51544d9ff6915090f476f4c2b37668d6d3d037884d6c4290864a93c4dd22cba3 SHA512 325c3cfba3c25b88fe398cb98ff019f0a0128a0ab4ef508d7a85449531756678a72b0b133566787db143c44c90a530fbc70da066f03ea97b4bc8c9fd3a2b7386
 MISC metadata.xml 338 BLAKE2B 84af57de6f4faeb65a9a9bd272a29e6cb4491e8eff3d79c4704566baa4af7cfa2f9c6c14a52a0a44e8751848b9e89f30807a6d0c304eb28d8b2cb9f43f0b37c5 SHA512 f93f27e29f09f8e6e6c0038a403990260c8998213c8248c2acbfc1f7e76faa07c296d4b30214c746f30d42b37d636be92720e692280098d4d72d3d542b5004aa
diff --git a/net-libs/libquotient/libquotient-0.8.2.ebuild b/net-libs/libquotient/libquotient-0.8.2.ebuild
new file mode 100644
index 000000000000..7ff01c1da407
--- /dev/null
+++ b/net-libs/libquotient/libquotient-0.8.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild
+
+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="+qt5 qt6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/olm
+	dev-libs/openssl:=
+	qt5? (
+		dev-libs/qtkeychain:=[qt5(+)]
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsql:5
+	)
+	qt6? (
+		>=dev-libs/qtkeychain-0.14.1-r1:=[qt6]
+		dev-qt/qtbase:6[gui,network,sql,ssl]
+		dev-qt/qtmultimedia:6
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		qt5? (
+			dev-qt/qtconcurrent:5
+			dev-qt/qttest:5
+		)
+		qt6? ( dev-qt/qtbase:6[concurrent] )
+	)
+"
+
+PATCHES=(
+	# downstream patches
+	"${FILESDIR}"/${PN}-0.8.0-no-android.patch
+	"${FILESDIR}"/${PN}-0.8.0-no-tests.patch
+)
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DBUILD_TESTING=$(usex test)
+			-DQuotient_ENABLE_E2EE=ON
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=( -DBUILD_WITH_QT6=ON )
+		else
+			mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
+		fi
+
+		use test && mycmakeargs+=(
+			-DQuotient_INSTALL_TESTS=OFF
+		)
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
+
+src_test() {
+	# https://github.com/quotient-im/libQuotient/issues/435
+	# testolmaccount requires network connection/server set up
+	local myctestargs=(
+		-j1
+		-E "(testolmaccount)"
+	)
+	multibuild_foreach_variant cmake_src_test
+}