gentoo auto-resync : 11:10:2022 - 01:37:00

4 files changed, 201 insertions, 0 deletions

diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index b0f08df75e20..ff7879d8829e 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,7 +1,10 @@
 AUX libical-3.0.11-pkgconfig-libdir.patch 612 BLAKE2B 90b53adfb90684dd8c18f91a4de5d87df9cf590e097e414eef7ec92221dddbc5b0ade7b3deccd1aed6c7c61c1d9bb16663d2e1910718ced1f21a55ffeffe7a16 SHA512 bf1af662e65d62778fcc946543d41e4fd592a90bb643a8b584916c4d62ddb100c1746aaf0d4b4698c1b97de19926220f7c3c8dd03014febfdce32015571f77eb
+AUX libical-3.0.15-fortify-source-3.patch 1360 BLAKE2B 4155d408caf7bc5922ec112ed3cb64a5d53016235177a7505ec915c2fae0d6fa49d507c59648575abd5eca0b9078691c8eacea32374aa29003190a5c12f42fa8 SHA512 3ac6c47cacfac4beb49e128258d954b47c229e3562d68d7fc72f874ea2d5949f2f4571393ff458eb3344bbf4ad81d0bbaf1889365f54de058d3d13e5f5712423
+AUX libical-3.0.15-revert-bad-fuzz-fix.patch 1321 BLAKE2B e77387606ad1f74bf63d5941b73a586fb9a6bc5bd8dfa0de9b2837c382287b45448b459f0ef265dcb405f7c3ea082e5550147f487a6eaf8162b7edb24377eaa4 SHA512 7f79a56be0cf8faa9d438122ab1d3e0d2ec044ef3fd442337aee28e906da84e57dcad246aa4c3c40d75669dbf706fb6084460787f1dd99de060f4db9ebac5711
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 DIST libical-3.0.14.tar.gz 887795 BLAKE2B 8c073b77b5e4e6b24e3dfae7ac7a5f88da874bdfa53489cd04afd4d458d2fc963d39c2816691e777003ca9af510ceaf7bab9d7e1021942aa9c3adaad32ca8341 SHA512 36da5516672976c71b049a12af36164d91f9b655f81f1884766558149f25e80c30e64d15da848842f8a629295d708f39ce6fa63a3b0da39b5cbeb91911a4e6d8
 DIST libical-3.0.15.tar.gz 920483 BLAKE2B 9d4c1a84440b2363537f678363f9b7d8061e429c5bf7bf9ae2c9ea33e328f238dc4ce0e79c66d33441a89b6c2e18527fdb7d40e80338dda0086b636b165d5ae2 SHA512 14f0eaabdd8fc56d91d2fff8647b3871439cceae3cb7af31eaae30b3cc29f818b6f9d582dd4770b8b3b0c6fe53684258d30c743a5fd5dd337fda64e3adae35ba
 EBUILD libical-3.0.14-r1.ebuild 2440 BLAKE2B f7d4d3913e10543772f7da02b7e46a554e7de91ff58637b9a967b190cf40b26da5c1496461ddc3f30baaeb92e215112da6d4b98adc13e2f244712d8b746ae62f SHA512 523081cc89e4d9773978b0b065f6a731ceeeae45771afd55014e74dac63394f42b8123068d87a2ad28b3c78eee24200860ab4aadaabd6dd49507ee0fe7e67706
+EBUILD libical-3.0.15-r1.ebuild 2536 BLAKE2B ee7695523a5302bb8fea197cc4cde607f9209165c2adcfda6249a3262bad792c16a3d922fea68bb7ce46bb7b2ec418ed75351f5c0223623dbf8fecfdd17180af SHA512 88e142adb81ff25ded36c820922988e0cc851515da7fd4604818453b20a78908811465affc919d22feb3d42d1d27e86248a645a8651a9b22ec9a6ab129f25840
 EBUILD libical-3.0.15.ebuild 2447 BLAKE2B 94f7dd83a66e8471328950566b928477a0beb10931a7471fc1181f83345ba43b7e2020f101ee10586819d638b08315c90fff7b6cd6a73d8cd3fea96eb73a8918 SHA512 88db4b2dbda9d7cf39405a29421a22f3ba6861c9cd8a6aa33fde2cdb590479da9db2344a69e6369be1fd16707c97a9b1be58885cd352956ddec549acf95c828d
 MISC metadata.xml 426 BLAKE2B bdc616f3bedfa391b56edde0bd0f350b171c1f9afa2a8a9e0166e71ecf1177946aae064bea9f48fb9933d24cb94fd784a299bd97b12ad7236b3483641a5dd763 SHA512 663bef7814dfd66077f1046094879c0ec1eb0165d616e85c08eb0ff9cecd3557afd31e7d8dda8f1e95aca6955d94818f3253c8b763ff135195d41b1b1e871d5c
