From b62381b18b4bf2e919cbfbae11ebcad391e38e77 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Dec 2022 03:35:12 +0000 Subject: gentoo auto-resync : 16:12:2022 - 03:35:12 --- dev-libs/Manifest.gz | Bin 96184 -> 96178 bytes dev-libs/efl/Manifest | 2 +- dev-libs/efl/efl-1.26.3-r1.ebuild | 311 +++++++++++++++++++ dev-libs/efl/efl-1.26.3.ebuild | 311 ------------------- dev-libs/libical/Manifest | 4 - .../files/libical-3.0.15-fortify-source-3.patch | 43 --- .../files/libical-3.0.15-revert-bad-fuzz-fix.patch | 36 --- dev-libs/libical/libical-3.0.15-r1.ebuild | 119 ------- dev-libs/openssl/Manifest | 1 + dev-libs/openssl/openssl-3.0.7-r2.ebuild | 342 +++++++++++++++++++++ dev-libs/plasma-wayland-protocols/Manifest | 2 - .../plasma-wayland-protocols-1.7.0.ebuild | 19 -- 12 files changed, 655 insertions(+), 535 deletions(-) create mode 100644 dev-libs/efl/efl-1.26.3-r1.ebuild delete mode 100644 dev-libs/efl/efl-1.26.3.ebuild delete mode 100644 dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch delete mode 100644 dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch delete mode 100644 dev-libs/libical/libical-3.0.15-r1.ebuild create mode 100644 dev-libs/openssl/openssl-3.0.7-r2.ebuild delete mode 100644 dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 9f934a3221b2..66ddea8e7b40 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest index 13f7e812f09c..3622dc44fe23 100644 --- a/dev-libs/efl/Manifest +++ b/dev-libs/efl/Manifest @@ -1,3 +1,3 @@ DIST efl-1.26.3.tar.xz 168540684 BLAKE2B aeb0215b9cdce9ca10550c698df4985ff9557c3c400c3a300887148d04a8900f04c7200473e5fce1d3021378be1e664e9364d171ec09c4fc488b4ec758722ea5 SHA512 9801ee8bc963786962d87af56d532d3f019bc18a91924d2ef84934dcd0ae30452d858db93c33964f2bff9af2f3c8feb9927f7281ead4a8993ed622cd0cf2c514 -EBUILD efl-1.26.3.ebuild 8282 BLAKE2B b0ff8a33d6d9a755122f8d5b26b5b54a621f64294f9d74c28776fbc33c3c871f2b8e3afa29f6f043594720c234e9423423c0f2cfeeee6afe1eec6604bfbd98cc SHA512 1cfba81197ac9adf707f51c97c82ba399679a64fecc5e228c1c01b68f6ac520e4d785c47343ae539d6c7252b3ae84519482cd743796da8912c83c9686fd9709c +EBUILD efl-1.26.3-r1.ebuild 8297 BLAKE2B 46cc65ae4c347f1e3df7068083628c3f6355cc07e14c50e781760b1adf78eb44617cd76030918cbb673293faa7b8db8c24dc7e3cca5644b09a6fd1f82b3127f4 SHA512 4afbce336acf2e225b6240fee8cae3ffc57fa7f251d1b019bd27754fccb8b6b8063756661d2308e3a2ba64949f782422e5f029aca55908aa4f39a8c1365e1733 MISC metadata.xml 1943 BLAKE2B 192127f421b9e9216ac8b9b2b161dd99bff9ae0286e1051bd541e4102046ebd23d835d2a0745d5ec82e9ce2b56e37569b2b3e0532f7d2daa485c17eda17bebd8 SHA512 c7a8d0dcfddfa4e1b2f0fce817e9daf3f07c014eeeeb3a7cf4d43df89b35aab24872e5fad1dcf3bf00213dbbb309436a49e005d8ce94095b1810067e5b68b250 diff --git a/dev-libs/efl/efl-1.26.3-r1.ebuild b/dev-libs/efl/efl-1.26.3-r1.ebuild new file mode 100644 index 000000000000..b26e74c9c3e3 --- /dev/null +++ b/dev-libs/efl/efl-1.26.3-r1.ebuild @@ -0,0 +1,311 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND="dev-texlive/texlive-fontutils" +DOCS_DIR="${S}/doc" + +LUA_REQ_USE="deprecated(+)" +LUA_COMPAT=( lua5-{1,2} luajit ) + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit docs lua-single meson python-any-r1 xdg + +DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" +HOMEPAGE="https://www.enlightenment.org" +SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86" +IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon + +fontconfig fribidi gif gnutls glib +gstreamer harfbuzz heif hyphen ibus ico + jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim + sdl +sound +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf + xim xpm xpresent zeroconf" + +REQUIRED_USE="${LUA_REQUIRED_USE} + ?? ( elogind systemd ) + ?? ( fbcon tslib ) + drm? ( wayland ) + examples? ( eet svg ) + ibus? ( glib ) + opengl? ( X ) + pulseaudio? ( sound ) + xim? ( X ) + xpresent? ( X )" + +# Requires everything to be enabled unconditionally. +RESTRICT="test" + +RDEPEND="${LUA_DEPS} + !x11-themes/e-flat-theme + dev-libs/libinput:= + net-misc/curl + media-libs/giflib:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + sys-apps/dbus + sys-libs/zlib + X? ( + !opengl? ( media-libs/mesa[egl(+),gles2] ) + media-libs/freetype + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libxkbcommon + wayland? ( x11-libs/libxkbcommon[X] ) + ) + avif? ( media-libs/libavif:= ) + connman? ( net-misc/connman ) + drm? ( + dev-libs/libinput:= + dev-libs/wayland + media-libs/mesa[gbm(+)] + x11-libs/libdrm + x11-libs/libxkbcommon + ) + elogind? ( + sys-auth/elogind + virtual/libudev:= + ) + fontconfig? ( media-libs/fontconfig ) + fribidi? ( dev-libs/fribidi ) + glib? ( dev-libs/glib:2 ) + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:0= ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + harfbuzz? ( media-libs/harfbuzz:= ) + heif? ( media-libs/libheif:= ) + hyphen? ( dev-libs/hyphen ) + ibus? ( app-i18n/ibus ) + jpeg2k? ( media-libs/openjpeg:= ) + json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) + mono? ( dev-lang/mono ) + opengl? ( virtual/opengl ) + pdf? ( app-text/poppler:=[cxx] ) + physics? ( sci-physics/bullet:= ) + postscript? ( app-text/libspectre ) + pulseaudio? ( media-sound/pulseaudio ) + raw? ( media-libs/libraw:= ) + scim? ( app-i18n/scim ) + sdl? ( media-libs/libsdl2 ) + sound? ( media-libs/libsndfile ) + svg? ( gnome-base/librsvg:2 ) + system-lz4? ( app-arch/lz4:= ) + systemd? ( sys-apps/systemd:= ) + tiff? ( media-libs/tiff:= ) + tslib? ( x11-libs/tslib:= ) + unwind? ( sys-libs/libunwind:= ) + v4l? ( media-libs/libv4l ) + vnc? ( net-libs/libvncserver ) + wayland? ( + dev-libs/wayland + media-libs/mesa[gles2,wayland] + x11-libs/libxkbcommon + ) + webp? ( media-libs/libwebp:= ) + xpm? ( x11-libs/libXpm ) + xpresent? ( x11-libs/libXpresent ) + zeroconf? ( net-dns/avahi )" +DEPEND="${RDEPEND} + wayland? ( dev-libs/wayland-protocols )" +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + wayland? ( dev-util/wayland-scanner )" + +pkg_setup() { + # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so. + QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV} + /usr/$(get_libdir)/libefreet_mime.so.${PV}" + + python-any-r1_pkg_setup +} + +src_prepare() { + default + + # Remove automagic unwind configure option, #743154 + if ! use unwind; then + sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build || + die "Failed to remove libunwind dep" + fi + + # Fixup Doxyfile + pushd "${DOCS_DIR}" || die + cp Doxyfile.in Doxyfile || die + sed -i \ + -e "s/@PACKAGE_VERSION@/${PV}/g" \ + -e "s/@top_builddir@/../g" \ + -e "s/@top_srcdir@/../g" \ + -e "s/@srcdir@/./g" \ + Doxyfile || die + popd || die + + # Fix python shebangs for python-exec[-native-symlinks], #764086 + local shebangs=($(grep -rl "#!/usr/bin/env python3" || die)) + python_fix_shebang -q ${shebangs[*]} +} + +src_configure() { + local emesonargs=( + --buildtype=plain + + -D buffer=false + -D build-tests=false + -D cocoa=false + -D drm-deprecated=false + -D g-mainloop=false + -D mono-beta=false + -D dotnet=false + -D pixman=false + -D wl-deprecated=false + -D dotnet-stylecop-severity=Warning + + -D edje-sound-and-video=true + -D eeze=true + -D input=true + -D install-eo-files=true + -D libmount=true + -D native-arch-optimization=true + -D xinput2=true + -D xinput22=true + + $(meson_use X x11) + $(meson_use debug debug-threads) + $(meson_use drm) + $(meson_use examples build-examples) + $(meson_use fbcon fb) + $(meson_use fontconfig) + $(meson_use fribidi) + $(meson_use glib) + $(meson_use gstreamer) + $(meson_use harfbuzz) + $(meson_use hyphen) + $(meson_use lua_single_target_luajit elua) + $(meson_use nls) + $(meson_use physics) + $(meson_use pulseaudio) + $(meson_use sdl) + $(meson_use sound audio) + $(meson_use tslib) + $(meson_use v4l v4l2) + $(meson_use vnc vnc-server) + $(meson_use wayland wl) + $(meson_use xpresent) + $(meson_use zeroconf avahi) + + $(meson_use !system-lz4 embedded-lz4) + ) + + if use elogind || use systemd; then + emesonargs+=( -D systemd=true ) + else + emesonargs+=( -D systemd=false ) + fi + + if use wayland; then + emesonargs+=( -D opengl=es-egl ) + elif ! use wayland && use opengl; then + emesonargs+=( -D opengl=full ) + elif ! use wayland && use X && ! use opengl; then + emesonargs+=( -D opengl=es-egl ) + else + emesonargs+=( -D opengl=none ) + fi + + if use gnutls; then + emesonargs+=( -D crypto=gnutls ) + else + emesonargs+=( -D crypto=openssl ) + fi + + if use connman; then + emesonargs+=( -D network-backend=connman ) + else + emesonargs+=( -D network-backend=none ) + fi + + local disabledEvasLoaders="" + ! use avif && disabledEvasLoaders="avif," + ! use bmp && disabledEvasLoaders+="bmp,wbmp," + ! use dds && disabledEvasLoaders+="dds," + ! use eet && disabledEvasLoaders+="eet," + ! use gstreamer && disabledEvasLoaders+="gst," + ! use heif && disabledEvasLoaders+="heif," + ! use ico && disabledEvasLoaders+="ico," + ! use jpeg2k && disabledEvasLoaders+="jp2k," + ! use json && disabledEvasLoaders+="json," + ! use pdf && disabledEvasLoaders+="pdf," + ! use pmaps && disabledEvasLoaders+="pmaps," + ! use postscript && disabledEvasLoaders+="ps," + ! use psd && disabledEvasLoaders+="psd," + ! use raw && disabledEvasLoaders+="raw," + ! use svg && disabledEvasLoaders+="rsvg,svg," + ! use tga && disabledEvasLoaders+="tga," + ! use tgv && disabledEvasLoaders+="tgv," + ! use tiff && disabledEvasLoaders+="tiff," + ! use webp && disabledEvasLoaders+="webp," + ! use xcf && disabledEvasLoaders+="xcf," + ! use xpm && disabledEvasLoaders+="xpm," + [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1} + emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" ) + + local disabledImfLoaders="" + ! use ibus && disabledImfLoaders+="ibus," + ! use scim && disabledImfLoaders+="scim," + ! use xim && disabledImfLoaders+="xim," + [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1} + emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" ) + + local bindingsList="cxx," + use lua_single_target_luajit && bindingsList+="lua," + use mono && bindingsList+="mono," + [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1} + emesonargs+=( -D bindings="${bindingsList}" ) + + local luaChoice="" + if use lua_single_target_luajit; then + luaChoice+="luajit" + else + luaChoice+="lua" + fi + emesonargs+=( -D lua-interpreter="${luaChoice}" ) + + # Not all arm CPU's have neon instruction set, #722552 + if use arm && ! use cpu_flags_arm_neon; then + emesonargs+=( -D native-arch-optimization=false ) + fi + + meson_src_configure +} + +src_compile() { + docs_compile + meson_src_compile +} + +src_install() { + meson_src_install + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples/ + dodoc -r "${BUILD_DIR}"/src/examples/ + fi +} diff --git a/dev-libs/efl/efl-1.26.3.ebuild b/dev-libs/efl/efl-1.26.3.ebuild deleted file mode 100644 index 012b480dd540..000000000000 --- a/dev-libs/efl/efl-1.26.3.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DOCS_BUILDER="doxygen" -DOCS_DEPEND="dev-texlive/texlive-fontutils" -DOCS_DIR="${S}/doc" - -LUA_REQ_USE="deprecated(+)" -LUA_COMPAT=( lua5-{1,2} luajit ) - -PYTHON_COMPAT=( python3_{8..11} ) - -inherit docs lua-single meson python-any-r1 xdg - -DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" -HOMEPAGE="https://www.enlightenment.org" -SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz" - -LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86" -IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon - +fontconfig fribidi gif gnutls glib +gstreamer harfbuzz heif hyphen ibus ico - jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim - sdl +sound +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf - xim xpm xpresent zeroconf" - -REQUIRED_USE="${LUA_REQUIRED_USE} - ?? ( elogind systemd ) - ?? ( fbcon tslib ) - drm? ( wayland ) - examples? ( eet svg ) - ibus? ( glib ) - opengl? ( X ) - pulseaudio? ( sound ) - xim? ( X ) - xpresent? ( X )" - -# Requires everything to be enabled unconditionally. -RESTRICT="test" - -RDEPEND="${LUA_DEPS} - !x11-themes/e-flat-theme - dev-libs/libinput:= - net-misc/curl - media-libs/giflib:= - media-libs/libpng:0= - sys-apps/dbus - sys-libs/zlib - virtual/jpeg - X? ( - !opengl? ( media-libs/mesa[egl(+),gles2] ) - media-libs/freetype - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libxkbcommon - wayland? ( x11-libs/libxkbcommon[X] ) - ) - avif? ( media-libs/libavif:= ) - connman? ( net-misc/connman ) - drm? ( - dev-libs/libinput:= - dev-libs/wayland - media-libs/mesa[gbm(+)] - x11-libs/libdrm - x11-libs/libxkbcommon - ) - elogind? ( - sys-auth/elogind - virtual/libudev:= - ) - fontconfig? ( media-libs/fontconfig ) - fribidi? ( dev-libs/fribidi ) - glib? ( dev-libs/glib:2 ) - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/openssl:0= ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - harfbuzz? ( media-libs/harfbuzz:= ) - heif? ( media-libs/libheif:= ) - hyphen? ( dev-libs/hyphen ) - ibus? ( app-i18n/ibus ) - jpeg2k? ( media-libs/openjpeg:= ) - json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) - mono? ( dev-lang/mono ) - opengl? ( virtual/opengl ) - pdf? ( app-text/poppler:=[cxx] ) - physics? ( sci-physics/bullet:= ) - postscript? ( app-text/libspectre ) - pulseaudio? ( media-sound/pulseaudio ) - raw? ( media-libs/libraw:= ) - scim? ( app-i18n/scim ) - sdl? ( media-libs/libsdl2 ) - sound? ( media-libs/libsndfile ) - svg? ( gnome-base/librsvg:2 ) - system-lz4? ( app-arch/lz4:= ) - systemd? ( sys-apps/systemd:= ) - tiff? ( media-libs/tiff ) - tslib? ( x11-libs/tslib:= ) - unwind? ( sys-libs/libunwind:= ) - v4l? ( media-libs/libv4l ) - vnc? ( net-libs/libvncserver ) - wayland? ( - dev-libs/wayland - media-libs/mesa[gles2,wayland] - x11-libs/libxkbcommon - ) - webp? ( media-libs/libwebp:= ) - xpm? ( x11-libs/libXpm ) - xpresent? ( x11-libs/libXpresent ) - zeroconf? ( net-dns/avahi )" -DEPEND="${RDEPEND} - wayland? ( dev-libs/wayland-protocols )" -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - wayland? ( dev-util/wayland-scanner )" - -pkg_setup() { - # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so. - QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV} - /usr/$(get_libdir)/libefreet_mime.so.${PV}" - - python-any-r1_pkg_setup -} - -src_prepare() { - default - - # Remove automagic unwind configure option, #743154 - if ! use unwind; then - sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build || - die "Failed to remove libunwind dep" - fi - - # Fixup Doxyfile - pushd "${DOCS_DIR}" || die - cp Doxyfile.in Doxyfile || die - sed -i \ - -e "s/@PACKAGE_VERSION@/${PV}/g" \ - -e "s/@top_builddir@/../g" \ - -e "s/@top_srcdir@/../g" \ - -e "s/@srcdir@/./g" \ - Doxyfile || die - popd || die - - # Fix python shebangs for python-exec[-native-symlinks], #764086 - local shebangs=($(grep -rl "#!/usr/bin/env python3" || die)) - python_fix_shebang -q ${shebangs[*]} -} - -src_configure() { - local emesonargs=( - --buildtype=plain - - -D buffer=false - -D build-tests=false - -D cocoa=false - -D drm-deprecated=false - -D g-mainloop=false - -D mono-beta=false - -D dotnet=false - -D pixman=false - -D wl-deprecated=false - -D dotnet-stylecop-severity=Warning - - -D edje-sound-and-video=true - -D eeze=true - -D input=true - -D install-eo-files=true - -D libmount=true - -D native-arch-optimization=true - -D xinput2=true - -D xinput22=true - - $(meson_use X x11) - $(meson_use debug debug-threads) - $(meson_use drm) - $(meson_use examples build-examples) - $(meson_use fbcon fb) - $(meson_use fontconfig) - $(meson_use fribidi) - $(meson_use glib) - $(meson_use gstreamer) - $(meson_use harfbuzz) - $(meson_use hyphen) - $(meson_use lua_single_target_luajit elua) - $(meson_use nls) - $(meson_use physics) - $(meson_use pulseaudio) - $(meson_use sdl) - $(meson_use sound audio) - $(meson_use tslib) - $(meson_use v4l v4l2) - $(meson_use vnc vnc-server) - $(meson_use wayland wl) - $(meson_use xpresent) - $(meson_use zeroconf avahi) - - $(meson_use !system-lz4 embedded-lz4) - ) - - if use elogind || use systemd; then - emesonargs+=( -D systemd=true ) - else - emesonargs+=( -D systemd=false ) - fi - - if use wayland; then - emesonargs+=( -D opengl=es-egl ) - elif ! use wayland && use opengl; then - emesonargs+=( -D opengl=full ) - elif ! use wayland && use X && ! use opengl; then - emesonargs+=( -D opengl=es-egl ) - else - emesonargs+=( -D opengl=none ) - fi - - if use gnutls; then - emesonargs+=( -D crypto=gnutls ) - else - emesonargs+=( -D crypto=openssl ) - fi - - if use connman; then - emesonargs+=( -D network-backend=connman ) - else - emesonargs+=( -D network-backend=none ) - fi - - local disabledEvasLoaders="" - ! use avif && disabledEvasLoaders="avif," - ! use bmp && disabledEvasLoaders+="bmp,wbmp," - ! use dds && disabledEvasLoaders+="dds," - ! use eet && disabledEvasLoaders+="eet," - ! use gstreamer && disabledEvasLoaders+="gst," - ! use heif && disabledEvasLoaders+="heif," - ! use ico && disabledEvasLoaders+="ico," - ! use jpeg2k && disabledEvasLoaders+="jp2k," - ! use json && disabledEvasLoaders+="json," - ! use pdf && disabledEvasLoaders+="pdf," - ! use pmaps && disabledEvasLoaders+="pmaps," - ! use postscript && disabledEvasLoaders+="ps," - ! use psd && disabledEvasLoaders+="psd," - ! use raw && disabledEvasLoaders+="raw," - ! use svg && disabledEvasLoaders+="rsvg,svg," - ! use tga && disabledEvasLoaders+="tga," - ! use tgv && disabledEvasLoaders+="tgv," - ! use tiff && disabledEvasLoaders+="tiff," - ! use webp && disabledEvasLoaders+="webp," - ! use xcf && disabledEvasLoaders+="xcf," - ! use xpm && disabledEvasLoaders+="xpm," - [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1} - emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" ) - - local disabledImfLoaders="" - ! use ibus && disabledImfLoaders+="ibus," - ! use scim && disabledImfLoaders+="scim," - ! use xim && disabledImfLoaders+="xim," - [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1} - emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" ) - - local bindingsList="cxx," - use lua_single_target_luajit && bindingsList+="lua," - use mono && bindingsList+="mono," - [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1} - emesonargs+=( -D bindings="${bindingsList}" ) - - local luaChoice="" - if use lua_single_target_luajit; then - luaChoice+="luajit" - else - luaChoice+="lua" - fi - emesonargs+=( -D lua-interpreter="${luaChoice}" ) - - # Not all arm CPU's have neon instruction set, #722552 - if use arm && ! use cpu_flags_arm_neon; then - emesonargs+=( -D native-arch-optimization=false ) - fi - - meson_src_configure -} - -src_compile() { - docs_compile - meson_src_compile -} - -src_install() { - meson_src_install - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples/ - dodoc -r "${BUILD_DIR}"/src/examples/ - fi -} diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index 46f937c49728..b87bd6af0f55 100644 --- a/dev-libs/libical/Manifest +++ b/dev-libs/libical/Manifest @@ -1,11 +1,7 @@ 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 DIST libical-3.0.16.tar.gz 921245 BLAKE2B d6afe96abf32ece87393d85b4e5b0c1c10330ac64bca52bbaef96af45fbc06242cbbb4274fa350cc9a56655de238a85dea6111f381674b7cff44ab67a470e89e SHA512 72659c98f6c98b3e0fa15849df7f80993403100fb5c237e452df714a7be2d1d27f4547c81b399fe7bc6b1fb10c8c7cf9a23f5b969d588d7b05d7fe2e29c86bd4 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.16.ebuild 2454 BLAKE2B 52a9c12bef27a6151d28ba80b59f214e9a5be19230617121a162a6351c51c9ad170d7ee97c05d1164185a36bf4e8ecc12bdc0a4da14fb8ff12671a4ced04a107 SHA512 f4e8390941f44d217f6c968d99f83432d5adffba855f9fde667f3a1f2a1a2b51fa642362097c5dc5d74dc1cf6817b458b26c81b6ed657c7cdddd84f3f7c4fc74 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 deleted file mode 100644 index 830d646b74d0..000000000000 --- a/dev-libs/libical/files/libical-3.0.15-fortify-source-3.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://github.com/libical/libical/commit/d67034b31cebe0db3ca65342813336b123921a15 -https://github.com/libical/libical/issues/603 -https://bugs.gentoo.org/876625 - -From: Allen Winter -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 deleted file mode 100644 index e6f4d33ad286..000000000000 --- a/dev-libs/libical/files/libical-3.0.15-revert-bad-fuzz-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/libical/libical/commit/eeccee80d0485bdd3951924b294a82e8bc39a5f8 -https://bugs.gentoo.org/876622 - -From: Allen Winter -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 deleted file mode 100644 index f3c4f2d2e9b4..000000000000 --- a/dev-libs/libical/libical-3.0.15-r1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# 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 -} diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 4547432fe865..ed299532b79b 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -17,4 +17,5 @@ EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9 EBUILD openssl-1.1.1q.ebuild 10190 BLAKE2B d43cbde3d6b34a33f7937b59d0a2770290cc342ff664796bca1c546d2a70ba609d0d8f035c1cf2d8f339bcd82ab651e970a5d9ee55a2a6734a2e17b7187aff59 SHA512 47e480e4344753939cd8f64c1e7dd36eed12b8568cc18dd9691bb4d231088d2f77d1ba5fb79f2f9f3ec18b3bb8fb9c118bbb716af91d0023fe920fc968f081ee EBUILD openssl-1.1.1s.ebuild 10158 BLAKE2B 37c2c20d232c239ba52bdd60b225162c4c14022bc10fb2e8e43a2db301d839cb2479dcfbbf640525a40fe8d2767941459a6bb4cd95e35324cc2bbb21d73870f2 SHA512 548b0b19fb692ff69409aed3acea87ab6146977175b43017524dfb4dcc77b911deef94ef29b480a911a712191a9116047ff66aef5ec7de57d796902a6c2f3de3 EBUILD openssl-3.0.7-r1.ebuild 9867 BLAKE2B cf5c11fb8f3629e708fe973ce4a8347ab8d04901e625e34ff55be93307ce3f5c3214a2efaaf7d475638007ab6bc21ea7b895d701a8574f877e285cc87fe020a4 SHA512 df9cc24b08cab21f607eed16aed95a82ba491d5368f29fa74296082955a612900fd3284a7bece408a95a3346a5aeb0bbb162a6d64bbd01abc8ebde75395b4f47 +EBUILD openssl-3.0.7-r2.ebuild 10000 BLAKE2B e01195a374bd8a6f3653b870093a8e45ebe0c298e9ff585b5388e9e9749ff661787db33b7a4711d8b8e266c0f6cce93927b647f28ef1746f8bb70b20a0dbe7cd SHA512 a9e459915c6f0cc18faa47d8647a15af88b72f441495ded49c0bd43318817afc21b8f0ddbff51b61917b8fcfacfe1a283a19822def94d9234ef3db15864f7c2d MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92 diff --git a/dev-libs/openssl/openssl-3.0.7-r2.ebuild b/dev-libs/openssl/openssl-3.0.7-r2.ebuild new file mode 100644 index 000000000000..45aab079830a --- /dev/null +++ b/dev-libs/openssl/openssl-3.0.7-r2.ebuild @@ -0,0 +1,342 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc +inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig + +DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" +HOMEPAGE="https://www.openssl.org/" + +MY_P=${P/_/-} + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/openssl/openssl.git" + + inherit git-r3 +else + SRC_URI="mirror://openssl/source/${MY_P}.tar.gz + verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" + KEYWORDS="~alpha ~amd64" +fi + +S="${WORKDIR}"/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0/3" # .so version of libssl/libcrypto +IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=app-misc/c_rehash-1.7-r1 + tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) +" +BDEPEND=" + >=dev-lang/perl-5 + sctp? ( >=net-misc/lksctp-tools-1.0.12 ) + test? ( + sys-apps/diffutils + sys-devel/bc + sys-process/procps + ) + verify-sig? ( >=sec-keys/openpgp-keys-openssl-20221101 )" + +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +PDEPEND="app-misc/ca-certificates" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/openssl/configuration.h +) + +PATCHES=( + "${FILESDIR}"/${P}-x509-CVE-2022-3996.patch +) + +pkg_setup() { + if use ktls ; then + if kernel_is -lt 4 18 ; then + ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" + else + CONFIG_CHECK="~TLS ~TLS_DEVICE" + ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" + ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" + + linux-info_pkg_setup + fi + fi + + [[ ${MERGE_TYPE} == binary ]] && return + + # must check in pkg_setup; sysctl doesn't work with userpriv! + if use test && use sctp ; then + # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" + # if sctp.auth_enable is not enabled. + local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) + if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then + die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" + fi + fi +} + +src_unpack() { + # Can delete this once test fix patch is dropped + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_prepare() { + # Allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.3 gentoo.config || die + chmod a+rx gentoo.config || die + + # Keep this in sync with app-misc/c_rehash + SSL_CNF_DIR="/etc/ssl" + + # Make sure we only ever touch Makefile.org and avoid patching a file + # that gets blown away anyways by the Configure script in src_configure + rm -f Makefile + + if ! use vanilla ; then + PATCHES+=( + # Add patches which are Gentoo-specific customisations here + ) + fi + + default + + if use test && use sctp && has network-sandbox ${FEATURES} ; then + einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." + rm test/recipes/80-test_ssl_new.t || die + fi + + # - Make sure the man pages are suffixed (bug #302165) + # - Don't bother building man pages if they're disabled + # - Make DOCDIR Gentoo compliant + sed -i \ + -e '/^MANSUFFIX/s:=.*:=ssl:' \ + -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ + -e $(has noman FEATURES \ + && echo '/^install:/s:install_docs::' \ + || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ + -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \ + Configurations/unix-Makefile.tmpl \ + || die + + # Quiet out unknown driver argument warnings since openssl + # doesn't have well-split CFLAGS and we're making it even worse + # and 'make depend' uses -Werror for added fun (bug #417795 again) + tc-is-clang && append-flags -Qunused-arguments + + # We really, really need to build OpenSSL w/ strict aliasing disabled. + # It's filled with violations and it *will* result in miscompiled + # code. This has been in the ebuild for > 10 years but even in 2022, + # it's still relevant: + # - https://github.com/llvm/llvm-project/issues/55255 + # - https://github.com/openssl/openssl/issues/18225 + # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 + # Don't remove the no strict aliasing bits below! + filter-flags -fstrict-aliasing + append-flags -fno-strict-aliasing + + append-flags $(test-flags-CC -Wa,--noexecstack) + + # Prefixify Configure shebang (bug #141906) + sed \ + -e "1s,/usr/bin/env,${BROOT}&," \ + -i Configure || die + + # Remove test target when FEATURES=test isn't set + if ! use test ; then + sed \ + -e '/^$config{dirs}/s@ "test",@@' \ + -i Configure || die + fi + + local sslout=$(./gentoo.config) + einfo "Using configuration: ${sslout:-(openssl knows best)}" + + # The config script does stupid stuff to prompt the user. Kill it. + sed -i '/stty -icanon min 0 time 50; read waste/d' config || die + ./config ${sslout} --test-sanity || die "I AM NOT SANE" + + multilib_copy_sources +} + +multilib_src_configure() { + # bug #197996 + unset APPS + # bug #312551 + unset SCRIPTS + # bug #311473 + unset CROSS_COMPILE + + tc-export AR CC CXX RANLIB RC + + use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } + + local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") + + # See if our toolchain supports __uint128_t. If so, it's 64bit + # friendly and can use the nicely optimized code paths, bug #460790. + #local ec_nistp_64_gcc_128 + # + # Disable it for now though (bug #469976) + # Do NOT re-enable without substantial discussion first! + # + #echo "__uint128_t i;" > "${T}"/128.c + #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then + # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" + #fi + + local sslout=$(./gentoo.config) + einfo "Using configuration: ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + + # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features + local myeconfargs=( + ${sslout} + + $(use cpu_flags_x86_sse2 || echo "no-sse2") + enable-camellia + enable-ec + enable-ec2m + enable-sm2 + enable-srp + $(use elibc_musl && echo "no-async") + enable-idea + enable-mdc2 + enable-rc5 + $(use fips && echo "enable-fips") + $(use_ssl asm) + $(use_ssl ktls) + $(use_ssl rfc3779) + $(use_ssl sctp) + $(use test || echo "no-tests") + $(use_ssl tls-compression zlib) + $(use_ssl weak-ssl-ciphers) + + --prefix="${EPREFIX}"/usr + --openssldir="${EPREFIX}"${SSL_CNF_DIR} + --libdir=$(get_libdir) + + shared + threads + ) + + CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}" + + # Clean out hardcoded flags that openssl uses + local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ + -e 's:^CFLAGS=::' \ + -e 's:\(^\| \)-fomit-frame-pointer::g' \ + -e 's:\(^\| \)-O[^ ]*::g' \ + -e 's:\(^\| \)-march=[^ ]*::g' \ + -e 's:\(^\| \)-mcpu=[^ ]*::g' \ + -e 's:\(^\| \)-m[^ ]*::g' \ + -e 's:^ *::' \ + -e 's: *$::' \ + -e 's: \+: :g' \ + -e 's:\\:\\\\:g' + ) + + # Now insert clean default flags with user flags + sed -i \ + -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ + -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ + Makefile \ + || die +} + +multilib_src_compile() { + # depend is needed to use $confopts; it also doesn't matter + # that it's -j1 as the code itself serializes subdirs + emake -j1 depend + + emake all +} + +multilib_src_test() { + # VFP = show subtests verbosely and show failed tests verbosely + # Normal V=1 would show everything verbosely but this slows things down. + emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test +} + +multilib_src_install() { + # We need to create ${ED}/usr on our own to avoid a race condition (bug #665130) + dodir /usr + + emake DESTDIR="${D}" install + + # This is crappy in that the static archives are still built even + # when USE=static-libs. But this is due to a failing in the openssl + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + if ! use static-libs ; then + rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die + fi +} + +multilib_src_install_all() { + # openssl installs perl version of c_rehash by default, but + # we provide a shell version via app-misc/c_rehash + rm "${ED}"/usr/bin/c_rehash || die + + dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el + + # Create the certs directory + keepdir ${SSL_CNF_DIR}/certs + + # Namespace openssl programs to prevent conflicts with other man pages + cd "${ED}"/usr/share/man || die + local m d s + for m in $(find . -type f | xargs grep -L '#include') ; do + d=${m%/*} + d=${d#./} + m=${m##*/} + + [[ ${m} == openssl.1* ]] && continue + + [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" + + mv ${d}/{,ssl-}${m} || die + + # Fix up references to renamed man pages + sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die + ln -s ssl-${m} ${d}/openssl-${m} || die + + # Locate any symlinks that point to this man page + # We assume that any broken links are due to the above renaming + for s in $(find -L ${d} -type l) ; do + s=${s##*/} + + rm -f ${d}/${s} + + # We don't want to "|| die" here + ln -s ssl-${m} ${d}/ssl-${s} + ln -s ssl-${s} ${d}/openssl-${s} + done + done + [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" + + # bug #254521 + dodir /etc/sandbox.d + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl + + diropts -m0700 + keepdir ${SSL_CNF_DIR}/private +} + +pkg_postinst() { + ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)" + c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null + eend $? +} diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest index d481a4da3dfb..5f8017c86d3a 100644 --- a/dev-libs/plasma-wayland-protocols/Manifest +++ b/dev-libs/plasma-wayland-protocols/Manifest @@ -1,5 +1,3 @@ -DIST plasma-wayland-protocols-1.7.0.tar.xz 42000 BLAKE2B 581d6c375e7f17abd346ccc9482da46238fcf52a84c04d991ccdcb95bd4472dc6b2c2c612382ffd7cebdb669da00be05df9b0f5e58cc6767fcb7183b0e8ae459 SHA512 1ed01ce6af375c4012b3367377cea172446f2a7f1bef01c2e56dc2482c378955f9507e4e3bbb2ab316ba116ec181beaf9287f5b81199a02d5fd9eefb658bcb9c DIST plasma-wayland-protocols-1.9.0.tar.xz 42920 BLAKE2B cdf277f0fad842b018bdc05cfcb7834b81750784d395fc24ef1c906d828d178268f524af5e3383d0f2f799a73aad44d78a82c4fa333f420cdf89674ed98d373b SHA512 96157622e22b19da9b2b842a9996595d75b792c179127e617347429d01bc8236d44cc12a5c34dd2ed903d4b43791ffaedc44cf773b82da9b60a06f711353a68c -EBUILD plasma-wayland-protocols-1.7.0.ebuild 463 BLAKE2B ebbd2ea3d8d0746c04a4ce801abb5050f25bf6c0ef6786f8aaaa1d3626d4ae6fb5fa67cbca345c8e1f4f4751176a46afb5798540e8f5f1bf887d2bf13779deb2 SHA512 e0ba5c569b09efcec3ea0cd6f625dc9fd1c3eaa6ae90e8055c7d349aeaf17e492b4d79b1da9469775b73bea4868fe4eb3430fbf3e25ca7303d504f53647fc41c EBUILD plasma-wayland-protocols-1.9.0.ebuild 463 BLAKE2B ebbd2ea3d8d0746c04a4ce801abb5050f25bf6c0ef6786f8aaaa1d3626d4ae6fb5fa67cbca345c8e1f4f4751176a46afb5798540e8f5f1bf887d2bf13779deb2 SHA512 e0ba5c569b09efcec3ea0cd6f625dc9fd1c3eaa6ae90e8055c7d349aeaf17e492b4d79b1da9469775b73bea4868fe4eb3430fbf3e25ca7303d504f53647fc41c MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild deleted file mode 100644 index 0cbb9ba6f14c..000000000000 --- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.7.0.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_NONGUI=true -KFMIN=5.82.0 -inherit ecm kde.org - -DESCRIPTION="Plasma Specific Protocols for Wayland" -HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -- cgit v1.2.3