diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-31 13:43:35 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-31 13:43:35 +0000 |
| commit | 2891d29af8907ce881662f4a02844926d7a293c7 (patch) | |
| tree | 56979d96839d0827aa52008b81b746b4934d88df /kde-frameworks | |
| parent | de49812990871e1705b64051c35161d5e6400269 (diff) | |
gentoo resync : 31.12.2018
Diffstat (limited to 'kde-frameworks')
| -rw-r--r-- | kde-frameworks/Manifest.gz | bin | 13720 -> 13716 bytes | |||
| -rw-r--r-- | kde-frameworks/kinit/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/kinit/files/kinit-5.53.0-systemd-240-soft-rlimit.patch | 27 | ||||
| -rw-r--r-- | kde-frameworks/kinit/kinit-5.53.0-r1.ebuild (renamed from kde-frameworks/kinit/kinit-5.53.0.ebuild) | 2 |
4 files changed, 31 insertions, 1 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz Binary files differindex 883ab6fbb199..d0a4268556d7 100644 --- a/kde-frameworks/Manifest.gz +++ b/kde-frameworks/Manifest.gz diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest index 8c32b9731a38..39318fd681ba 100644 --- a/kde-frameworks/kinit/Manifest +++ b/kde-frameworks/kinit/Manifest @@ -1,5 +1,6 @@ +AUX kinit-5.53.0-systemd-240-soft-rlimit.patch 911 BLAKE2B 72ef40bb3635003107a39dcf265eb917c5960cb264d63029f72b65ad0909893017caf9b705ce803f81fa426b8398ceeaaa7d6ca68656fbc3ab24d19e3f30a3fd SHA512 c629bf2b9950782dd1b2723efbda1f91346702d0d85761e16ca64ea2506779e508ee74a57c12d826857b910e2692e42ba854cc4ac688d869ac16dd0f1befa8e0 DIST kinit-5.52.0.tar.xz 120156 BLAKE2B 01b01be684ab94cff18a39893e9a74207e7ec98b593c6aa88980f50d1637033bf3742a40c092d804c7ca4cd5e87cda18a1c9b43db1c59f43fb7b22dca430e05a SHA512 ae3e1352bd5fa95a10637e26535fede2294b0048ca35efed66d58d687b857ad5605502cbbe2636f1bf193176fcaf8b8a9057c1c572f0776c814641962899b88b DIST kinit-5.53.0.tar.xz 120240 BLAKE2B c5d0d8916b62abc79e7c4a095e89949ff5624081970ade81f57b9f9818d276a5f7b7745cab84fdb5128eea51f19404b645b5d863bc9a4a36abc3441aed733ec2 SHA512 52561fb6747bdf229dcf5ea9b84f0df050454c6b587630816184f65d2bb552401dc28eb7ed96209a1ff70374e1033c27de26d143532be5a3998ac69cdadd3f9d EBUILD kinit-5.52.0.ebuild 998 BLAKE2B ccd30cf750d176e49f0c7ffaa894be38816c7fd8e11a4487b233067298811d6c46eee18b23d22c946ae64365fa8fc7ab9dea0a26e162c83d3bf074d6713dd933 SHA512 e870751ae3e985a8ba808dc7c94466549bf79846d2b46260373ca80f9205ddcd808e9aafb76fe9d76ce0197b5fe98072f05f2c57ba4088371548b6e9b3df05bd -EBUILD kinit-5.53.0.ebuild 1000 BLAKE2B 52fe5fb735917df24b803cb897b1d15e8ffc9536342b1f7997eacbfe6185caead4df71aeed4c74666a7334c4937066c1909ea471f41137811e55bd8047567011 SHA512 2dc2d1b033af572991fed2942d4e3e4761b1f5054a11f76b9bb9d63d88bd0e8e4f92faaa31bd732785a6efc956e7d3368f6551f326ac4f31bfe65ce96c801dab +EBUILD kinit-5.53.0-r1.ebuild 1062 BLAKE2B f95f4efa8ac061285e03537158babb2011b7ade77bb85c59fa980114478d157d33ea13e90208a01c03c79ddce2103da17ce6f0ecabca1d5f2ce9dc00e8b7d34d SHA512 de5561a319c922ea61fdfbee771ad220312ac64cf67201b3530ca096de17fb1a7ceff5a41e830fdfc82e1e27cc3321eb8a8de56b64d2993a73c9ae7f1b7e5579 MISC metadata.xml 412 BLAKE2B 8029572bd77c6a7381c5fdce9d864c05616c1da9144e61385936a6678cc94f2279be1b551c148fcea8b58f98ce704521c0f02f3b7ad0f9b41a4ebd3dd7c469bb SHA512 f5e7eea56365a00dee0fd4983e10b7cb5a0ec42f68eff735778d69f59499f7b5f59289429a59e7ef6e2afa8a830261782f4e86db229224e442c8d83dcc1e635a diff --git a/kde-frameworks/kinit/files/kinit-5.53.0-systemd-240-soft-rlimit.patch b/kde-frameworks/kinit/files/kinit-5.53.0-systemd-240-soft-rlimit.patch new file mode 100644 index 000000000000..3f8823d5b2d5 --- /dev/null +++ b/kde-frameworks/kinit/files/kinit-5.53.0-systemd-240-soft-rlimit.patch @@ -0,0 +1,27 @@ +From 26620aef0bd6d01b543e7523dd15dddc1bb871df Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen <ossi@kde.org> +Date: Mon, 24 Dec 2018 14:43:23 +0100 +Subject: use soft rlimit for number of open handles + +systemd 240 bumped the hard limit from the previous 4k (?) to 1G, which +makes kdeinit essentially lock up at startup. +to get around that, use the soft limit, which matches fd_setsize (1k). +--- + src/kdeinit/kinit.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 748bfca..02ab794 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -165,7 +165,7 @@ static void cleanup_fds() + int maxfd = FD_SETSIZE; + struct rlimit rl; + if (getrlimit(RLIMIT_NOFILE, &rl) == 0) { +- maxfd = rl.rlim_max; ++ maxfd = rl.rlim_cur; + } + for (int fd = 3; fd < maxfd; ++fd) { + #if KDEINIT_OOM_PROTECT +-- +cgit v1.1 diff --git a/kde-frameworks/kinit/kinit-5.53.0.ebuild b/kde-frameworks/kinit/kinit-5.53.0-r1.ebuild index 92301f9b5f00..910c3df5286b 100644 --- a/kde-frameworks/kinit/kinit-5.53.0.ebuild +++ b/kde-frameworks/kinit/kinit-5.53.0-r1.ebuild @@ -33,6 +33,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " +PATCHES=( "${FILESDIR}/${P}-systemd-240-soft-rlimit.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package caps Libcap) |