diff --git a/dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch b/dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch
new file mode 100644
index 000000000000..830d646b74d0
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch
@@ -0,0 +1,43 @@
+https://github.com/libical/libical/commit/d67034b31cebe0db3ca65342813336b123921a15
+https://github.com/libical/libical/issues/603
+https://bugs.gentoo.org/876625
+
+From: Allen Winter <allen.winter@kdab.com>
+Date: Fri, 7 Oct 2022 09:43:32 -0400
+Subject: [PATCH] fix problem found with gcc fortify builds
+
+fixes: #603
+--- a/src/libical/icaltz-util.c
++++ b/src/libical/icaltz-util.c
+@@ -732,7 +732,7 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
+     for (i = 0; i < num_trans; i++) {
+         int by_day = 0;
+         time_t start;
+-        enum icalrecurrencetype_weekday dow;
++        enum icalrecurrencetype_weekday dow = ICAL_NO_WEEKDAY;
+ 
+         prev_idx = idx;
+         idx = trans_idx[i];
+--- a/src/libicalss/icalbdbset.c
++++ b/src/libicalss/icalbdbset.c
+@@ -529,7 +529,7 @@ int icalbdbset_get_key(DBC *dbcp, DBT *key, DBT *data)
+ int icalbdbset_delete(DB *dbp, DBT *key)
+ {
+     DB_TXN *tid;
+-    int ret;
++    int ret = 0;
+     int done = 0;
+     int retry = 0;
+ 
+--- a/src/test/regression.c
++++ b/src/test/regression.c
+@@ -2322,7 +2322,7 @@ void test_fblist()
+         char *strp = out_str;
+ 
+         for (i = 0; foo[i] != -1; i++) {
+-            snprintf(strp, 79, "%1d", foo[i]);
++            snprintf(strp, 79-i, "%1d", foo[i]);
+             strp++;
+         }
+         str_is("Checking freebusy validity", out_str, "1121110");
+
diff --git a/dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch b/dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch
new file mode 100644
index 000000000000..e6f4d33ad286
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch
@@ -0,0 +1,36 @@
+https://github.com/libical/libical/commit/eeccee80d0485bdd3951924b294a82e8bc39a5f8
+https://bugs.gentoo.org/876622
+
+From: Allen Winter <allen.winter@kdab.com>
+Date: Mon, 10 Oct 2022 14:58:29 -0400
+Subject: [PATCH] Revert "src/libical/icalparser.c - fix a fuzz issue for
+ integer overflow"
+
+This reverts commit ca3e2ad983771b90da259994b7a6d7de1fd1abdc.
+--- a/src/libical/icalparser.c
++++ b/src/libical/icalparser.c
+@@ -630,7 +630,6 @@ icalcomponent *icalparser_parse(icalparser *parser,
+                                 icalparser_line_gen_func line_gen_func)
+ {
+     char *line;
+-    unsigned int cnt = 0;
+     icalcomponent *c = 0;
+     icalcomponent *root = 0;
+     icalerrorstate es = icalerror_get_error_state(ICAL_MALFORMEDDATA_ERROR);
+@@ -641,7 +640,6 @@ icalcomponent *icalparser_parse(icalparser *parser,
+     icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, ICAL_ERROR_NONFATAL);
+ 
+     do {
+-        cnt++;
+         line = icalparser_get_line(parser, line_gen_func);
+ 
+         if ((c = icalparser_add_line(parser, line)) != 0) {
+@@ -681,7 +679,7 @@ icalcomponent *icalparser_parse(icalparser *parser,
+             icalmemory_free_buffer(line);
+             cont = 1;
+         }
+-    } while (cont && cnt < TMP_BUF_SIZE);
++    } while (cont);
+ 
+     icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, es);
+ 
diff --git a/dev-libs/libical/libical-3.0.15-r1.ebuild b/dev-libs/libical/libical-3.0.15-r1.ebuild
new file mode 100644
index 000000000000..f3c4f2d2e9b4
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.15-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="Implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-libs/timezone-data
+"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		glib? ( dev-util/gtk-doc )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		${PYTHON_DEPS}
+		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
+	)
+	vala? ( $(vala_depend) )
+"
+
+DOCS=(
+	AUTHORS README.md ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents.txt,UsingLibical.md}
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-tests.patch"
+	"${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch"
+	"${FILESDIR}/${P}-fortify-source-3.patch"
+	"${FILESDIR}/${P}-revert-bad-fuzz-fix.patch"
+)
+
+python_check_deps() {
+	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	use examples || cmake_comment_add_subdirectory examples
+	use vala && vala_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB=ON
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DICAL_GLIB=$(usex glib)
+		-DGOBJECT_INTROSPECTION=$(usex introspection)
+		-DSHARED_ONLY=$(usex !static-libs)
+		-DLIBICAL_BUILD_TESTING=$(usex test)
+		-DICAL_GLIB_VAPI=$(usex vala)
+	)
+	if use vala; then
+		mycmakeargs+=(
+			-DVALAC="${VALAC}"
+			-DVAPIGEN="${VAPIGEN}"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_src_compile docs
+
+		HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+	fi
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}