diff options
Diffstat (limited to 'dev-libs/libical')
| -rw-r--r-- | dev-libs/libical/Manifest | 8 | ||||
| -rw-r--r-- | dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch | 24 | ||||
| -rw-r--r-- | dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch | 24 | ||||
| -rw-r--r-- | dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch (renamed from dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch) | 2 | ||||
| -rw-r--r-- | dev-libs/libical/libical-3.0.4.ebuild | 4 | ||||
| -rw-r--r-- | dev-libs/libical/libical-3.0.5.ebuild | 95 |
6 files changed, 152 insertions, 5 deletions
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index 0486e8352b37..4e61a0f0b6cd 100644 --- a/dev-libs/libical/Manifest +++ b/dev-libs/libical/Manifest @@ -1,5 +1,9 @@ -AUX libical-3.0.1-pkgconfig-libdir.patch 1228 BLAKE2B 34bae335d1889d0090d02b72a61ea5fc90940210cccb2d09e3ef6a01464579f2fb6bf83b6e9dbcd35950227f0f1c830bbc0b77d1fe3eaa42fd649edfef4f3181 SHA512 556e3deadef8bbb210dbd3bf918aa9cbe0f8a1cfbbf8ecbeeff36a74f134cdebabad96f6ad05f6a1e2afcde669bb145bbea6ab83efa6f7b90b4637f7f761fa49 +AUX libical-3.0.4-pkgconfig-libdir.patch 940 BLAKE2B 2b7748bdaba3ae14a83305aba4a2620a6cd85d679b736b5ad9890104f5ac1042cc39b50506f1239ff35d9f98408f4feee1a384943b855c83fb4519785bf19a48 SHA512 492def0e87c6abc9c7c3e4a69133b54bd4c5a05ba42be554bf3ebe170d846b6d5ec5d1cbfabb9289b5ea82693e1b2af60a2cfe07ea5c36da5ba335e29df9a1f5 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9 +AUX libical-3.0.5-fix-lots-of-params.patch 898 BLAKE2B b0fd85229bde64bba92ee93171766e3e6d99748c873cbbf2e213c8196555db06a82b113d75c7512eb8f75e3beadeedc5529755ed9ef593414b272fcc43eacc12 SHA512 4d5559d147a3ce51697af24c13e2eca0575f4da16bea5db3066e00fad09b6d58d16fb2401e44e9623b9db9b939d4ab115989ee1f8bad2cfe59118e2cf626ead5 +AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37 DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9 -EBUILD libical-3.0.4.ebuild 2040 BLAKE2B a40362cf9984fb4a562a9b3a93280c7a9923d53cf9571e15a3937f60bea81239f4c6958e05e00a285dee81ebfcae716ffafbe3fc55cd1bd03df993e358505818 SHA512 9be3ec5d8dbd56306eeee4c74ccc04f80ceb5b56a0746d7eba88645be4b2e781ed8812b01054a4beb39a9e463dac048ecbccd68b114d0d68f7321473fc5df01e +DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656 +EBUILD libical-3.0.4.ebuild 2044 BLAKE2B 74e2578c8f33971566f608ff67695a97c935217746f9a4d4222fac1c0558803fcba89fa8e9f3107ed210aec7d89ea863e475c840bd49163c582696d798e3aa8b SHA512 8cb6f316e299b25f1477aa3191e5a541061f5d1c5e327caaab252c46a429a2c85173e36015c0f7aa787d962e0c8a55c8cbb2358d61660842574eb319aef87963 +EBUILD libical-3.0.5.ebuild 2117 BLAKE2B b1812c771a9a96e3264d83cf1006a164f997ec914c27c977f09587d21a99eae820c5bccdb0c78e79b41ad847d41d74eb429753640b2fc0f6e5983a39d01390ca SHA512 8d1f1dac9762c8065d3ea2209790cf83302a570e1da4fede045df3fc5724c685e76df52f4976d6d2260215d88f8b542e4aa8ec97e56e3499f7f12b8c38041c8f MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c diff --git a/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch new file mode 100644 index 000000000000..1ef0817bce7b --- /dev/null +++ b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch @@ -0,0 +1,24 @@ +From 111ee5ff9daf7db21ad0b6874c4b7cc05baf4703 Mon Sep 17 00:00:00 2001 +From: Milan Crha <mcrha@redhat.com> +Date: Tue, 8 Jan 2019 22:13:47 +0100 +Subject: [PATCH] Fix typo in libical-glib.pc.in + +Missing '$' causes compiler warnings about missing-include-dirs, due to +the {includedir} not being properly replaced with the variable value. + +Signed-off-by: Allen Winter <allen.winter@kdab.com> +--- + src/libical-glib/libical-glib.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libical-glib/libical-glib.pc.in b/src/libical-glib/libical-glib.pc.in +index 42f1ffe5..e164cfb5 100644 +--- a/src/libical-glib/libical-glib.pc.in ++++ b/src/libical-glib/libical-glib.pc.in +@@ -7,5 +7,5 @@ Name: libical-glib + Description: A GObject interface of the libical library + Version: @LIBICAL_LIB_VERSION_STRING@ + Requires: glib-2.0, gobject-2.0, libical +-Cflags: -I{includedir} ++Cflags: -I${includedir} + Libs: -L${libdir} -lical-glib diff --git a/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch b/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch new file mode 100644 index 000000000000..187a5de0cd4b --- /dev/null +++ b/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch @@ -0,0 +1,24 @@ +From f02ca493123b7c8e8eaaa758d787e9e2753fd9b8 Mon Sep 17 00:00:00 2001 +From: Kent Sutherland <git@ksuther.com> +Date: Fri, 17 May 2019 13:26:52 -0500 +Subject: [PATCH] Include invalid parameters in the maximum number of allowed + parameters Fixes hangs when iterating lots of invalid parameters (valid + parameters already have a cap from f6c64896988644a7c6d4d5060f6ab574c2a62fbf) + oss-fuzz issue 14809 + +--- + src/libical/icalparser.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libical/icalparser.c b/src/libical/icalparser.c +index 99803418..fa71e8bd 100644 +--- a/src/libical/icalparser.c ++++ b/src/libical/icalparser.c +@@ -1098,6 +1098,7 @@ icalcomponent *icalparser_add_line(icalparser *parser, char *line) + + icalmemory_free_buffer(str); + str = NULL; ++ pcount++; + continue; + } + } diff --git a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch index aae02abc537d..a3a80e9f76f5 100644 --- a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch +++ b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch @@ -38,7 +38,7 @@ Fix pkgconfig libdir paths. @@ -8,4 +8,4 @@ Version: @LIBICAL_LIB_VERSION_STRING@ Requires: glib-2.0, gobject-2.0, libical - Cflags: -I{includedir} + Cflags: -I${includedir} -Libs: -L${libdir} -lical-glib +Libs: -lical-glib diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild index 2dbe0b25537d..3e1efabd39b7 100644 --- a/dev-libs/libical/libical-3.0.4.ebuild +++ b/dev-libs/libical/libical-3.0.4.ebuild @@ -41,8 +41,8 @@ DOCS=( ) PATCHES=( - "${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch" - "${FILESDIR}/${P}-tests.patch" + "${FILESDIR}"/${PN}-3.0.{4,5}-pkgconfig-libdir.patch + "${FILESDIR}"/${P}-tests.patch ) pkg_setup() { diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild new file mode 100644 index 000000000000..5503824d60d6 --- /dev/null +++ b/dev-libs/libical/libical-3.0.5.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) +inherit cmake-utils python-any-r1 + +DESCRIPTION="An 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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="berkdb doc examples static-libs test" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( ${PYTHON_DEPS} ) +" +# TODO: disabled until useful +# glib? ( +# dev-libs/glib:2 +# dev-libs/libxml2:2 +# ) +# introspection? ( dev-libs/gobject-introspection:= ) +DEPEND=" + dev-libs/icu:= + berkdb? ( sys-libs/db:= ) +" +RDEPEND="${DEPEND} + sys-libs/timezone-data +" + +DOCS=( + AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO + doc/{AddingOrModifyingComponents,UsingLibical}.txt +) + +PATCHES=( + "${FILESDIR}/${PN}-3.0.4-tests.patch" + "${FILESDIR}/${P}-pkgconfig-libdir.patch" + "${FILESDIR}/${P}-fix-lots-of-params.patch" +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + use examples || cmake_comment_add_subdirectory examples +} + +src_configure() { + local mycmakeargs=( + -DICAL_GLIB=OFF + -DICAL_GLIB_VAPI=OFF + -DGOBJECT_INTROSPECTION=OFF + $(cmake-utils_use_find_package berkdb BDB) + -DICAL_BUILD_DOCS=$(usex doc) + -DSHARED_ONLY=$(usex !static-libs) + ) +# TODO: disabled until useful +# -DICAL_GLIB=$(usex glib) +# -DGOBJECT_INTROSPECTION=$(usex introspection) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use doc && cmake-utils_src_compile docs +} + +src_test() { + local myctestargs=( + -E "(icalrecurtest|icalrecurtest-r)" # bug 660282 + ) + + cmake-utils_src_test +} + +src_install() { + use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) + + cmake-utils_src_install + + if use examples; then + rm examples/CMakeLists.txt || die + dodoc -r examples + fi +} |