commit: a6706e2c90a89fbc7134957e5b3647d98811600b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Aug 17 08:54:02 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Aug 18 11:20:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6706e2c
app-admin/calamares: 3.2.12 bump, CVE-2019-13178, CVE-2019-13179 Bug: https://bugs.gentoo.org/690830 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-admin/calamares/Manifest | 1 + app-admin/calamares/calamares-3.2.12.ebuild | 95 +++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 6ec291032ca..6cf8abc08bc 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,2 +1,3 @@ DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df SHA512 451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a +DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857 SHA512 00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0 DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29 SHA512 f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63 diff --git a/app-admin/calamares/calamares-3.2.12.ebuild b/app-admin/calamares/calamares-3.2.12.ebuild new file mode 100644 index 00000000000..2b847131cb1 --- /dev/null +++ b/app-admin/calamares/calamares-3.2.12.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_TEST="true" +PYTHON_COMPAT=( python3_{5,6} ) +inherit kde5 python-r1 + +DESCRIPTION="Distribution-independent installer framework" +HOMEPAGE="https://calamares.io"; +if [[ ${KDE_BUILD_TYPE} == live ]] ; then + EGIT_REPO_URI="https://github.com/${PN}/${PN}"; +else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"; + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3" +IUSE="+networkmanager pythonqt +upower" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + $(add_qt_dep linguist-tools) +" +COMMON_DEPEND="${PYTHON_DEPS} + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kpackage) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwebengine 'widgets') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-cpp/yaml-cpp:= + >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}] + dev-libs/libpwquality[${PYTHON_USEDEP}] + sys-apps/dbus + sys-apps/dmidecode + sys-auth/polkit-qt[qt5(+)] + >=sys-libs/kpmcore-4.0.0:5= + pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] ) +" +DEPEND="${COMMON_DEPEND} + test? ( $(add_qt_dep qttest) ) +" +RDEPEND="${COMMON_DEPEND} + app-admin/sudo + dev-libs/libatasmart + net-misc/rsync + || ( sys-boot/grub:2 sys-boot/systemd-boot ) + sys-boot/os-prober + sys-fs/squashfs-tools + sys-libs/timezone-data + virtual/udev + networkmanager? ( net-misc/networkmanager ) + upower? ( sys-power/upower ) +" + +src_prepare() { + cmake-utils_src_prepare + python_setup + export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ + PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ + PYTHON_CFLAGS="$(python_get_CFLAGS)"\ + PYTHON_LIBS="$(python_get_LIBS)" + + sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \ + calamares.desktop || die + sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \ + calamares.desktop || die +} + +src_configure() { + local mycmakeargs=( + -DWEBVIEW_FORCE_WEBKIT=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON + -DWITH_PYTHONQT=$(usex pythonqt) + ) + + kde5_src_configure +} + +src_install() { + kde5_src_install + dobin "${FILESDIR}"/calamares-pkexec +}
