From 16449a80e28af2209916cc66d19c9a44ca2b90d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Feb 2019 15:11:50 +0000 Subject: gentoo resync : 20.02.2019 --- sys-apps/Manifest.gz | Bin 50664 -> 50661 bytes sys-apps/bubblewrap/Manifest | 4 +- sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild | 6 +- sys-apps/bubblewrap/bubblewrap-0.3.1.ebuild | 45 -- sys-apps/irqbalance/Manifest | 2 +- sys-apps/irqbalance/irqbalance-1.5.0.ebuild | 2 +- sys-apps/kmod/Manifest | 2 +- sys-apps/kmod/kmod-25.ebuild | 2 +- sys-apps/less/Manifest | 7 +- sys-apps/less/files/less-549-mouse_fix.patch | 51 +++ sys-apps/less/less-548.ebuild | 44 -- sys-apps/less/less-549-r1.ebuild | 48 +++ sys-apps/less/less-549.ebuild | 44 -- sys-apps/less/less-550.ebuild | 44 ++ sys-apps/osinfo-db-tools/Manifest | 2 + .../osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild | 32 ++ sys-apps/osinfo-db/Manifest | 8 +- sys-apps/osinfo-db/osinfo-db-20181011.ebuild | 27 -- sys-apps/osinfo-db/osinfo-db-20181116.ebuild | 27 -- sys-apps/osinfo-db/osinfo-db-20181203.ebuild | 4 +- sys-apps/osinfo-db/osinfo-db-20190218.ebuild | 27 ++ sys-apps/pcsc-lite/Manifest | 2 +- sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild | 2 +- sys-apps/portage/Manifest | 4 + sys-apps/portage/portage-2.3.61.ebuild | 271 ++++++++++++ sys-apps/portage/portage-2.3.62.ebuild | 271 ++++++++++++ sys-apps/systemd/Manifest | 6 + sys-apps/systemd/files/CVE-2019-6454.patch | 198 +++++++++ ...-message-paths-longer-than-BUS_PATH_SIZE_.patch | 48 +++ ...mporary-strings-to-hold-dbus-paths-on-the.patch | 188 +++++++++ ...e-receive-an-invalid-dbus-message-ignore-.patch | 54 +++ sys-apps/systemd/systemd-239-r4.ebuild | 449 ++++++++++++++++++++ sys-apps/systemd/systemd-241-r1.ebuild | 461 +++++++++++++++++++++ sys-apps/sysvinit/Manifest | 3 + .../files/sysvinit-2.94_beta-shutdown-single.patch | 39 ++ sys-apps/sysvinit/sysvinit-2.94_beta.ebuild | 133 ++++++ sys-apps/texinfo/Manifest | 7 +- sys-apps/texinfo/texinfo-6.1.ebuild | 40 -- sys-apps/texinfo/texinfo-6.4.ebuild | 40 -- sys-apps/texinfo/texinfo-6.5.ebuild | 42 -- sys-apps/texinfo/texinfo-6.6.ebuild | 42 ++ sys-apps/util-linux/Manifest | 1 - .../files/util-linux-2.32-add-missing-lintl.patch | 38 -- 43 files changed, 2392 insertions(+), 375 deletions(-) delete mode 100644 sys-apps/bubblewrap/bubblewrap-0.3.1.ebuild create mode 100644 sys-apps/less/files/less-549-mouse_fix.patch delete mode 100644 sys-apps/less/less-548.ebuild create mode 100644 sys-apps/less/less-549-r1.ebuild delete mode 100644 sys-apps/less/less-549.ebuild create mode 100644 sys-apps/less/less-550.ebuild create mode 100644 sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild delete mode 100644 sys-apps/osinfo-db/osinfo-db-20181011.ebuild delete mode 100644 sys-apps/osinfo-db/osinfo-db-20181116.ebuild create mode 100644 sys-apps/osinfo-db/osinfo-db-20190218.ebuild create mode 100644 sys-apps/portage/portage-2.3.61.ebuild create mode 100644 sys-apps/portage/portage-2.3.62.ebuild create mode 100644 sys-apps/systemd/files/CVE-2019-6454.patch create mode 100644 sys-apps/systemd/files/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch create mode 100644 sys-apps/systemd/files/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch create mode 100644 sys-apps/systemd/files/CVE-2019-6454/0003-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch create mode 100644 sys-apps/systemd/systemd-239-r4.ebuild create mode 100644 sys-apps/systemd/systemd-241-r1.ebuild create mode 100644 sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch create mode 100644 sys-apps/sysvinit/sysvinit-2.94_beta.ebuild delete mode 100644 sys-apps/texinfo/texinfo-6.1.ebuild delete mode 100644 sys-apps/texinfo/texinfo-6.4.ebuild delete mode 100644 sys-apps/texinfo/texinfo-6.5.ebuild create mode 100644 sys-apps/texinfo/texinfo-6.6.ebuild delete mode 100644 sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index cb3b83730999..ade2024908bb 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest index 89c7293b2fbd..077c7b8f1c8c 100644 --- a/sys-apps/bubblewrap/Manifest +++ b/sys-apps/bubblewrap/Manifest @@ -1,5 +1,3 @@ -DIST bubblewrap-0.3.1.tar.gz 62768 BLAKE2B a8c29102f9b69bfbd6b6aebb9aa0878bd1e31b52a6cb6374b8341c1410526872d4063ff0524ab4f98d7cac7358dad3190144d12bb0b11cf26eeed2730c4ec475 SHA512 fbc44976f53fdf8913b94c57d1f26a3b87c773e86a289e58fd3d7b1c4ea7f33c862f1a38a4f791315358990928768a68334f0a171302c18a16c7e2e9f1a146dd DIST bubblewrap-0.3.1.tar.xz 209924 BLAKE2B bacc4080106cd9876bf0e1ad866a7397d7d232e61a720b52b5a6b9b0d860e625511ed15ac630aa71003fb9fa145ffa9d08ae2e6ba6d1411fd75e7d9568312717 SHA512 74e36caa56540a956158445f5f38c7ac5f7ff3c733ecaf85893de4607900e1fe4050db86a4435cbe18d722e90c5b39c466c555ea8ea8d4944da6207ef1011d67 -EBUILD bubblewrap-0.3.1-r1.ebuild 1042 BLAKE2B 1545c1a79c78df866bccd61a36c57dbdbe7d620e466064a66cb663f403e5dee13c88351b8c34a3cc03af2af1fdc1a5ccb5c6c0de261cbf388a2291458e6319d7 SHA512 fba353a7e86f663a5619ebe0fe7373906f9e1e1258bddcad13efd926be31db5db5e5d0c30b6059f3ca7aedbda6de4a992f7e559448301cac09f1f677696b4e4c -EBUILD bubblewrap-0.3.1.ebuild 1020 BLAKE2B 929f69c3a456c30f581dd393e3c3cb919c0026d6d71a03ecec19f05de48e423a4758692a5ba9328279062724f06c159a8b41973cbb270bc017db75e0182c2d13 SHA512 bb7421b23f7eef4890779fc716cf2c5a76ccd1824f58f2172db3f77158b2f048968df100796c7da310983ff47b62aa743f2ac61dac19ecc7ed5395ef332c1f67 +EBUILD bubblewrap-0.3.1-r1.ebuild 1048 BLAKE2B d46fbf29736539a20908b44109922a3b5257cce8d69845e1c54444dd04f50a3e51d709eba90dc4465c8ac5ff48440a0f2df39614555f183af04881c94028e9f4 SHA512 a45244a09005f1f621d82e585be8ea2ddfa63d444825f3c9825b8f9e80e9a54b2ad1e9174fe4c270249a2940f9d518cf926a8177fb429e452dc8df43b6255749 MISC metadata.xml 342 BLAKE2B de8d3ba1c95b39bd6e582b27b186ef0805fd9be1fe6c806fb8bcfa28f7cafb3a2068be0e21baa13ca08895db0d0b666b5c1eab573f38fac251ce9d41c793866e SHA512 25752c1aae465ac49409e35c32863b945c1dc8989ddb4fab2999cf890cf4ec33fc82e9324e3af49c15a8580a566e5f737ec270646b4cc569c3c5dd472eb1b2bb diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild index 0604caaa2e26..dcba78156b3a 100644 --- a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild +++ b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/projectatomic/${PN}/releases/download/v${PV}/${P}.ta LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="selinux +suid" RDEPEND=" @@ -19,7 +19,7 @@ RDEPEND=" sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 ) " -DEPEND="${DEPEND} +DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1.ebuild deleted file mode 100644 index 6a54ac1e8458..000000000000 --- a/sys-apps/bubblewrap/bubblewrap-0.3.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools bash-completion-r1 linux-info - -DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution" -HOMEPAGE="https://github.com/projectatomic/bubblewrap" -SRC_URI="https://github.com/projectatomic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="selinux" - -DEPEND=" - dev-libs/libxslt - sys-libs/libseccomp - sys-libs/libcap - selinux? ( >=sys-libs/libselinux-2.1.9 ) -" -# FIXME: we don't need bashcomp righ?? -RDEPEND="${DEPEND}" -# FIXME: bash comp is not working -# FIXME: test is not working -pkg_setup() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS" - linux-info_pkg_setup - fi -} -src_prepare() { - default - eautoreconf -} - -src_configure() { - - econf \ - $(use_enable selinux) \ - "--enable-man" \ - "--with-bash-completion-dir=${get_bashcompdir}" \ - "--with-priv-mode=none" -} diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest index 0fa476adc020..02ee423a740c 100644 --- a/sys-apps/irqbalance/Manifest +++ b/sys-apps/irqbalance/Manifest @@ -4,5 +4,5 @@ AUX irqbalance.init.4 524 BLAKE2B 473ee234adf186f620ec022cf20d61b3aaec368611659c DIST irqbalance-1.4.0.tar.gz 53431 BLAKE2B 35271fab011cb917e5472079025f88df45142b0622d94570f62ef7cce7f2a4e9c9c0b77a79121afa5e7edf4510707c7ace52e894b2af44a5a26b543160f481d0 SHA512 d95909c5e86efa452d0d440df0335b398bd2bf973d6a84e29068534f8c4dc033df90913bf507a6d1b7cdab11b288bafbd2c88b4e476f04e32d5f4c89efe4f7d9 DIST irqbalance-1.5.0.tar.gz 55150 BLAKE2B b111e9fd4cfec968b261f6ae8a6876d15845849ebf28d7304fd8af3bdeb93b8b9a626888c5728b69925f02a5e472c3512f5862726c6ae9a4d378c46ebcf39069 SHA512 343421fd533d7d161fd05a0edfadaddf1da6ced854a19e9f10ea6c12b97b2ef1629aad855214d9700d31d056bb816bf3ec90cdf7c643a1b6e8af1de5befa64f5 EBUILD irqbalance-1.4.0-r1.ebuild 1372 BLAKE2B 1e12173e698ea23c7b1a7f76b189d96f9dd5ce8227c6b3a9880602651d84f329d7c8cace2026645e31843b163956880b9fb9058da653341d34b7169ba6536b95 SHA512 336cf37b2def1d788592c40ad1e5aafc124e01a0ecfc5d3ed62bd43e7ff9e1bd1c5dfdacdc65dcca254ec65aaf4db0d5af825796c2a33f19ee56b63e00c69080 -EBUILD irqbalance-1.5.0.ebuild 1324 BLAKE2B 86bdbf76a5ac14780007493f1c752142c4c3f861d35186243652f906fbe69569f52aa91f50e591a4d40147da20f1920f8e21a9bc4e3673d305af99b9898b2930 SHA512 1db6a99da27d4b44b6c09e13799a0589c136f49e5ed6063407f427c837803c7ea50c9e74d4eca0d794d913fa448f795218e83c44f56ef22b4f217d3cdfa2c195 +EBUILD irqbalance-1.5.0.ebuild 1323 BLAKE2B 7356a75e040053615424aa6c349c1d545f17cf854adc20cb748bec506530e044f3adb65cc740a6107caea49bce7c903c9551e240062ed83a9ea602d544b3ea48 SHA512 f4471a3b3056a3a3a4e424817024a1db01eb596f4e1d474a52623179e962de5b64ad101d7a0d4fef997e84c1c6b73d32fd1cf0a6c4e80e9c215a2f08845db804 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04 diff --git a/sys-apps/irqbalance/irqbalance-1.5.0.ebuild b/sys-apps/irqbalance/irqbalance-1.5.0.ebuild index 826910f5d85a..a0e4c4b50005 100644 --- a/sys-apps/irqbalance/irqbalance-1.5.0.ebuild +++ b/sys-apps/irqbalance/irqbalance-1.5.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc x86" IUSE="caps +numa selinux tui" CDEPEND=" diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index 7f325aa469fc..5e6883d1b33e 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -3,7 +3,7 @@ DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865 EBUILD kmod-24.ebuild 4909 BLAKE2B 7148a75e9c5137abd85cb4ac7eb9eddfa7f8ff7ef7f417256c84c4e33372b5a351822670a4c9dc6bc81832590bd337819c06ef7a0e2ec3bc0c5f55c1f4a8ffa4 SHA512 2a59d5e8e24025a785e47ab9c12fa1b9709c315dd69fedfbdbcb36c833d373c4b97e96dacd06ba45d0981da13d29cb08bdbb5cea5e5f2abdbc70e90928a44f08 -EBUILD kmod-25.ebuild 4925 BLAKE2B 4a5f97a841dc2d23fd6ccbb8fa8026e36ba27ab3d96c692d0aecdb9b0c2b32afb99376b589a79b9913fa92d0839ed6106bac2153885bcd7a418bc8c7de445831 SHA512 5042394b2af72954b8275da9817d4273100b052e9f6f4fcb9d978755035e76adbba9d3723ca269bba57e3b6551a4d184f0200eddd6dcadf74b60a12582d32593 +EBUILD kmod-25.ebuild 4922 BLAKE2B 2aa977e79317843654b81b0c46952c9b5fce252d2e6c556c22d33e3ad60ede9d8a6bf6de7086e1b56549802198685ce6d1bb38d2469a0863f264c5aa55f9b38e SHA512 e63b70f40b3d15a9cd2737347b6decb93bfa343ed67a238d50845c37b98e9bdce50f4531d7349f3a1ec8ddd9ed268c30d49d6a81d1805f23dd4b32fcd1b4d640 EBUILD kmod-26.ebuild 5004 BLAKE2B 405dc355fd930ee0f2613937733b56756c3eb4208a1140dfee500fa0e8904c9a7cbd881d6a855b94f892dd5ca0e65b6ca179777f25de6304f89c783b3b49238c SHA512 e0d2abae0bf6109828143bca2164b1f3ba2f9a5339b29c486df17c1243e93cb2ba9237abd6f8f800f29ec5c4095a87ce2787e80b2c1f0e8afc7a7cbd63ed9ce3 EBUILD kmod-9999.ebuild 5004 BLAKE2B 405dc355fd930ee0f2613937733b56756c3eb4208a1140dfee500fa0e8904c9a7cbd881d6a855b94f892dd5ca0e65b6ca179777f25de6304f89c783b3b49238c SHA512 e0d2abae0bf6109828143bca2164b1f3ba2f9a5339b29c486df17c1243e93cb2ba9237abd6f8f800f29ec5c4095a87ce2787e80b2c1f0e8afc7a7cbd63ed9ce3 MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94 diff --git a/sys-apps/kmod/kmod-25.ebuild b/sys-apps/kmod/kmod-25.ebuild index 4663e479b405..7ed3c8b8f27c 100644 --- a/sys-apps/kmod/kmod-25.ebuild +++ b/sys-apps/kmod/kmod-25.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then inherit autotools git-r3 else SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" + KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" inherit libtool fi diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 077cb111343c..245fdf7abf44 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,11 +1,12 @@ +AUX less-549-mouse_fix.patch 1241 BLAKE2B 88558651e98023f840853e3b5195fe767242e7a17eabb999135b1cd1f7907586130dee4dd5b10b83866a17a91d9a3459c6b68f2496768c2230f5128034181479 SHA512 9d7c3694f26b89567f229d287773b452165df4686a7c008ce31ebc458d61d4b1e350fb3ddc1ffa72bd99a293ea8310d16a8c2477ea2e94b6a758fe22a73a2351 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 AUX lesspipe.sh 7797 BLAKE2B 1f66e2ef843e24de958dab1577f6f69f63b260369b9b625c1fd823a8f5a00a110df3492d299b04a66b003528549991c0b87e1ee80835a0383667991b6a8bba50 SHA512 d7bbae07e8ddcae2981549f958daffc3750f3a343da37cd5e43df86b4dcab35c3121d7fa7b76d61dd457c972a888bcce1c85d01fa1e685aadf169d5541bb0d8b DIST less-530.tar.gz 339723 BLAKE2B 9321548b06330c0b1b5b5a36147f5b9348619ff15d907808744b89581edeb4d8c2118ba455d024a23850902cac4d2c34d1e7b9897e02769584315c0e67ef667e SHA512 8d83a18b5648c4fe85921a563aa2c40bcf495aeb611098c83cd167b1e2f706649846cdf457c8506ae2683ab362ad970a0b261747349673020894bccdb9acbc10 DIST less-531.tar.gz 340466 BLAKE2B 6ac75b623fce478114d18cff429659499fedf4ef1a7bb067465ace91c28a7968efb224a4994a1e376a8cf40b110492f10ecda634628029107b38187044a0cd1e SHA512 180b665f194d7cc40d4bbb37bd64b10be463c0705e81795bef84b20dbba1c61825bb3e3da8bcd79f9176bb3af7b1f4e4c3dfe0829a5a2195a11f5b42294daca1 -DIST less-548.tar.gz 346139 BLAKE2B 0cdea7f3db069b8f4b4a070067f1956f0f2d86ff8061506c330fdcf4b3cfdbc56f22ffaba782190d799685129a446ef68bd3349fb50491ad6d84b6feee05fa65 SHA512 4e42ed3812d038634a12ae6f719869b228fe4ec270ceda560afb666543669f40c0c5746fc9b94c00584e78db356d900347ec5b7e3ca15249a9656dbd8b6b8dcb DIST less-549.tar.gz 346978 BLAKE2B 840ff54567d241cd4cfb90e91d3e004da09a3dfe4b8595aebdf69e0fb9c534e9da3bfe4953d51fcab67c86fbaa1e7bd9f318bd18856bf051895995715df7e827 SHA512 f0f86db00ee7a0ed638dfe2183e5cd6a9728d6e4cb9f054a746716abf6fe297f33b6f1d44bd4eac8ad360da564c4ea50cd6f41d297f857c78414961d28f4155c +DIST less-550.tar.gz 347026 BLAKE2B b033cb09d1bb9624c56db14084c73e5154e36cebd3f757dd2cb1b012b8797e7647d152bb67ce4ea9c2d188b1252fd7ddfd8a113656af5ec9a1e688145d4d9265 SHA512 a3d2769d90589a8e6afbfc9ac10cd1b544e0b0bbe28884e5ad980a71c541a37545c11d3450984b346b516fe082dfc0cf89d246c5a2d6002a7a2b4a4296a15494 EBUILD less-530.ebuild 1381 BLAKE2B 13673dbd46b697128c6db8ff626dbb90ccf8ece61472cd0388f6ba10eeda57b4c4e3c084729b81230423fbd96342ec19f251a4168575f83209afdda6cec10a67 SHA512 e787c5b63dcf1d2a2dc80d843bc5e674596ad992220849557ec6ffd93ba53f9279cd21fb02cd652ba2fa0c0d0ada2c6dfcf18198194c0089f770da3a4a40980a EBUILD less-531.ebuild 1408 BLAKE2B 70268fa7b95805f7c8d5837537e378a881b383c104d5c264b2113554a926659319e1457c470eb6ce1d2215fb2409e2d296643086ff7ca5666c4aa54b996050dd SHA512 7c4b7197acf8d0bc99fb4b3ed5fae4d1a85517d9e70b051fe093597eea640346f03107d0e383bd1e4f23359d2eddf5d6081099b68c103a8146dcd20611ed119c -EBUILD less-548.ebuild 1420 BLAKE2B eb6835cbf7f1874c6ac461d1e8f506bb010f8acaa9eb075d28c67b910ea4209f508a9c5de372cbbe65da1b809e89fdd2112f2c3178990e3a348daba5525a0c08 SHA512 cd357d2d6a5b63121fa7bd3265ab5d85bf171afd71bd384d6f4aa6d8789c061ad3e39988144777dbe340e3ef6123eaf2b6238a48b89e7b3e45a98d332cd853a3 -EBUILD less-549.ebuild 1420 BLAKE2B b4596a8fbe9e9c4adaa5fb4763cdb2a18875ac873b99e0bffc8079818388b525634b32facc9412f4b20264bd51b1bb5876c1ed5b3f6f8a12efe1985c7ef4979f SHA512 84ad32d19ef6fbbced65f05f29566533996aaca5f524ac2a214b1b8880c26b521d3249ae865d9bd932fdaa25e89085004264eb1debd4e937b3122c8f7708ccd8 +EBUILD less-549-r1.ebuild 1477 BLAKE2B c53128815519df2590e196dcbb1c56ed40992c39317363b9c722ed422818e7d6a21c8a92c4591c2e9eeedc3ca85a0a9c148cd8fd4c2e28c285781036e77c0be7 SHA512 8bbc80a38e1505146aaf33d68e1f608bb5544349de14383341e47de9d590fbeb495ed88346537426754ec710ecfab288d93f0a7f66a14a597e301579d8efeb65 +EBUILD less-550.ebuild 1420 BLAKE2B b4596a8fbe9e9c4adaa5fb4763cdb2a18875ac873b99e0bffc8079818388b525634b32facc9412f4b20264bd51b1bb5876c1ed5b3f6f8a12efe1985c7ef4979f SHA512 84ad32d19ef6fbbced65f05f29566533996aaca5f524ac2a214b1b8880c26b521d3249ae865d9bd932fdaa25e89085004264eb1debd4e937b3122c8f7708ccd8 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/less/files/less-549-mouse_fix.patch b/sys-apps/less/files/less-549-mouse_fix.patch new file mode 100644 index 000000000000..495073a32a49 --- /dev/null +++ b/sys-apps/less/files/less-549-mouse_fix.patch @@ -0,0 +1,51 @@ +From d5015d29f79e70fb70489616c0f2d0ff32e52898 Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Sat, 16 Feb 2019 07:20:42 -0800 +Subject: [PATCH] Don't emit mouse controls if --mouse is not set. + +--- + screen.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/screen.c b/screen.c +index 9a32685..b58fe26 100644 +--- a/screen.c ++++ b/screen.c +@@ -1549,6 +1549,8 @@ win32_deinit_term(VOID_PARAM) + public void + init_mouse(VOID_PARAM) + { ++ if (!mousecap) ++ return; + #if !MSDOS_COMPILER + tputs(sc_s_mousecap, sc_height, putchr); + #else +@@ -1565,6 +1567,8 @@ init_mouse(VOID_PARAM) + public void + deinit_mouse(VOID_PARAM) + { ++ if (!mousecap) ++ return; + #if !MSDOS_COMPILER + tputs(sc_e_mousecap, sc_height, putchr); + #else +@@ -1587,8 +1591,7 @@ init(VOID_PARAM) + tputs(sc_init, sc_height, putchr); + if (!no_keypad) + tputs(sc_s_keypad, sc_height, putchr); +- if (mousecap) +- init_mouse(); ++ init_mouse(); + } + if (top_scroll) + { +@@ -1626,8 +1629,7 @@ deinit(VOID_PARAM) + #if !MSDOS_COMPILER + if (!(quit_if_one_screen && one_screen)) + { +- if (mousecap) +- deinit_mouse(); ++ deinit_mouse(); + if (!no_keypad) + tputs(sc_e_keypad, sc_height, putchr); + if (!no_init) diff --git a/sys-apps/less/less-548.ebuild b/sys-apps/less/less-548.ebuild deleted file mode 100644 index 3bc3bf389320..000000000000 --- a/sys-apps/less/less-548.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Excellent text file viewer" -HOMEPAGE="http://www.greenwoodsoftware.com/less/" -SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" - -LICENSE="|| ( GPL-3 BSD-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="pcre unicode" - -DEPEND=">=app-misc/editor-wrapper-3 - >=sys-libs/ncurses-5.2:0= - pcre? ( dev-libs/libpcre2 )" -RDEPEND="${DEPEND}" - -src_configure() { - export ac_cv_lib_ncursesw_initscr=$(usex unicode) - export ac_cv_lib_ncurses_initscr=$(usex !unicode) - local myeconfargs=( - --with-regex=$(usex pcre pcre2 posix) - --with-editor="${EPREFIX}"/usr/libexec/editor - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - newbin "${FILESDIR}"/lesspipe.sh lesspipe - newenvd "${FILESDIR}"/less.envd 70less -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-483-r1" ; then - elog "The lesspipe.sh symlink has been dropped. If you are still setting" - elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." - elog "Colorization support has been dropped. If you want that, check out" - elog "the new app-text/lesspipe package." - fi -} diff --git a/sys-apps/less/less-549-r1.ebuild b/sys-apps/less/less-549-r1.ebuild new file mode 100644 index 000000000000..8eff7a5d6ea5 --- /dev/null +++ b/sys-apps/less/less-549-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Excellent text file viewer" +HOMEPAGE="http://www.greenwoodsoftware.com/less/" +SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" + +LICENSE="|| ( GPL-3 BSD-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="pcre unicode" + +DEPEND=">=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2:0= + pcre? ( dev-libs/libpcre2 )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-mouse_fix.patch #678102 +) + +src_configure() { + export ac_cv_lib_ncursesw_initscr=$(usex unicode) + export ac_cv_lib_ncurses_initscr=$(usex !unicode) + local myeconfargs=( + --with-regex=$(usex pcre pcre2 posix) + --with-editor="${EPREFIX}"/usr/libexec/editor + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newbin "${FILESDIR}"/lesspipe.sh lesspipe + newenvd "${FILESDIR}"/less.envd 70less +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-483-r1" ; then + elog "The lesspipe.sh symlink has been dropped. If you are still setting" + elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." + elog "Colorization support has been dropped. If you want that, check out" + elog "the new app-text/lesspipe package." + fi +} diff --git a/sys-apps/less/less-549.ebuild b/sys-apps/less/less-549.ebuild deleted file mode 100644 index f04887b62ff3..000000000000 --- a/sys-apps/less/less-549.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Excellent text file viewer" -HOMEPAGE="http://www.greenwoodsoftware.com/less/" -SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" - -LICENSE="|| ( GPL-3 BSD-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="pcre unicode" - -DEPEND=">=app-misc/editor-wrapper-3 - >=sys-libs/ncurses-5.2:0= - pcre? ( dev-libs/libpcre2 )" -RDEPEND="${DEPEND}" - -src_configure() { - export ac_cv_lib_ncursesw_initscr=$(usex unicode) - export ac_cv_lib_ncurses_initscr=$(usex !unicode) - local myeconfargs=( - --with-regex=$(usex pcre pcre2 posix) - --with-editor="${EPREFIX}"/usr/libexec/editor - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - newbin "${FILESDIR}"/lesspipe.sh lesspipe - newenvd "${FILESDIR}"/less.envd 70less -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-483-r1" ; then - elog "The lesspipe.sh symlink has been dropped. If you are still setting" - elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." - elog "Colorization support has been dropped. If you want that, check out" - elog "the new app-text/lesspipe package." - fi -} diff --git a/sys-apps/less/less-550.ebuild b/sys-apps/less/less-550.ebuild new file mode 100644 index 000000000000..f04887b62ff3 --- /dev/null +++ b/sys-apps/less/less-550.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Excellent text file viewer" +HOMEPAGE="http://www.greenwoodsoftware.com/less/" +SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" + +LICENSE="|| ( GPL-3 BSD-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="pcre unicode" + +DEPEND=">=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2:0= + pcre? ( dev-libs/libpcre2 )" +RDEPEND="${DEPEND}" + +src_configure() { + export ac_cv_lib_ncursesw_initscr=$(usex unicode) + export ac_cv_lib_ncurses_initscr=$(usex !unicode) + local myeconfargs=( + --with-regex=$(usex pcre pcre2 posix) + --with-editor="${EPREFIX}"/usr/libexec/editor + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newbin "${FILESDIR}"/lesspipe.sh lesspipe + newenvd "${FILESDIR}"/less.envd 70less +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-483-r1" ; then + elog "The lesspipe.sh symlink has been dropped. If you are still setting" + elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." + elog "Colorization support has been dropped. If you want that, check out" + elog "the new app-text/lesspipe package." + fi +} diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest index 02305510f4d3..3da77279e9c7 100644 --- a/sys-apps/osinfo-db-tools/Manifest +++ b/sys-apps/osinfo-db-tools/Manifest @@ -1,3 +1,5 @@ DIST osinfo-db-tools-1.2.0.tar.gz 447185 BLAKE2B c8ac2556d552bbeee0b8e0615ac5cbb1ed69bff02342617f3b64256120a93696965aa18ba6810b96b1746ed8db6d72db446a72caaf2c3ad850db9d4d4f260bd9 SHA512 6e2519eacb5b60449c968e53a4363966b42ca7c564fac7db7d982ceeecfa70ac0662dc6ea75a2d503a7fa74c8789e0fd1331cd8fd3d75fec5d2cd1a646896b3d +DIST osinfo-db-tools-1.3.0.tar.gz 456012 BLAKE2B 5c29581f4947caf4ee06f435891cccaeb53b9514cc2bf4ad4bac1e8ee38ebeb61678ee886389f837c9f578f1df93ed94f8492165e1613d1bb60b246ea5c52428 SHA512 e488db70b85ba8d5abadf6c50a772f7cd338405c9465189a70eb0da1b488434cd234118f44933847cd05406f55831d08db767932794798270be5964fa4c3dc1e EBUILD osinfo-db-tools-1.2.0.ebuild 837 BLAKE2B b6ef18efa3f75872bc3ce03e134b3b2e37cf8192bff0fb2cc8e14bc51033a7917233acfe87c9029dd151ef70b5ffca6501ce703feb369601dfe45d780d8442c0 SHA512 8ed562896a204d14fd3d421ec64ac75ca5617f53b1b35f1e99cd18da86eb232fe108bdfe99d4adac99fcb2b954f8ccce4c2a3a784b71877514bedc42ea1b8fa2 +EBUILD osinfo-db-tools-1.3.0.ebuild 859 BLAKE2B 5547adb0acf073a8cdb42ce5d618d16acb80ca033244881880ba464116500649a6db03336f61d7df12b6b9fd4571622a57f2d0a132ad88dcd5afe425b5286948 SHA512 4bbc46ead6d769b161568d5be671615cee3488e02820d42ea0862074d8dc96ac0a35e9eebfc94896154a78e4f5940b978140e5d5914790accc0b926c5b32128f MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild new file mode 100644 index 000000000000..f778ca05df0b --- /dev/null +++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2 + +DESCRIPTION="Tools for managing the osinfo database" +HOMEPAGE="https://libosinfo.org/" +SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# Blocker on old libosinfo as osinfo-db-validate was part of it before +RDEPEND=" + >=dev-libs/glib-2.36:2 + >=dev-libs/libxml2-2.6.0 + >=app-arch/libarchive-3.0.0:= + dev-libs/json-glib + !> cnf/make.globals || die + fi + + if use native-extensions; then + printf "[build_ext]\nportage-ext-modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ + -i lib/portage/const.py || \ + die "Failed to patch portage.const.EPREFIX" + + einfo "Prefixing shebangs ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f -print0) + + einfo "Adjusting make.globals ..." + sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ + -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ + -i cnf/make.globals || die "sed failed" + + einfo "Adjusting repos.conf ..." + sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \ + -i cnf/repos.conf || die "sed failed" + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use epydoc && targets+=( epydoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use epydoc && targets+=( + install_epydoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + # comment out sanity test until it is fixed to work + # with the new PORTAGE_PYM_PATH + #if [[ $ROOT == / ]] ; then + ## Run some minimal tests as a sanity check. + #local test_runner=$(find "${ED}" -name runTests) + #if [[ -n $test_runner && -x $test_runner ]] ; then + #einfo "Running preinst sanity tests..." + #"$test_runner" || die "preinst sanity tests failed" + #fi + #fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} + fi +} diff --git a/sys-apps/portage/portage-2.3.62.ebuild b/sys-apps/portage/portage-2.3.62.ebuild new file mode 100644 index 000000000000..4bf3a6b2dedf --- /dev/null +++ b/sys-apps/portage/portage-2.3.62.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( + pypy + python3_4 python3_5 python3_6 python3_7 + python2_7 +) +PYTHON_REQ_USE='bzip2(+),threads(+)' + +inherit distutils-r1 epatch linux-info systemd + +DESCRIPTION="Portage is the package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd" +SLOT="0" +IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" + +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" +# Require sandbox-2.2 for bug #288863. +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's +# quite slow, so it's not considered in the dependencies as an alternative to +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so +# for now, don't pull in xattr deps for other kernels. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ + python{2_7,3_4,3_5} pypy) + rsync-verify? ( + >=app-portage/gemato-14[${PYTHON_USEDEP}] + >=app-crypt/openpgp-keys-gentoo-release-20180706 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ + python2_7 pypy) + ) ) + !> cnf/make.globals || die + fi + + if use native-extensions; then + printf "[build_ext]\nportage-ext-modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ + -i lib/portage/const.py || \ + die "Failed to patch portage.const.EPREFIX" + + einfo "Prefixing shebangs ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f -print0) + + einfo "Adjusting make.globals ..." + sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ + -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ + -i cnf/make.globals || die "sed failed" + + einfo "Adjusting repos.conf ..." + sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \ + -i cnf/repos.conf || die "sed failed" + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use epydoc && targets+=( epydoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use epydoc && targets+=( + install_epydoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + # comment out sanity test until it is fixed to work + # with the new PORTAGE_PYM_PATH + #if [[ $ROOT == / ]] ; then + ## Run some minimal tests as a sanity check. + #local test_runner=$(find "${ED}" -name runTests) + #if [[ -n $test_runner && -x $test_runner ]] ; then + #einfo "Running preinst sanity tests..." + #"$test_runner" || die "preinst sanity tests failed" + #fi + #fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} + fi +} diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index bb1a74211030..a430d1528795 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,4 +1,8 @@ AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a +AUX CVE-2019-6454.patch 6017 BLAKE2B 8feefe11f44e4136c5fcf87160197bfbc0557d5097bc12275411887005bed1fe56a532d114e2e49527a7f35016a6b5fc04cb1086b33445402ace21eb880c02e9 SHA512 ff84ae9a043f17fd78c7fc499fe532c4d3b46dbe34f24c8289c209a026c1eda20de3ba46b67c8a5b14e9889e6362a4fb2097d550e6bcdb5182455fc569e23224 +AUX CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch 1848 BLAKE2B 348c35881ce039f92d8fc8dc8c87af2efa95696afbe79ad8fc4e01129524bdf28b529ab86ec611d08446e589176c0678018d94d8c5fc068c65ab4eb429746cf9 SHA512 693afe328ebc20d34cbf07c632a8da90ee293147e793a599a4d2aac6f757738bfab93048a2f8ed6e68d16f865e9b4112e737c692ad01c7d4946f8c430714161d +AUX CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch 6660 BLAKE2B 45acb2595245a5cbd10c2a9c7ffa2db0c4bd5b03ef8dc25eb51fc35dd51a49b3acd18bf4cf8db7f639e7a4e61592f3ce0bcb031bf27b0bf3ae6fc96c74445f77 SHA512 7c082ab4effc36543bab08700b84a3ccddfba5d5e87b324d6b935d75f5debb7a5f7be1c2e21208e8d1715f5d40619c8f775629acdde40d3c7b2f406b5c6d9460 +AUX CVE-2019-6454/0003-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch 1990 BLAKE2B 6ceae3c7abe20206dd4840080c2849bc22528a012d6639ae38778a538a991bb1557a8ed19772fe8101a2b3398577455302681f9f64288dc264c1ce9d2330cbdb SHA512 3433f3cad2cfadcf2975283c81aa42791d0286b2ba75f203673ee7447dddc6f279ef9113e6a08718e92570dcb941eb456f0ab09f534c85b9ef5766cd41cf74e5 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5 AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 @@ -16,8 +20,10 @@ DIST systemd-241-rc2.tar.gz 7619504 BLAKE2B 610940b3141d36a0534cf477d303eb681f41 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e EBUILD systemd-239-r2.ebuild 13285 BLAKE2B 7e7f55aea8c3d5670867a775c4941f1ed07fbdf26e6be8d11124a43bc6bd1352a4773578f93e797907c2b37c81564c2876f1e7d7d4ffa998f481c57bdbd825be SHA512 de7011bc15bcdd0080204a003fde07e62c093b7bdf2ce49df6e2359fb513a1d996efacba53bb1152b077a5513d494eb7a19ab2cc637c1e2470f08525b67cb0f2 EBUILD systemd-239-r3.ebuild 13285 BLAKE2B 831b7d2cd265398238077505749e0b8b474403275862409cb9fe27e7c3c8e05be48b855a96c8de6f5816b0691dbd94e99287bc04d65120f57479a38df2f07721 SHA512 3743f5b6d52b9306bb581c35d10f18e2c1cdcd2af95f465712d17f35af29aaea1715ad668c49317e83db78e4346ad5651f885e5a2156f728276ec13fb08a1345 +EBUILD systemd-239-r4.ebuild 13326 BLAKE2B 7af4a38c9a5a7622da93c5942314a5dad674b724ed13d1816e195aef8456335366ce6ecf9332d8a0ddc30a3eec4faaceef14261e7c31c5917eb9e91ab90322a3 SHA512 fb733cefe1f6b793101786f8a2a8866b2cf52cab93b01f4188b51411e6c63ec5ce7cb794a148d7736f1f3ee37d85c1c9b21204d75ad53e888101d5998a66a3ae EBUILD systemd-240-r3.ebuild 13371 BLAKE2B bc86925f04294fee6c9c53ac2e793338b34d8dd1b51c1bca1daa222440b35670a98d062a4059568ef43a010acb2746a467b54abccd465fb9e910453c590b800e SHA512 91d64b30469a5c54355c887c3f7ee12906f7f297ecfd0804116f753db6d8d4f8d7249ee589185b6cba3708ecc27a91c616f48811f32662b25930727e367f5ba6 EBUILD systemd-240-r4.ebuild 13371 BLAKE2B 5f6cb24820ba54d2ea130c890eedfa67d326565d6972fffa5a0c395d6de37c2d338879ad9b33153a4810ddf115d837104519b93e46f9c5e9c2c15d256dd7522d SHA512 9511413346e3e6d36ca141253315b5071635834b55d0892901657cf319afa62dd4169dddf861ebff0564156e812b3ef5e53d61d07ac54aa0c76afff7bcba219b +EBUILD systemd-241-r1.ebuild 13564 BLAKE2B 972ed3c9f1ab6c6420193b34f4629cd2b3cd15ee917fc04c2620835fb7d73b78b82ed25319204c26cd1dddfae6978cd688d9a26eea542e6365a808f97aa4bdb2 SHA512 ffa17abc62197ec7ce8342a50feaed31f543c43b2c444ff786d793906bdd89ac5edb9d4b568199aa9a0c7bb27a5f5cfdfda0df9f79dc44b6f3b676954a7d090a EBUILD systemd-241.ebuild 13376 BLAKE2B 02793e42d77682e5a38adcebd52a58ee715ae6c715a4f3c5f910b0b5e94d062217ea20aae017d94ad9bbbaafb2dc5764e68ba3bfa64a06d90982dc62b8b044bb SHA512 5cb2ef13042a7fd1f09fa47c45c64ca0dc57288f4190c69ac6b9972981d23520ee66d7be8242d75fcf905c7859316c60041c0aa5c1f67f31dea38376610008f0 EBUILD systemd-241_rc1.ebuild 13376 BLAKE2B 02793e42d77682e5a38adcebd52a58ee715ae6c715a4f3c5f910b0b5e94d062217ea20aae017d94ad9bbbaafb2dc5764e68ba3bfa64a06d90982dc62b8b044bb SHA512 5cb2ef13042a7fd1f09fa47c45c64ca0dc57288f4190c69ac6b9972981d23520ee66d7be8242d75fcf905c7859316c60041c0aa5c1f67f31dea38376610008f0 EBUILD systemd-241_rc2.ebuild 13376 BLAKE2B 02793e42d77682e5a38adcebd52a58ee715ae6c715a4f3c5f910b0b5e94d062217ea20aae017d94ad9bbbaafb2dc5764e68ba3bfa64a06d90982dc62b8b044bb SHA512 5cb2ef13042a7fd1f09fa47c45c64ca0dc57288f4190c69ac6b9972981d23520ee66d7be8242d75fcf905c7859316c60041c0aa5c1f67f31dea38376610008f0 diff --git a/sys-apps/systemd/files/CVE-2019-6454.patch b/sys-apps/systemd/files/CVE-2019-6454.patch new file mode 100644 index 000000000000..97b7d635e7d6 --- /dev/null +++ b/sys-apps/systemd/files/CVE-2019-6454.patch @@ -0,0 +1,198 @@ +--- a/src/libsystemd/sd-bus/bus-internal.c ++++ b/src/libsystemd/sd-bus/bus-internal.c +@@ -45,7 +45,7 @@ + if (slash) + return false; + +- return true; ++ return (q - p) <= BUS_PATH_SIZE_MAX; + } + + char* object_path_startswith(const char *a, const char *b) { +--- a/src/libsystemd/sd-bus/bus-internal.h ++++ b/src/libsystemd/sd-bus/bus-internal.h +@@ -333,6 +333,10 @@ + + #define BUS_MESSAGE_SIZE_MAX (128*1024*1024) + #define BUS_AUTH_SIZE_MAX (64*1024) ++/* Note that the D-Bus specification states that bus paths shall have no size limit. We enforce here one ++ * anyway, since truly unbounded strings are a security problem. The limit we pick is relatively large however, ++ * to not clash unnecessarily with real-life applications. */ ++#define BUS_PATH_SIZE_MAX (64*1024) + + #define BUS_CONTAINER_DEPTH 128 + +--- a/src/libsystemd/sd-bus/bus-objects.c ++++ b/src/libsystemd/sd-bus/bus-objects.c +@@ -1134,7 +1134,8 @@ + const char *path, + sd_bus_error *error) { + +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -1150,7 +1151,12 @@ + return 0; + + /* Second, add fallback vtables registered for any of the prefixes */ +- prefix = alloca(strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = object_manager_serialize_path(bus, reply, prefix, path, true, error); + if (r < 0) +@@ -1346,6 +1352,7 @@ + } + + int bus_process_object(sd_bus *bus, sd_bus_message *m) { ++ _cleanup_free_ char *prefix = NULL; + int r; + size_t pl; + bool found_object = false; +@@ -1370,9 +1377,12 @@ + assert(m->member); + + pl = strlen(m->path); +- do { +- char prefix[pl+1]; ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; + ++ do { + bus->nodes_modified = false; + + r = object_find_and_run(bus, m, m->path, false, &found_object); +@@ -1499,9 +1509,15 @@ + + n = hashmap_get(bus->nodes, path); + if (!n) { +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; ++ ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; + +- prefix = alloca(strlen(path) + 1); + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + n = hashmap_get(bus->nodes, prefix); + if (n) +@@ -2091,8 +2107,9 @@ + char **names) { + + BUS_DONT_DESTROY(bus); ++ _cleanup_free_ char *prefix = NULL; + bool found_interface = false; +- char *prefix; ++ size_t pl; + int r; + + assert_return(bus, -EINVAL); +@@ -2111,6 +2128,12 @@ + if (names && names[0] == NULL) + return 0; + ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + do { + bus->nodes_modified = false; + +@@ -2120,7 +2143,6 @@ + if (bus->nodes_modified) + continue; + +- prefix = alloca(strlen(path) + 1); + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, &found_interface, names); + if (r != 0) +@@ -2252,7 +2274,8 @@ + + static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *path) { + _cleanup_set_free_ Set *s = NULL; +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -2297,7 +2320,12 @@ + if (bus->nodes_modified) + return 0; + +- prefix = alloca(strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = object_added_append_all_prefix(bus, m, s, prefix, path, true); + if (r < 0) +@@ -2436,7 +2464,8 @@ + + static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char *path) { + _cleanup_set_free_ Set *s = NULL; +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -2468,7 +2497,12 @@ + if (bus->nodes_modified) + return 0; + +- prefix = alloca(strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = object_removed_append_all_prefix(bus, m, s, prefix, path, true); + if (r < 0) +@@ -2618,7 +2652,8 @@ + const char *path, + const char *interface) { + +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -2632,7 +2667,12 @@ + if (bus->nodes_modified) + return 0; + +- prefix = alloca(strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true); + if (r != 0) + + + diff --git a/sys-apps/systemd/files/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch b/sys-apps/systemd/files/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch new file mode 100644 index 000000000000..6a0c8d1b0c51 --- /dev/null +++ b/sys-apps/systemd/files/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch @@ -0,0 +1,48 @@ +From 29de632674473729d1e9497b6fe47e7c88682ed9 Mon Sep 17 00:00:00 2001 +From: Riccardo Schirone +Date: Mon, 4 Feb 2019 14:29:09 +0100 +Subject: [PATCH 1/3] Refuse dbus message paths longer than BUS_PATH_SIZE_MAX + limit. + +Even though the dbus specification does not enforce any length limit on the +path of a dbus message, having to analyze too long strings in PID1 may be +time-consuming and it may have security impacts. + +In any case, the limit is set so high that real-life applications should not +have a problem with it. +--- + src/libsystemd/sd-bus/bus-internal.c | 2 +- + src/libsystemd/sd-bus/bus-internal.h | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c +index 40acae2133..598b7f110c 100644 +--- a/src/libsystemd/sd-bus/bus-internal.c ++++ b/src/libsystemd/sd-bus/bus-internal.c +@@ -43,7 +43,7 @@ bool object_path_is_valid(const char *p) { + if (slash) + return false; + +- return true; ++ return (q - p) <= BUS_PATH_SIZE_MAX; + } + + char* object_path_startswith(const char *a, const char *b) { +diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h +index f208b294d8..a8d61bf72a 100644 +--- a/src/libsystemd/sd-bus/bus-internal.h ++++ b/src/libsystemd/sd-bus/bus-internal.h +@@ -332,6 +332,10 @@ struct sd_bus { + + #define BUS_MESSAGE_SIZE_MAX (128*1024*1024) + #define BUS_AUTH_SIZE_MAX (64*1024) ++/* Note that the D-Bus specification states that bus paths shall have no size limit. We enforce here one ++ * anyway, since truly unbounded strings are a security problem. The limit we pick is relatively large however, ++ * to not clash unnecessarily with real-life applications. */ ++#define BUS_PATH_SIZE_MAX (64*1024) + + #define BUS_CONTAINER_DEPTH 128 + +-- +2.20.1 + diff --git a/sys-apps/systemd/files/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch b/sys-apps/systemd/files/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch new file mode 100644 index 000000000000..bbc6db974d4a --- /dev/null +++ b/sys-apps/systemd/files/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch @@ -0,0 +1,188 @@ +From 1ffe59592c5cbf924eb81a3662b4252ba6de7132 Mon Sep 17 00:00:00 2001 +From: Riccardo Schirone +Date: Mon, 4 Feb 2019 14:29:28 +0100 +Subject: [PATCH 2/3] Allocate temporary strings to hold dbus paths on the heap + +Paths are limited to BUS_PATH_SIZE_MAX but the maximum size is anyway too big +to be allocated on the stack, so let's switch to the heap where there is a +clear way to understand if the allocation fails. +--- + src/libsystemd/sd-bus/bus-objects.c | 68 +++++++++++++++++++++++------ + 1 file changed, 54 insertions(+), 14 deletions(-) + +diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c +index 58329f3fe7..54b977418e 100644 +--- a/src/libsystemd/sd-bus/bus-objects.c ++++ b/src/libsystemd/sd-bus/bus-objects.c +@@ -1133,7 +1133,8 @@ static int object_manager_serialize_path_and_fallbacks( + const char *path, + sd_bus_error *error) { + +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -1149,7 +1150,12 @@ static int object_manager_serialize_path_and_fallbacks( + return 0; + + /* Second, add fallback vtables registered for any of the prefixes */ +- prefix = newa(char, strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = object_manager_serialize_path(bus, reply, prefix, path, true, error); + if (r < 0) +@@ -1345,6 +1351,7 @@ static int object_find_and_run( + } + + int bus_process_object(sd_bus *bus, sd_bus_message *m) { ++ _cleanup_free_ char *prefix = NULL; + int r; + size_t pl; + bool found_object = false; +@@ -1369,9 +1376,12 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) { + assert(m->member); + + pl = strlen(m->path); +- do { +- char prefix[pl+1]; ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; + ++ do { + bus->nodes_modified = false; + + r = object_find_and_run(bus, m, m->path, false, &found_object); +@@ -1498,9 +1508,15 @@ static int bus_find_parent_object_manager(sd_bus *bus, struct node **out, const + + n = hashmap_get(bus->nodes, path); + if (!n) { +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; ++ ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; + +- prefix = newa(char, strlen(path) + 1); + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + n = hashmap_get(bus->nodes, prefix); + if (n) +@@ -2083,8 +2099,9 @@ _public_ int sd_bus_emit_properties_changed_strv( + const char *interface, + char **names) { + ++ _cleanup_free_ char *prefix = NULL; + bool found_interface = false; +- char *prefix; ++ size_t pl; + int r; + + assert_return(bus, -EINVAL); +@@ -2105,6 +2122,12 @@ _public_ int sd_bus_emit_properties_changed_strv( + + BUS_DONT_DESTROY(bus); + ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + do { + bus->nodes_modified = false; + +@@ -2114,7 +2137,6 @@ _public_ int sd_bus_emit_properties_changed_strv( + if (bus->nodes_modified) + continue; + +- prefix = newa(char, strlen(path) + 1); + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, &found_interface, names); + if (r != 0) +@@ -2246,7 +2268,8 @@ static int object_added_append_all_prefix( + + static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *path) { + _cleanup_set_free_ Set *s = NULL; +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -2291,7 +2314,12 @@ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *p + if (bus->nodes_modified) + return 0; + +- prefix = newa(char, strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = object_added_append_all_prefix(bus, m, s, prefix, path, true); + if (r < 0) +@@ -2430,7 +2458,8 @@ static int object_removed_append_all_prefix( + + static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char *path) { + _cleanup_set_free_ Set *s = NULL; +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -2462,7 +2491,12 @@ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char + if (bus->nodes_modified) + return 0; + +- prefix = newa(char, strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = object_removed_append_all_prefix(bus, m, s, prefix, path, true); + if (r < 0) +@@ -2612,7 +2646,8 @@ static int interfaces_added_append_one( + const char *path, + const char *interface) { + +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -2626,7 +2661,12 @@ static int interfaces_added_append_one( + if (bus->nodes_modified) + return 0; + +- prefix = newa(char, strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true); + if (r != 0) +-- +2.20.1 + diff --git a/sys-apps/systemd/files/CVE-2019-6454/0003-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch b/sys-apps/systemd/files/CVE-2019-6454/0003-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch new file mode 100644 index 000000000000..cc03893a588d --- /dev/null +++ b/sys-apps/systemd/files/CVE-2019-6454/0003-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch @@ -0,0 +1,54 @@ +From 8d3cea620ab661897fb485ece7332a9073c1783d Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 13 Feb 2019 16:51:22 +0100 +Subject: [PATCH 3/3] sd-bus: if we receive an invalid dbus message, ignore and + proceeed + +dbus-daemon might have a slightly different idea of what a valid msg is +than us (for example regarding valid msg and field sizes). Let's hence +try to proceed if we can and thus drop messages rather than fail the +connection if we fail to validate a message. + +Hopefully the differences in what is considered valid are not visible +for real-life usecases, but are specific to exploit attempts only. +--- + src/libsystemd/sd-bus/bus-socket.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c +index 30d6455b6f..441b4a816f 100644 +--- a/src/libsystemd/sd-bus/bus-socket.c ++++ b/src/libsystemd/sd-bus/bus-socket.c +@@ -1072,7 +1072,7 @@ static int bus_socket_read_message_need(sd_bus *bus, size_t *need) { + } + + static int bus_socket_make_message(sd_bus *bus, size_t size) { +- sd_bus_message *t; ++ sd_bus_message *t = NULL; + void *b; + int r; + +@@ -1097,7 +1097,9 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) { + bus->fds, bus->n_fds, + NULL, + &t); +- if (r < 0) { ++ if (r == -EBADMSG) ++ log_debug_errno(r, "Received invalid message from connection %s, dropping.", strna(bus->description)); ++ else if (r < 0) { + free(b); + return r; + } +@@ -1108,7 +1110,8 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) { + bus->fds = NULL; + bus->n_fds = 0; + +- bus->rqueue[bus->rqueue_size++] = t; ++ if (t) ++ bus->rqueue[bus->rqueue_size++] = t; + + return 1; + } +-- +2.20.1 + diff --git a/sys-apps/systemd/systemd-239-r4.ebuild b/sys-apps/systemd/systemd-239-r4.ebuild new file mode 100644 index 000000000000..5671a5ed37ca --- /dev/null +++ b/sys-apps/systemd/systemd-239-r4.ebuild @@ -0,0 +1,449 @@ +# Copyright 2011-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz + https://dev.gentoo.org/~floppym/dist/${P}-patches-2.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" +fi + +PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} ) + +inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb" + +REQUIRED_USE="importd? ( curl gcrypt lzma )" +RESTRICT="!test? ( test )" + +MINKV="3.11" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + !=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) + curl? ( net-misc/curl:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0= + ssl? ( >=net-libs/gnutls-3.1.4:0= ) + ) + idn? ( + libidn2? ( net-dns/libidn2:= ) + !libidn2? ( net-dns/libidn:= ) + ) + importd? ( + app-arch/bzip2:0= + sys-libs/zlib:0= + ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + nat? ( net-firewall/iptables:0= ) + pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) + pcre? ( dev-libs/libpcre2 ) + qrcode? ( media-gfx/qrencode:0= ) + seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) + selinux? ( sys-libs/libselinux:0= ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + >=sys-apps/baselayout-2.2 + selinux? ( sec-policy/selinux-base-policy[systemd] ) + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( sys-apps/sysvinit ) + resolvconf? ( !net-dns/openresolv ) + !build? ( || ( + sys-apps/util-linux[kill(-)] + sys-process/procps[kill(+)] + sys-apps/coreutils[kill(-)] + ) ) + !sys-auth/nss-myhostname + ! "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +pkg_postinst() { + newusergroup() { + enewgroup "$1" + enewuser "$1" -1 -1 -1 "$1" + } + + enewgroup input + enewgroup kvm 78 + enewgroup render + enewgroup systemd-journal + newusergroup systemd-bus-proxy + newusergroup systemd-coredump + newusergroup systemd-journal-gateway + newusergroup systemd-journal-remote + newusergroup systemd-journal-upload + newusergroup systemd-network + newusergroup systemd-resolve + newusergroup systemd-timesync + + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${EROOT%/}" + fi + + udev_reload || FAIL=1 + + # Bug 465468, make sure locales are respect, and ensure consistency + # between OpenRC & systemd + migrate_locale + + systemd_reenable systemd-networkd.service systemd-resolved.service + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} diff --git a/sys-apps/systemd/systemd-241-r1.ebuild b/sys-apps/systemd/systemd-241-r1.ebuild new file mode 100644 index 000000000000..47f33c6fcff7 --- /dev/null +++ b/sys-apps/systemd/systemd-241-r1.ebuild @@ -0,0 +1,461 @@ +# Copyright 2011-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + MY_PV=${PV/_/-} + MY_P=${PN}-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +fi + +PYTHON_COMPAT=( python{3_5,3_6,3_7} ) + +inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb" + +REQUIRED_USE="importd? ( curl gcrypt lzma )" +RESTRICT="!test? ( test )" + +MINKV="3.11" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + !=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) + curl? ( net-misc/curl:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0= + ssl? ( >=net-libs/gnutls-3.1.4:0= ) + ) + idn? ( + libidn2? ( net-dns/libidn2:= ) + !libidn2? ( net-dns/libidn:= ) + ) + importd? ( + app-arch/bzip2:0= + sys-libs/zlib:0= + ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + nat? ( net-firewall/iptables:0= ) + pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) + pcre? ( dev-libs/libpcre2 ) + qrcode? ( media-gfx/qrencode:0= ) + seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) + selinux? ( sys-libs/libselinux:0= ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + >=sys-apps/baselayout-2.2 + selinux? ( sec-policy/selinux-base-policy[systemd] ) + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( sys-apps/sysvinit ) + resolvconf? ( !net-dns/openresolv ) + !build? ( || ( + sys-apps/util-linux[kill(-)] + sys-process/procps[kill(+)] + sys-apps/coreutils[kill(-)] + ) ) + !sys-auth/nss-myhostname + ! "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +pkg_postinst() { + newusergroup() { + enewgroup "$1" + enewuser "$1" -1 -1 -1 "$1" + } + + enewgroup input + enewgroup kvm 78 + enewgroup render + enewgroup systemd-journal + newusergroup systemd-bus-proxy + newusergroup systemd-coredump + newusergroup systemd-journal-gateway + newusergroup systemd-journal-remote + newusergroup systemd-journal-upload + newusergroup systemd-network + newusergroup systemd-resolve + newusergroup systemd-timesync + + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${EROOT}" + fi + + udev_reload || FAIL=1 + + # Bug 465468, make sure locales are respect, and ensure consistency + # between OpenRC & systemd + migrate_locale + + systemd_reenable systemd-networkd.service systemd-resolved.service + + if [[ -z ${ROOT} && -d /run/systemd/system ]]; then + ebegin "Reexecuting system manager" + systemctl daemon-reexec + eend $? + fi + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 46a4eab642f2..8165beaf0a98 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -4,8 +4,11 @@ AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de63191 AUX sysvinit-2.86-shutdown-single.patch 1229 BLAKE2B fc95e0a3db23300776bc61890f491449f0b078f3814d73b1fae278a3e28f8b3b567056f71ecfbd917e74aec1594cfdb7b15e6808a09ccda594ec8e1a683d5957 SHA512 b1fa6225cdb0d5ed6d2d3128a9ad29dc76f14845c3fe57aa2edf234af456ae49f700b25ed4170a6337f662be224bd6ddfd424331483b0c482fd33cd045ddc575 AUX sysvinit-2.88-shutdown-h.patch 1626 BLAKE2B ba9aba1854f040c31862c5a1a0c9d1ea3186ced2415f9e0fe457a34fa4eec9d56d024467d7524133da858dc313b079ae5d3b1c926b8247804414fb4f23cbffcf SHA512 244ed7c2242f52674153ccfebb92c7a9bdc68a25f98aacbbf107ddfce11b195483e90150619fbeae3167136fcb54b878f8eb77e2dfe225d9f2eeb2c182e5e2fe AUX sysvinit-2.92_beta-shutdown-h.patch 2341 BLAKE2B 255f9831d59721fb3f59f6caeb9f6d828b5477d7b80668b279b29d036a292584965191bc204054fa71b1d53b3e9d83475ba8a1c09b92152fd9fcb29c40c0d1c6 SHA512 52d172aab471a0e2e8057292bfc401eade032da8c5058e22f35015e58635b8fe45ee8425c2a6cd7466942acd168f28c53c8c34f3b781a5c8c6c8b5714096439e +AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0 DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0d308b7027d54031848407e6b7667b59096044eb186a7f6a862521d4a670c05a17dcc929d07da6515058949606 SHA512 8dcf6de79b03567c300ef5f2b7dd211895745e231510d730092085a15f61f06f28cee7c504b0b022bdcb4b4e903f44946537d4fbb2b5069fb5d29bb099fd45f5 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72 +DIST sysvinit-2.94-beta.tar.xz 120584 BLAKE2B 7fe9bdfcdbccd13cb34a0a48da45314f1d960c49380255f99df151717c9228b6f0cdd8362795d5e6145eb483845cfbb5966937853ff826f60f0db57cd121d06c SHA512 f403e352572247d3a9c30f591d0119950b0332c51dd3c5d33f5140f7effb1832b314322dc79bb4f2958ac370c461808651e1f712d67a877ef7f9e21d463abcb1 EBUILD sysvinit-2.91-r1.ebuild 3340 BLAKE2B df7dab50132c8fef9c2bca3c09c4cc4dc1d2bece75ebf85858690f9030ba749a44da731a887dc9b0e4f84b23e40327da5065933faed68bd3fe3278c32fb6907f SHA512 e5ad8dc291b1497283ce0d0f6b572e0111a8a3c0ec9bf0f0d4d5e639fa5b9759a8dc680c75a8f841c4f71c45c6208e997ba8bbb434e910305312a0640bbeb16d EBUILD sysvinit-2.93.ebuild 3588 BLAKE2B 84f3bfbc114740022d746d30a2ec142a1cfe79174ad34088fce5dff6d0e6f9384cb3f601976d5e7aa2e8ef271f181ff8f263cbb3e28055aadc469ae4f2d0e315 SHA512 6cb6b476d57b291070dd337fc26fd142d3a7623b7ce96911cdbca141a898fc8de7f490182aff9a1a6acdb7904f5806b1b11ec09c10d18bafce82aca0c7c5f4ea +EBUILD sysvinit-2.94_beta.ebuild 3739 BLAKE2B ac8c85d512a895dd510ae4f3180f8cecd518b68e6a735131b3b96f5df100be104d3663c483a1bcab2e0bbb19c0e422fcdeb2dc7fffe39e6cb9573b61dab506c2 SHA512 8e5b27390b928bd79e1f60e72b21c2a6e0f148dbdfae053c693e7fa8451e52c39d47feb084f0321f8f3bf73e86a178dc3b75e8e9b3d88bb4c4bc022b9385d229 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f diff --git a/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch new file mode 100644 index 000000000000..9aa85229eee1 --- /dev/null +++ b/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch @@ -0,0 +1,39 @@ +This patch makes shutdown use the Single User runlevel by default so +the gettys are shutdown too. + +Roy Marples + +Forward-ported from v2.86 to v2.94_beta +Lars Wendler + +--- sysvinit-2.94/man/shutdown.8 ++++ sysvinit-2.94/man/shutdown.8 +@@ -44,7 +44,7 @@ + \fBshutdown\fP does its job by signalling the \fBinit\fP process, + asking it to change the runlevel. + Runlevel \fB0\fP is used to halt the system, runlevel \fB6\fP is used +-to reboot the system, and runlevel \fB1\fP is used to put to system into ++to reboot the system, and runlevel \fBS\fP is used to put to system into + a state where administrative tasks can be performed; this is the default + if neither the \fI-h\fP or \fI-r\fP flag is given to \fBshutdown\fP. + To see which actions are taken on halt or reboot see the appropriate +--- sysvinit-2.94/src/shutdown.c ++++ sysvinit-2.94/src/shutdown.c +@@ -547,7 +547,7 @@ + usage(); + exit(1); + } +- strcpy(down_level, "1"); ++ strcpy(down_level, "S"); + halttype = NULL; + memset(when, '\0', WHEN_SIZE); + +@@ -734,6 +734,8 @@ + strncpy(newstate, "for reboot", STATELEN); + break; + case '1': ++ case 'S': ++ case 's': + strncpy(newstate, "to maintenance mode", STATELEN); + break; + default: diff --git a/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild b/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild new file mode 100644 index 000000000000..bb9842d5c6a9 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="/sbin/init - parent of all processes" +HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" +SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +[[ "${PV}" == *beta* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="selinux ibm static kernel_FreeBSD" + +CDEPEND=" + selinux? ( + >=sys-libs/libselinux-1.28 + )" +DEPEND="${CDEPEND} + virtual/os-headers" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-shutdown ) + !::g' \ + -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ + src/Makefile || die + + # pidof has moved to >=procps-3.3.9 + sed -i -r \ + -e '/\/bin\/pidof/d' \ + -e '/^MAN8/s:\::g' \ + src/Makefile || die + + # logsave is already in e2fsprogs + sed -i -r \ + -e '/^(USR)?S?BIN/s:\::g' \ + -e '/^MAN8/s:\::g' \ + src/Makefile || die + + # Mung inittab for specific architectures + cd "${WORKDIR}" || die + cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab" + local insert=() + use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) + use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) + use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) + use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) + use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) + if use ibm ; then + insert+=( + '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' + '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' + ) + fi + (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab + if use kernel_FreeBSD ; then + sed -i \ + -e 's/linux/cons25/g' \ + -e 's/ttyS0/cuaa0/g' \ + -e 's/ttyS1/cuaa1/g' \ + inittab #121786 + fi + if use x86 || use amd64 ; then + sed -i \ + -e '/ttyS[01]/s:9600:115200:' \ + inittab + fi + if [[ ${#insert[@]} -gt 0 ]] ; then + printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab + fi +} + +src_compile() { + tc-export CC + append-lfs-flags + export DISTRO= #381311 + export VERSION="${PV}" + use static && append-ldflags -static + emake -C src $(usex selinux 'WITH_SELINUX=yes' '') +} + +src_install() { + emake -C src install ROOT="${D}" + dodoc README doc/* + + insinto /etc + doins "${WORKDIR}"/inittab + + # dead symlink + rm "${ED%/}"/usr/bin/lastb || die + + newinitd "${FILESDIR}"/bootlogd.initd bootlogd +} + +pkg_postinst() { + # Reload init to fix unmounting problems of / on next reboot. + # This is really needed, as without the new version of init cause init + # not to quit properly on reboot, and causes a fsck of / on next reboot. + if [[ ${ROOT} == / ]] ; then + if [[ -e /dev/initctl && ! -e /run/initctl ]]; then + ln -s /dev/initctl /run/initctl + fi + # Do not return an error if this fails + /sbin/telinit U &>/dev/null + fi + + elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" + elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." + + # Required for new bootlogd service + if [[ ! -e "${EROOT%/}/var/log/boot" ]] ; then + touch "${EROOT%/}/var/log/boot" + fi +} diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest index a57574fd9747..387dd1a84355 100644 --- a/sys-apps/texinfo/Manifest +++ b/sys-apps/texinfo/Manifest @@ -1,12 +1,9 @@ AUX texinfo-6.5-escape-braces-in-regex.patch 1082 BLAKE2B 3498fdc85f506d1107d1101304f4d7a3da69ebda3532f21b30d670dd2c968b2f13f8aedcd1e47a50f91b909d7d2847919e5d8325c991fb0e8910e701d31142c1 SHA512 250a33570834e5bc1557d600461d194fdc5c80e99d0a4eeecede8b6e21d235fd60d4bcd8e516ea4fa1940b01b7856ba2f1a6310dd24ac26f6d04f89e7dba8835 AUX texinfo-6.5-perl-5.28-thread-safe-locales.patch 1239 BLAKE2B f42337e49d6530db6706e9867db9211b91be17a9e5744b350a124dbe95e7ea39e208b7a31a81f656b9a53d51dd4d7ea0b155924753288bbbf6db33d0d38a5b13 SHA512 aca40e7fa4acb9df90efa169d40c1d76b797c334a09472fb9d72e2f577f12628c5425b64b25c8d3940fa178254249de628f7ac84bae7fc887c4deaebe21c4602 -DIST texinfo-6.1.tar.xz 4520376 BLAKE2B 3b96ed431288815df4261fcd0266f2be01d27f82904f20169ab5c9dbecc26dbe817a36a41817868b3f44f1bea45b53e3da5703399cd8ae2ad098f5b1cb0b49d9 SHA512 ae47295f3bcfb728c3be59421cf830ecfa5fc7856a086e45da2bac89600d883aa4406a6ef62d7ee5dc2bab83a3efa1cec861a3b4b14b85bbecb53ebf3ebf7235 DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4 -DIST texinfo-6.4.tar.xz 4497624 BLAKE2B 7081131868f748036c39812674fa8b962144fe6b96445ff72b5a88537a9a044c45cab33bfaf0d3169c0bfb6ce60832c908e49a04ef04d7631ba345002b552f92 SHA512 628e7fb64c4cb6d4ec879d5593e3660dbbbf41915c7aec68b6af209a1c496bee8a3879a69e4e047c3bee0cb476540ffd6ebdef5ec7b712edd191a82ce9ac4006 DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3557265d8bdda143e10f781769ca5e97ded2d330da7c0ae1581bfdebbf2dbde736689412980b098ea935d9580 SHA512 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc -EBUILD texinfo-6.1.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2 +DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0 EBUILD texinfo-6.3.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2 -EBUILD texinfo-6.4.ebuild 1119 BLAKE2B 3758a080518277f705a6d0726015e5bb9f1dfbeb3b14bdbee668f3641acbf564d4d41f147a827011f358b0e739307e2fd5994af3fa93210275e717e588c82382 SHA512 3cb88782ece710208c38b506fdb028e03390c6f798fc13a9bf8e2891d0096a8bea5531d16e454b091a6227b905ffc73f4d2d786f3fdef7102637fa3023de7530 EBUILD texinfo-6.5-r1.ebuild 1268 BLAKE2B 3cc36fe001c216e0b460df0c948ecad98c7635efc35181b950a4ba65896ddd07f04203ff0680515a1ab19fd89e57623902744ab546885483c5a79569a716eed5 SHA512 dabac9043745739d956fc299c59ffca8555c17fe076a1b74cdf880bfdd75a1abb9f0081d812c8c396d0c720537ec6dcdd2c72e670f7001a92d9576e23f72aa99 -EBUILD texinfo-6.5.ebuild 1153 BLAKE2B 114c01323863fee4903830e36f798eff5b525f3d67618100cfd713ec06a3edc79d960e66ee2973622f5d11d711f7a35880185c103d8da40fa79fc21f8a17f3ad SHA512 5968b0d3b4455e5c6b32c52540c17014566a1a2f7604dcb26ecf01736da6077a002dbf3b17a5170909c26c4ac46ca48b85f07c66fe415c85fcc07d52d4adf991 +EBUILD texinfo-6.6.ebuild 1150 BLAKE2B c905933f10a44bcc47fe68958b77bf70f26d1424dd0bb09aabcb3aed6bd6dcd2eda67acf48b83e2621789c1536e824ea5a770e8c1b6ddeef1945f70651a254f4 SHA512 35e1a78ce95e3262b7238c7370889ecf017d5d777b94cac365095d653ec46849019754f7688c80d4ec211ca23fb226bed0144cc124ea1deb0aabd4cd120517bf MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/texinfo/texinfo-6.1.ebuild b/sys-apps/texinfo/texinfo-6.1.ebuild deleted file mode 100644 index eb694ae0d9c9..000000000000 --- a/sys-apps/texinfo/texinfo-6.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Note: if your package uses the texi2dvi utility, it must depend on the -# virtual/texi2dvi package to pull in all the right deps. The tool is not -# usable out-of-the-box because it requires the large tex packages. - -EAPI="5" - -inherit flag-o-matic - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="https://www.gnu.org/software/texinfo/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="nls static" - -RDEPEND=" - !=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:0= - dev-lang/perl:= - dev-perl/libintl-perl - dev-perl/Unicode-EastAsianWidth - dev-perl/Text-Unidecode - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19.6 )" - -src_configure() { - use static && append-ldflags -static - econf \ - --with-external-libintl-perl \ - --with-external-Unicode-EastAsianWidth \ - --with-external-Text-Unidecode \ - $(use_enable nls) -} diff --git a/sys-apps/texinfo/texinfo-6.4.ebuild b/sys-apps/texinfo/texinfo-6.4.ebuild deleted file mode 100644 index f710186e798c..000000000000 --- a/sys-apps/texinfo/texinfo-6.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Note: if your package uses the texi2dvi utility, it must depend on the -# virtual/texi2dvi package to pull in all the right deps. The tool is not -# usable out-of-the-box because it requires the large tex packages. - -EAPI="5" - -inherit flag-o-matic - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="https://www.gnu.org/software/texinfo/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="nls static" - -RDEPEND=" - !=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:0= - dev-lang/perl:= - dev-perl/libintl-perl - dev-perl/Unicode-EastAsianWidth - dev-perl/Text-Unidecode - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19.6 )" - -src_configure() { - use static && append-ldflags -static - econf \ - --with-external-libintl-perl \ - --with-external-Unicode-EastAsianWidth \ - --with-external-Text-Unidecode \ - $(use_enable nls) -} diff --git a/sys-apps/texinfo/texinfo-6.5.ebuild b/sys-apps/texinfo/texinfo-6.5.ebuild deleted file mode 100644 index e7a4ae266926..000000000000 --- a/sys-apps/texinfo/texinfo-6.5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Note: if your package uses the texi2dvi utility, it must depend on the -# virtual/texi2dvi package to pull in all the right deps. The tool is not -# usable out-of-the-box because it requires the large tex packages. - -EAPI=6 - -inherit flag-o-matic - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="https://www.gnu.org/software/texinfo/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="nls static" - -RDEPEND=" - !=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:0= - dev-lang/perl:= - dev-perl/libintl-perl - dev-perl/Unicode-EastAsianWidth - dev-perl/Text-Unidecode - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( >=sys-devel/gettext-0.19.6 )" - -src_configure() { - use static && append-ldflags -static - local myeconfargs=( - --with-external-libintl-perl - --with-external-Unicode-EastAsianWidth - --with-external-Text-Unidecode - $(use_enable nls) - ) - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/texinfo/texinfo-6.6.ebuild b/sys-apps/texinfo/texinfo-6.6.ebuild new file mode 100644 index 000000000000..41f0f7dd61c7 --- /dev/null +++ b/sys-apps/texinfo/texinfo-6.6.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: if your package uses the texi2dvi utility, it must depend on the +# virtual/texi2dvi package to pull in all the right deps. The tool is not +# usable out-of-the-box because it requires the large tex packages. + +EAPI=6 + +inherit flag-o-matic + +DESCRIPTION="The GNU info program and utilities" +HOMEPAGE="https://www.gnu.org/software/texinfo/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="nls static" + +RDEPEND=" + !=app-text/tetex-2* + >=sys-libs/ncurses-5.2-r2:0= + dev-lang/perl:= + dev-perl/libintl-perl + dev-perl/Unicode-EastAsianWidth + dev-perl/Text-Unidecode + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + app-arch/xz-utils + nls? ( >=sys-devel/gettext-0.19.6 )" + +src_configure() { + use static && append-ldflags -static + local myeconfargs=( + --with-external-libintl-perl + --with-external-Unicode-EastAsianWidth + --with-external-Text-Unidecode + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index f8f556224e81..e950d82fee31 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,6 +1,5 @@ AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd -AUX util-linux-2.32-add-missing-lintl.patch 1279 BLAKE2B d76fac864c34f38f51fdf422042f3199ddd8eecf7b2eab1b222c6be65605df365477be7e605bd45937ca3be716008227e7157d3da130fc0bf32eeffbefdbd9c1 SHA512 e705a5ec1a686d46226d9fa1e9369cc266c69c314a2a2f2f456cf92235d87b974c1dac72c928892657ea12f71bdaea83afaf95ed2eefd89b36007b371e047eb1 AUX util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch 1546 BLAKE2B 11a714486f7c6e4ca3d38adbf59231378ac94a5cd934816d93e46c73e8a9ff3f23909d88c39381b15d0beb4da8dd5c97af72166eec5822dc6a49b67a60eacf5f SHA512 5dfa5bb88e9e454a99c8ff5e8f76b9323729962aa9eba682a4a6ccfadc3af6068714ea3bf0e19abf5cc402dcafeb92057eaf4d25d5c292937d0cb94bbc8d99c2 AUX util-linux-2.33-sparc-setarch.patch 2353 BLAKE2B 16f3c627096644da973152db4b29d09f6e76d5576d1e9513ae29ed76e1112d71327ceef31b915e58652f8ead0b506819a2c5a996bda0c3670035f13d1f9595eb SHA512 d9e2bbe4a5c0d41dc199406a27187107121294b9bd13794b7f48b558c2dfe3f16b0dfa11e7ef70b6072fd6464d2220f35a0ab032bf6b99e11740056751ec7aed DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2 diff --git a/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch b/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch deleted file mode 100644 index 8cca093d7cb4..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3188ea9a9292604e537f06f11adddf474fc9e52d Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 9 Apr 2018 12:11:36 +0200 -Subject: [PATCH] build: Add missing -lintl linkage to lib{smartcols,uuid} - -Addresses: https://github.com/karelzak/util-linux/pull/615 -Signed-off-by: Karel Zak ---- - libsmartcols/src/Makemodule.am | 2 +- - libuuid/src/Makemodule.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am -index 664aca30b..665b2aa7f 100644 ---- a/libsmartcols/src/Makemodule.am -+++ b/libsmartcols/src/Makemodule.am -@@ -19,7 +19,7 @@ libsmartcols_la_SOURCES= \ - libsmartcols/src/version.c \ - libsmartcols/src/init.c - --libsmartcols_la_LIBADD = libcommon.la -+libsmartcols_la_LIBADD = $(LDADD) libcommon.la - - libsmartcols_la_CFLAGS = \ - $(AM_CFLAGS) \ -diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am -index 5122622a5..e58fa261c 100644 ---- a/libuuid/src/Makemodule.am -+++ b/libuuid/src/Makemodule.am -@@ -31,7 +31,7 @@ libuuid_la_SOURCES = \ - EXTRA_libuuid_la_DEPENDENCIES = \ - libuuid/src/libuuid.sym - --libuuid_la_LIBADD = $(SOCKET_LIBS) -+libuuid_la_LIBADD = $(LDADD) $(SOCKET_LIBS) - - libuuid_la_CFLAGS = \ - $(AM_CFLAGS) \ -- cgit v1.2.3