summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-03-29 22:14:40 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-03-30 10:58:22 +0100
commitb8998a9bbdb89e01d0e0d5bb722ff7b5705f46d6 (patch)
treede010e8d1c31c9e77f6f6d6f851a6071b375d32d
parentkde-misc/systemd-kcm: EAPI-7 bump (diff)
downloadgentoo-b8998a9bbdb89e01d0e0d5bb722ff7b5705f46d6.tar.gz
gentoo-b8998a9bbdb89e01d0e0d5bb722ff7b5705f46d6.tar.bz2
gentoo-b8998a9bbdb89e01d0e0d5bb722ff7b5705f46d6.zip
dev-libs/libical: Drop vulnerable 2.0.0-r3
Bug: https://bugs.gentoo.org/587572 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-libs/libical/Manifest1
-rw-r--r--dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch28
-rw-r--r--dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch47
-rw-r--r--dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch44
-rw-r--r--dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch19
-rw-r--r--dev-libs/libical/files/libical-2.0.0-tests.patch38
-rw-r--r--dev-libs/libical/libical-2.0.0-r3.ebuild60
7 files changed, 0 insertions, 237 deletions
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index bcd8bbd027d..d0547e218f6 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,2 +1 @@
-DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch
deleted file mode 100644
index 6044d133749..00000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-This is a patch for Gentoo bug 560572, provided by Georgi Georgiev.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 773cf0c..e282ce4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -336,7 +336,7 @@ endif()
- set(VERSION "${PROJECT_VERSION}")
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
- set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
-
-diff --git a/libical.pc.in b/libical.pc.in
-index 7774dce..bf88476 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -8,8 +8,8 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal
-+Libs: -lical -licalss -licalvcal
- Libs.private: @PTHREAD_LIBS@
- @REQUIRES_PRIVATE_ICU@
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch
deleted file mode 100644
index e19dc037902..00000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit f70a26aaf836da0f9e242945151b49190d682d95
-Author: Allen Winter <allen.winter@kdab.com>
-Date: Sat Dec 3 11:11:48 2016 -0500
-
- CMakeLists.txt, libical.pc.in - ICU must appear as Requires in pkgconfig
- issue#244
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b3d49d0d..0f6dfc34 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,7 +145,7 @@ endif()
- # RSCALE info at http://tools.ietf.org/html/rfc7529
- find_package(ICU)
- if(ICU_FOUND)
-- set(ICUUC_LIBS "-licuuc") #for libical.pc
-+ set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc
- set(HAVE_LIBICU 1)
- if(ICU_MAJOR_VERSION VERSION_GREATER 50)
- set(HAVE_ICU_DANGI TRUE)
-@@ -155,7 +155,6 @@ if(ICU_FOUND)
- endif()
- if(ICU_I18N_FOUND)
- set(HAVE_LIBICU_I18N 1)
-- set(ICUI18N_LIBS "-licui18n") #for libical.pc
- endif()
-
- # MSVC specific definitions
-diff --git a/libical.pc.in b/libical.pc.in
-index 8899f430..c07eb52a 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -2,11 +2,11 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--threadslib=@PTHREAD_LIBS@
--iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
-
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
-+Libs: -L${libdir} -lical -licalss -licalvcal
-+Libs.private: @PTHREAD_LIBS@
-+@REQUIRES_PRIVATE_ICU@
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch
deleted file mode 100644
index 08cf51f9408..00000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d
-Author: Allen Winter <allen.winter@kdab.com>
-Date: Sat Sep 3 16:56:29 2016 -0400
-
- CMakeLists.txt, libical.pc.in - fix iculibs (remove full path)
- ISSUE: 227
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0173e1a8..0c903ee5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,6 +145,7 @@ endif()
- # RSCALE info at http://tools.ietf.org/html/rfc7529
- find_package(ICU)
- if(ICU_FOUND)
-+ set(ICUUC_LIBS "-licuuc") #for libical.pc
- set(HAVE_LIBICU 1)
- if(ICU_MAJOR_VERSION VERSION_GREATER 50)
- set(HAVE_ICU_DANGI TRUE)
-@@ -154,6 +155,7 @@ if(ICU_FOUND)
- endif()
- if(ICU_I18N_FOUND)
- set(HAVE_LIBICU_I18N 1)
-+ set(ICUI18N_LIBS "-licui18n") #for libical.pc
- endif()
-
- # MSVC specific definitions
-diff --git a/libical.pc.in b/libical.pc.in
-index 5c2debd8..8899f430 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
- threadslib=@PTHREAD_LIBS@
--iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
-+iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
-
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
-+Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch
deleted file mode 100644
index 403ee84cd65..00000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit cdc85e9e7a14932808471f823bc974031a0c4842
-Author: Allen Winter <allen.winter@kdab.com>
-Date: Mon Jan 25 14:57:20 2016 -0500
-
- libical.pc.in - set the version to the full major.minor.patch
- as requested by Milan.
-
-diff --git a/libical.pc.in b/libical.pc.in
-index 7774dce2..5c2debd8 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -7,6 +7,6 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
-
- Name: libical
- Description: An implementation of basic iCAL protocols
--Version: @VERSION@
-+Version: @LIBICAL_LIB_VERSION_STRING@
- Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-tests.patch b/dev-libs/libical/files/libical-2.0.0-tests.patch
deleted file mode 100644
index a274382b315..00000000000
--- a/dev-libs/libical/files/libical-2.0.0-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b1081cccb90fbe4cd859d3280a0470c30dce5cac Mon Sep 17 00:00:00 2001
-From: Allen Winter <allen.winter@kdab.com>
-Date: Thu, 24 Mar 2016 16:28:02 -0400
-Subject: [PATCH] recur.c, testvcal.c - use TEST_DATADIR to point to the test
- data thereby fixing in-source building ISSUE#228
- https://bugs.gentoo.org/show_bug.cgi?id=532296
-
----
- src/test/recur.c | 2 +-
- src/test/testvcal.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/recur.c b/src/test/recur.c
-index d427137a..873ec48a 100644
---- a/src/test/recur.c
-+++ b/src/test/recur.c
-@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
- #endif
-
- if (argc <= 1) {
-- file = "../../test-data/recur.txt";
-+ file = TEST_DATADIR "/recur.txt";
- } else if (argc == 2) {
- file = argv[1];
- } else {
-diff --git a/src/test/testvcal.c b/src/test/testvcal.c
-index feee8147..024bbe99 100644
---- a/src/test/testvcal.c
-+++ b/src/test/testvcal.c
-@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
- char *file;
-
- if (argc != 2) {
-- file = "../../test-data/user-cal.vcf";
-+ file = TEST_DATADIR "/user-cal.vcf";
- } else {
- file = argv[1];
- }
diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
deleted file mode 100644
index f92f67e5d8c..00000000000
--- a/dev-libs/libical/libical-2.0.0-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
-SLOT="0/2"
-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="doc examples static-libs"
-
-# The GOBJECT_INTROSPECTION build is broken, and upstream has given up
-# on it at the moment (it's disabled in Travis). It will probably come
-# back in v2.0.1 or later.
-# This snippet belongs to RDEPEND:
-# introspection? ( dev-libs/gobject-introspection )"
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-DOCS=(
- AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
- doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
- "${FILESDIR}/${P}-libical.pc-set-full-version.patch"
- "${FILESDIR}/${P}-libical.pc-icu-remove-full-paths.patch"
- "${FILESDIR}/${P}-libical.pc-icu-move-to-requires.patch"
- "${FILESDIR}/${P}-libical.pc-fix-libdir-location.patch"
- "${FILESDIR}/${P}-tests.patch" #bug 532296
-)
-
-src_configure() {
- # See above, introspection is disabled for v2.0.0 at least.
- #local mycmakeargs=(
- # -DGOBJECT_INTROSPECTION=$(usex introspection true false)
- #)
- use static-libs || mycmakeargs+=( -DSHARED_ONLY=ON )
- cmake-utils_src_configure
-}
-
-src_test() {
- local myctestargs=( -j1 )
- cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples; then
- rm examples/CMakeLists.txt || die
- dodoc -r examples
- fi
-}