gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2024-05-22 17:18:53 +00:00
parent ccd51a0fe2 f425b156d1
commit 8deb43bce8
17 changed files with 261 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app-crypt/tpm2-tss/files/tpm2-tss-4.0.2-Hide-write-all-function.patch Normal file
View File

@@ -0,0 +1,24 @@
diff --git a/src/util/io.c b/src/util/io.c
index c6446826..50c0fd6c 100644
--- a/src/util/io.c
+++ b/src/util/io.c
@@ -81,6 +81,7 @@ read_all (
return recvd_total;
}
+__attribute__ ((visibility("hidden")))
ssize_t
write_all (
SOCKET fd,
diff --git a/src/util/io.h b/src/util/io.h
index 25dd5c45..fec391d8 100644
--- a/src/util/io.h
+++ b/src/util/io.h
@@ -70,6 +70,7 @@ read_all (
* are detected. This is currently limited to interrupted system calls and
* short writes.
*/
+__attribute__ ((visibility("hidden")))
ssize_t
write_all (
SOCKET fd,

110
app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild Normal file
View File

@@ -0,0 +1,110 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/4"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
RESTRICT="!test? ( test )"
REQUIRED_USE="
^^ ( mbedtls openssl )
fapi? ( openssl !mbedtls )
policy? ( openssl !mbedtls )
"
RDEPEND="
acct-group/tss
acct-user/tss
sys-apps/util-linux:=[${MULTILIB_USEDEP}]
fapi? (
dev-libs/json-c:=[${MULTILIB_USEDEP}]
>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
)
mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
"
DEPEND="
${RDEPEND}
test? ( app-crypt/swtpm
dev-libs/uthash
dev-util/cmocka
fapi? ( >=net-misc/curl-7.80.0 ) )
"
BDEPEND="
sys-apps/acl
virtual/pkgconfig
doc? ( app-text/doxygen )
"
PATCHES=(
"${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch"
"${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
"${FILESDIR}/${PN}-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch"
"${FILESDIR}/${PN}-4.0.2-Hide-write-all-function.patch"
)
pkg_setup() {
local CONFIG_CHECK="~TCG_TPM"
linux-info_pkg_setup
kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
}
src_prepare() {
default
eautoreconf
}
multilib_src_configure() {
# Fails with inlining
filter-flags -fno-semantic-interposition
# tests fail with LTO enabbled. See bug 865275 and 865279
filter-lto
local myconf=(
--localstatedir=/var
$(multilib_native_use_enable doc doxygen-doc)
$(use_enable fapi)
$(use_enable policy)
$(use_enable static-libs static)
$(multilib_native_use_enable test unit)
$(multilib_native_use_enable test integration)
$(multilib_native_use_enable test self-generated-certificate)
--disable-tcti-libtpms
--disable-defaultflags
--disable-weakcrypto
--with-crypto="$(usex mbedtls mbed ossl)"
--with-runstatedir=/run
--with-udevrulesdir="$(get_udevdir)/rules.d"
--with-udevrulesprefix=60-
--without-sysusersdir
--with-tmpfilesdir="/usr/lib/tmpfiles.d"
)
ECONF_SOURCE=${S} econf "${myconf[@]}"
}
multilib_src_install() {
default
keepdir /var/lib/tpm2-tss/system/keystore
find "${ED}" -name '*.la' -delete || die
}
pkg_postinst() {
tmpfiles_process tpm2-tss-fapi.conf
udev_reload
}
pkg_postrm() {
udev_reload
}

16
app-text/libmspub/libmspub-0.1.4.ebuild
View File

@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
inherit autotools flag-o-matic
@@ -19,18 +19,18 @@ LICENSE="LGPL-2.1"
SLOT="0"
IUSE="doc static-libs"
BDEPEND="
virtual/pkgconfig
doc? ( app-text/doxygen )
"
RDEPEND="
dev-libs/icu:=
dev-libs/librevenge
sys-libs/zlib
"
DEPEND="${RDEPEND}
dev-libs/boost
dev-build/libtool
dev-libs/boost
"
BDEPEND="
virtual/pkgconfig
doc? ( app-text/doxygen )
"
PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
@@ -44,8 +44,8 @@ src_prepare() {
}
src_configure() {
# bug 619044
append-cxxflags -std=c++14
# bug 619044, 932494
append-cxxflags -std=c++17
local myeconfargs=(
--disable-werror

18
app-text/libmspub/libmspub-9999.ebuild
View File

@@ -1,11 +1,11 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
inherit autotools flag-o-matic
if [[ ${PV} = *9999 ]]; then
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
inherit git-r3
else
@@ -19,18 +19,18 @@ LICENSE="LGPL-2.1"
SLOT="0"
IUSE="doc static-libs"
BDEPEND="
virtual/pkgconfig
doc? ( app-text/doxygen )
"
RDEPEND="
dev-libs/icu:=
dev-libs/librevenge
sys-libs/zlib
"
DEPEND="${RDEPEND}
dev-libs/boost
dev-build/libtool
dev-libs/boost
"
BDEPEND="
virtual/pkgconfig
doc? ( app-text/doxygen )
"
src_prepare() {
@@ -42,8 +42,8 @@ src_prepare() {
}
src_configure() {
# bug 619044
append-cxxflags -std=c++14
# bug 619044, 932494
append-cxxflags -std=c++17
local myeconfargs=(
--disable-werror

1
dev-db/kdb/kdb-3.2.0-r2.ebuild
View File

@@ -61,6 +61,7 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
-DCMAKE_CXX_STANDARD=17
-DKDB_DEBUG_GUI=$(usex debug)
$(cmake_use_find_package mysql MySQL)
$(cmake_use_find_package postgres PostgreSQL)

11
dev-libs/xerces-c/files/xerces-c-3.2.5-cxx17.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@
# Try C++14, then fall back to C++11 and C++98. Used for feature tests
# for optional features.
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
# Use folders (for IDE project grouping)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

1
dev-libs/xerces-c/xerces-c-3.2.5.ebuild
View File

@@ -35,6 +35,7 @@ DOCS=( CREDITS KEYS NOTICE README )
PATCHES=(
"${FILESDIR}"/${PN}-3.2.4-strict-aliasing.patch
"${FILESDIR}"/${P}-cxx17.patch # bug 931105
)
pkg_setup() {

2
dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
View File

@@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
HOMEPAGE="https://www.qt.io/"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="~amd64 arm64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"

1
dev-util/git-fixup/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST git-fixup-1.6.1.tar.gz 8571 BLAKE2B 4451f1af753d6bd13a5a9d11f79b313f8a2b00f2f386c89eb14e8d2af6cf9c1f424328912160d2059b173fc9f64271872a816b53de340413ef779ff6bcc21bfc SHA512 502d0a188333420ea2467bfc22bbfeefab595cc951777403baaafaa14b34c138adaee590fdc09ce71faf58d13666f85cdd8495a4039632c73d269565336c381f

26
dev-util/git-fixup/git-fixup-1.6.1.ebuild Normal file
View File

@@ -0,0 +1,26 @@
# Copyright 2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/keis/git-fixup"
inherit git-r3
else
SRC_URI="https://github.com/keis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
DESCRIPTION="Fighting the copy-paste element of your rebase workflow"
HOMEPAGE="https://github.com/keis/git-fixup"
LICENSE="ISC"
SLOT="0"
RDEPEND="!<app-portage/mgorny-dev-scripts-53"
src_compile() { :; }
src_install() {
emake install{,-fish,-zsh} DESTDIR="${ED}" PREFIX="${EPREFIX}/usr"
}

11
dev-util/git-fixup/metadata.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mattst88@gentoo.org</email>
<name>Matt Turner</name>
</maintainer>
<upstream>
<remote-id type="github">keis/git-fixup</remote-id>
</upstream>
</pkgmetadata>

4
media-libs/libvisio/libvisio-0.1.7.ebuild
View File

@@ -45,8 +45,8 @@ src_prepare() {
}
src_configure() {
# bug 619688
append-cxxflags -std=c++14
# bug 619688, 932496
append-cxxflags -std=c++17
local myeconfargs=(
$(use_with doc docs)

4
media-libs/libvisio/libvisio-9999.ebuild
View File

@@ -45,8 +45,8 @@ src_prepare() {
}
src_configure() {
# bug 619688
append-cxxflags -std=c++14
# bug 619688, 932496
append-cxxflags -std=c++17
local myeconfargs=(
$(use_with doc docs)

4
net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -30,6 +30,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch )
# All checks in libmicrohttpd's configure are correct
# Gentoo Bug #898662
# Gentoo Bug #923760
QA_CONFIG_IMPL_DECL_SKIP=(
'pthread_sigmask'
'CreateThread'
@@ -64,6 +65,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
'sysctlbyname'
'usleep'
'nanosleep'
'stpncpy'
)
multilib_src_configure() {

8
net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -27,6 +27,12 @@ BDEPEND="ssl? ( virtual/pkgconfig )"
DOCS=( AUTHORS NEWS COPYING README ChangeLog )
# All checks in libmicrohttpd's configure are correct
# Gentoo Bug #923760
QA_CONFIG_IMPL_DECL_SKIP=(
'stpncpy'
)
pkg_pretend() {
if use kernel_linux ; then
CONFIG_CHECK=""

8
net-libs/libmicrohttpd/libmicrohttpd-1.0.1.ebuild
View File

@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="|| ( LGPL-2.1+ !ssl? ( GPL-2+-with-eCos-exception-2 ) )"
SLOT="0/12"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="debug +epoll +eventfd ssl static-libs test +thread-names verify-sig"
IUSE="debug +epoll +eventfd ssl static-libs test +thread-names"
REQUIRED_USE="epoll? ( kernel_linux )"
RESTRICT="!test? ( test )"
@@ -27,6 +27,12 @@ BDEPEND="ssl? ( virtual/pkgconfig )"
DOCS=( AUTHORS NEWS COPYING README ChangeLog )
# All checks in libmicrohttpd's configure are correct
# Gentoo Bug #923760
QA_CONFIG_IMPL_DECL_SKIP=(
'stpncpy'
)
pkg_pretend() {
if use kernel_linux ; then
CONFIG_CHECK=""

37
net-misc/r8125/r8125-9.013.02-r1.ebuild Normal file
View File

@@ -0,0 +1,37 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit linux-mod-r1
DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
HOMEPAGE="https://www.realtek.com/Download/List?cate_id=584"
# Mirrored to avoid captcha
SRC_URI="https://github.com/Karlson2k/r8125/releases/download/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+multi-tx-q ptp +rss use-firmware"
CONFIG_CHECK="~!R8169"
WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
src_compile() {
local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
local modargs=(
# Build parameters
KERNELDIR="${KV_OUT_DIR}"
# Configuration settings
ENABLE_PTP_SUPPORT=$(usex ptp y n)
ENABLE_RSS_SUPPORT=$(usex rss y n)
ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
ENABLE_PAGE_REUSE=y
ENABLE_RX_PACKET_FRAGMENT=y
)
linux-mod-r1_src_compile
}