From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- sys-apps/fakeroot/Manifest | 13 +- sys-apps/fakeroot/fakeroot-1.22.ebuild | 9 +- sys-apps/fakeroot/fakeroot-1.23.ebuild | 7 +- sys-apps/fakeroot/fakeroot-1.24.ebuild | 7 +- sys-apps/fakeroot/fakeroot-1.25.1.ebuild | 7 +- sys-apps/fakeroot/fakeroot-1.25.2.ebuild | 7 +- sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild | 56 +++ sys-apps/fakeroot/fakeroot-1.25.3.ebuild | 51 --- .../files/fakeroot-1.25.3-glibc-2.33.patch | 413 +++++++++++++++++++++ 9 files changed, 492 insertions(+), 78 deletions(-) create mode 100644 sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild delete mode 100644 sys-apps/fakeroot/fakeroot-1.25.3.ebuild create mode 100644 sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch (limited to 'sys-apps/fakeroot') diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest index 2eefe6f6d81e..fb05a20aa165 100644 --- a/sys-apps/fakeroot/Manifest +++ b/sys-apps/fakeroot/Manifest @@ -1,15 +1,16 @@ AUX fakeroot-1.19-no-acl_h.patch 915 BLAKE2B 2392343f314e5cc3fa49def14a245cf2898902d99ff2fbe4bc0a883e70ae1382ed5c4c506533545b9c428958f8e4be54e795601063d48dd8ffe9e80d56ec267a SHA512 d077e8ba2bc4407ba1a57fb5920f2a866bdcb13fa359c2245e479019bbc19a3aab398cc25220079edf7c42c4d09429e57326b606ff5795f83de24c7a31835717 AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d72497145bcb8e5e1b2acf43608dd03f1a2b9ee688fda8859491d79c898e6f412eded6a5c8a24734640e2479eda95319a265 SHA512 824e71169877702c5d98970d62866d5074d1a728d5bc52460483117610f50f6869f65714608313f20e40b7432ea4c50cf9f47158d8f2f9ef4a3c00220ccbd52c +AUX fakeroot-1.25.3-glibc-2.33.patch 13646 BLAKE2B 1a83706a9e26f9c11d9851c24659086206df2d518c3103354971436565d59e8c5cdda47eaf40dc6645d7b09542e766593d57f731d7d8946ef96a1852b12ea2b0 SHA512 3f5402763d32a0b7461ef817e5aece42ff4807780ab886a7867d03019d0a4c501350a3520932e1ba6dcd592ae0cb9548c2cdf1da5498bfb6092f4cb6b4a09096 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5aaf82f4707ad8f810f954373a31cf5f390ef57dcc71ba630a1d4a578df95ac9beda9c93b3c75adffcbc89860f442b69 SHA512 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036 DIST fakeroot_1.24.orig.tar.gz 522497 BLAKE2B fb08ed6512a3e26538662ceb28a197b85fd4a05c37b543529df6880e01c64bd774037bed1230bf7d7fe0bde798364c2fd0fcfab257fff4d3e6ae9800c076a5b0 SHA512 b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487 DIST fakeroot_1.25.1.orig.tar.gz 126880 BLAKE2B ea92815d005422ade80a91d1351c500614f7628b2173caf23bab2192f9395440ba4429ac773723c79a0f0205b7c750db9c1cecbefe7e9e2c442c8a92938df0cf SHA512 0e340aacfb49558ee6719aa11aa297ccda2afe2f66209da8fa10e45ec7954d5db689717db38f30cdfb9d89b75ca63ec6aed42e2cc314fd25c60262aa735eab0d DIST fakeroot_1.25.2.orig.tar.gz 126876 BLAKE2B 13c4457aed3d6df08fef0f3af6093eea05bcaedff280146a7d09e96a1e73d0615c2527ce32bc4999a0acc0478610241440ec9a70ee27860cd61d799f636c30d3 SHA512 3afc0d6c82bef4968f1eac293174d12f957788f173fa8b69753c422f0f3bb54e012d350eaa8e535501dd62185479c1d4cb1c6e3f605930ae5987a7f622c450c2 DIST fakeroot_1.25.3.orig.tar.gz 126884 BLAKE2B a6a860a8714bb2a43f2820bc586cac38d25df8b8cb32b219064618c845d0308b57929108bd582b46c15b2fe4b2fc00d662ba72458a9e9ffcf7d035dce515eb55 SHA512 b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346ff72e857087243ab0efe9fa82faaa9f9c3309cac4b5af0ea00908c2e5eb6e -EBUILD fakeroot-1.22.ebuild 1068 BLAKE2B 24eb5e3273be5f6bf771c1930cf01495912a2a043ad39c80b3501abf211024b7a4bc8f09656fbb2b711368979377dfe46baa16528ee8de53890177e673082ab4 SHA512 096c63a170619f68f38b95013616e96881750c39b3f4d19d12bd5ff3cfae8c493f1b3ea5695ee8f584217d5d52d44c3ccb3041558db7f9770d53c5d8b0453a32 -EBUILD fakeroot-1.23.ebuild 1074 BLAKE2B e0f810e84eae6eea778b7b23b8bd6e8cf9c83db4f9b58cd9e6705bb1811f8ac2f626959507865cd8b234577434a4e2aef6b77082b0422eac481e1e63a2907722 SHA512 76fe90adcfa947f794365bd641beb1d63ab76295bc6d5dc2541800c856594d61fe3c34aa1bb9c62e7463ed73986c59461cd8bbb5b421d493336ed313c2632904 -EBUILD fakeroot-1.24.ebuild 1081 BLAKE2B 83324f005105c63853a8609a59095032ba7c559c6a211257f5e834eccc331f0d6760ff46586ed64ca0847c2fcb4190160449538a201b3c480ecffac867d1d9c8 SHA512 aac064b0369eed287f53944cd7ce1be7455d8bd2eb647b2d7499b67d306def045a32dd994245d64c6ef632b7d240cbc258405563bd777e3239f154ec524ca531 -EBUILD fakeroot-1.25.1.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5 -EBUILD fakeroot-1.25.2.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5 -EBUILD fakeroot-1.25.3.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5 +EBUILD fakeroot-1.22.ebuild 1037 BLAKE2B b54f10e687853be1dfe56bacb01955086074150c1b5b0b31f85247843631df123b7ae28a546a536b703ce7ed73535f2a0b0dd002f6466a8edbfed7d8c64ed222 SHA512 a0cba5dbef10e56f65753266abb39b16c5ca749a6b2a6788737c99bb396b29a5b687ab102cb3dee28e55bc686b3ee741c909fe8d2e7d182d322e3d18ca944ca1 +EBUILD fakeroot-1.23.ebuild 1042 BLAKE2B 397a3e3eb5b8cd664ae33968c0f0f3f252d0bba0996bc3885b403ce7f0de37b6b4fe68fb5e67d09632f082be3f3ced19e489615ee1e8a26a3c57482b8f2b98d0 SHA512 4ffa843ad9ff3a35b7d51f9d5655641010f1cd835d747dd8318d65bdd2eec81057c3fde221481f677e7e3d4695c5a0d6d8032b628d4c79e9594d6ecfbc448af5 +EBUILD fakeroot-1.24.ebuild 1049 BLAKE2B 0a15c82db4fc1c07e1b8ca8a4b518d25f08709e9dbedde5207cbe99e0c42602e932dc591d5f62997df29259a5e40abd5084b79b3636524f1dea4593ae0e8acb3 SHA512 64731f11ed5eee897e2cb6564b16aeb5ccf1a564a7c37132eca91e13acf27bc06a7dfd715786bc2743944558d8cfaf9d43f6e92f5c011c39c643979d9461425d +EBUILD fakeroot-1.25.1.ebuild 1153 BLAKE2B 4b8ae014196e34b7858663d1141f3f7951780d2035751aa691a5ce90805a4216f56aec081b501be9be02f444453c61ce1ecacb0ea8c77e8f7a2e30c7d9950cb0 SHA512 ec9769a0ff90e7f89abefae9f6b881c37435b320530a3bf8cc187496b3bbc57bc1a95a0739243c5344621f5687334ec9e79397066313229fa17b6b49939dc4e9 +EBUILD fakeroot-1.25.2.ebuild 1153 BLAKE2B 4b8ae014196e34b7858663d1141f3f7951780d2035751aa691a5ce90805a4216f56aec081b501be9be02f444453c61ce1ecacb0ea8c77e8f7a2e30c7d9950cb0 SHA512 ec9769a0ff90e7f89abefae9f6b881c37435b320530a3bf8cc187496b3bbc57bc1a95a0739243c5344621f5687334ec9e79397066313229fa17b6b49939dc4e9 +EBUILD fakeroot-1.25.3-r1.ebuild 1283 BLAKE2B dca56bb4cffd09daf635e3b9f57ae4d202826eee3ee445571e4229d0355b566302be59dae1c55270c1f363e980195a91d342d734b331a83e542c037ea76437a0 SHA512 d7a0d8b3f4fe46be037ad992f1f11c3f4068864949f3f6c98114c64c8535f4f66d985166e3321348409b711b6852ddfe22b37debf6966f9976e079ac044b2949 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild index 1f8e88f9076b..de5c08838429 100644 --- a/sys-apps/fakeroot/fakeroot-1.22.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,8 +11,8 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -36,8 +36,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.23.ebuild b/sys-apps/fakeroot/fakeroot-1.23.ebuild index c0f5629f8051..8ff11f2bd082 100644 --- a/sys-apps/fakeroot/fakeroot-1.23.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -36,8 +36,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.24.ebuild b/sys-apps/fakeroot/fakeroot-1.24.ebuild index 1145abde6854..c0433bfb258d 100644 --- a/sys-apps/fakeroot/fakeroot-1.24.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -36,8 +36,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.25.1.ebuild b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild index eac32e7e9542..acc86b8534df 100644 --- a/sys-apps/fakeroot/fakeroot-1.25.1.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -41,8 +41,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.25.2.ebuild b/sys-apps/fakeroot/fakeroot-1.25.2.ebuild index eac32e7e9542..acc86b8534df 100644 --- a/sys-apps/fakeroot/fakeroot-1.25.2.ebuild +++ b/sys-apps/fakeroot/fakeroot-1.25.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" +IUSE="acl debug test" RESTRICT="!test? ( test )" DEPEND=" @@ -41,8 +41,7 @@ src_configure() { export ac_cv_header_sys_acl_h=$(usex acl) use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { diff --git a/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild b/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild new file mode 100644 index 000000000000..86101250865e --- /dev/null +++ b/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery" +HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html" +SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="acl debug test" +RESTRICT="!test? ( test )" + +DEPEND=" + sys-libs/libcap + acl? ( sys-apps/acl ) + test? ( app-arch/sharutils )" +BDEPEND="app-text/po4a" + +DOCS=( AUTHORS BUGS DEBUG README doc/README.saving ) + +src_prepare() { + local PATCHES=( + "${FILESDIR}/fakeroot-1.25.3-glibc-2.33.patch" + ) + default + eautoreconf +} + +src_configure() { + export ac_cv_header_sys_acl_h=$(usex acl) + use acl || export ac_cv_search_acl_get_fd=no # bug 759568 + use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING + + econf --disable-static +} + +src_compile() { + # Create translated man pages + pushd doc >/dev/null || die + po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die + popd >/dev/null || die + + default +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/sys-apps/fakeroot/fakeroot-1.25.3.ebuild b/sys-apps/fakeroot/fakeroot-1.25.3.ebuild deleted file mode 100644 index eac32e7e9542..000000000000 --- a/sys-apps/fakeroot/fakeroot-1.25.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery" -HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html" -SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="acl debug static-libs test" -RESTRICT="!test? ( test )" - -DEPEND=" - sys-libs/libcap - acl? ( sys-apps/acl ) - test? ( app-arch/sharutils )" -BDEPEND="app-text/po4a" - -DOCS="AUTHORS BUGS DEBUG README doc/README.saving" - -src_prepare() { - default - eautoreconf -} - -src_compile() { - # Create tranlated man pages - pushd doc &>/dev/null || die - po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die - popd &>/dev/null || die - - default -} - -src_configure() { - export ac_cv_header_sys_acl_h=$(usex acl) - - use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING" - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -o -name '*.a' -delete || die -} diff --git a/sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch b/sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch new file mode 100644 index 000000000000..87ae9e18b746 --- /dev/null +++ b/sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch @@ -0,0 +1,413 @@ +From 03bc0ee07fb6e293d081ffd8af1654788b434f6a Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Thu, 11 Feb 2021 20:59:25 -0800 +Subject: [PATCH 1/6] libfakeroot.c: define _STAT_VER if not already defined + +Based on patch from Jan Pazdziora: +https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/ + +Signed-off-by: Ilya Lipnitskiy +--- + libfakeroot.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libfakeroot.c b/libfakeroot.c +index 3e80e38..14cdbc4 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -90,6 +90,16 @@ + #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b) + #endif + ++#ifndef _STAT_VER ++ #if defined (__aarch64__) ++ #define _STAT_VER 0 ++ #elif defined (__x86_64__) ++ #define _STAT_VER 1 ++ #else ++ #define _STAT_VER 3 ++ #endif ++#endif ++ + /* + These INT_* (which stands for internal) macros should always be used when + the fakeroot library owns the storage of the stat variable. +-- +GitLab + + +From feda578ca3608b7fc9a28a3a91293611c0ef47b7 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Thu, 11 Feb 2021 21:00:04 -0800 +Subject: [PATCH 2/6] libfakeroot.c: add wrappers for new glibc 2.33+ symbols + +Signed-off-by: Ilya Lipnitskiy +--- + libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +diff --git a/libfakeroot.c b/libfakeroot.c +index 14cdbc4..d75c51f 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath, + #endif /* HAVE_FSTATAT */ + + ++#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33) ++/* Glibc 2.33 exports symbols for these functions in the shared lib */ ++ int lstat(const char *file_name, struct stat *statbuf) { ++ return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf); ++ } ++ int stat(const char *file_name, struct stat *st) { ++ return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st); ++ } ++ int fstat(int fd, struct stat *st) { ++ return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st); ++ } ++ ++ #ifdef HAVE_FSTATAT ++ int fstatat(int dir_fd, const char *path, struct stat *st, int flags) { ++ return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags); ++ } ++ #endif ++ ++ #ifdef STAT64_SUPPORT ++ int lstat64(const char *file_name, struct stat64 *st) { ++ return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st); ++ } ++ int stat64(const char *file_name, struct stat64 *st) { ++ return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st); ++ } ++ int fstat64(int fd, struct stat64 *st) { ++ return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st); ++ } ++ ++ #ifdef HAVE_FSTATAT ++ int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) { ++ return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags); ++ } ++ #endif ++ #endif ++ ++ int mknod(const char *pathname, mode_t mode, dev_t dev) { ++ return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev); ++ } ++ ++ #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT) ++ int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) { ++ return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev); ++ } ++ #endif ++#endif /* GLIBC_PREREQ */ ++ ++ + #ifdef FAKEROOT_FAKENET + pid_t fork(void) + { +-- +GitLab + + +From d074aaa34d6928989308a3870738d6b1c28f2bae Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Thu, 11 Feb 2021 21:00:20 -0800 +Subject: [PATCH 3/6] libfakeroot.c: fix compile error with DEBUG enabled + +Signed-off-by: Ilya Lipnitskiy +--- + libfakeroot.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libfakeroot.c b/libfakeroot.c +index d75c51f..31480f8 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -2525,7 +2525,7 @@ int statx (int dirfd, const char *path, int flags, unsigned int mask, struct sta + + #ifdef LIBFAKEROOT_DEBUGGING + if (fakeroot_debug) { +- fprintf(stderr, "statx fd %d\n", fd); ++ fprintf(stderr, "statx fd %d\n", dirfd); + } + #endif /* LIBFAKEROOT_DEBUGGING */ + r=INT_NEXT_FSTATAT(dirfd, path, &st, flags); +-- +GitLab + + +From c3eebec293e35b997bb46c22fb5a4e114afb5e7f Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Sat, 13 Feb 2021 19:32:08 -0800 +Subject: [PATCH 4/6] configure.ac: fix __xmknod{,at} pointer argument + +Switch default to assume * and not the absence of *. + +On glibc 2.33+, there is no definition for these functions in header +files, so the compile test doesn't work. But, we can default to using +the pointer (as is the case with newer glibc), and use the header file +on older platforms to fail the test and use no pointer. + +Signed-off-by: Ilya Lipnitskiy +--- + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 73415d2..d85566f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -183,13 +183,13 @@ AC_MSG_CHECKING([for type of arg of __xmknod]) + ]], [[ + int __xmknod ( int ver, + const char *pathname , +- mode_t mode , dev_t dev); ++ mode_t mode , dev_t *dev); + ]])],[ +- AC_DEFINE(XMKNOD_FRTH_ARG,) +- AC_MSG_RESULT([no extra *]) +- ],[ + AC_DEFINE(XMKNOD_FRTH_ARG,[*]) + AC_MSG_RESULT([needs *]) ++ ],[ ++ AC_DEFINE(XMKNOD_FRTH_ARG,) ++ AC_MSG_RESULT([no extra *]) + + ]) + +@@ -210,13 +210,13 @@ AC_MSG_CHECKING([for type of arg of __xmknodat]) + int __xmknodat ( int ver, + int dirfd, + const char *pathname , +- mode_t mode , dev_t dev); ++ mode_t mode , dev_t *dev); + ]])],[ +- AC_DEFINE(XMKNODAT_FIFTH_ARG,) +- AC_MSG_RESULT([no extra *]) +- ],[ + AC_DEFINE(XMKNODAT_FIFTH_ARG,[*]) + AC_MSG_RESULT([needs *]) ++ ],[ ++ AC_DEFINE(XMKNODAT_FIFTH_ARG,) ++ AC_MSG_RESULT([no extra *]) + + ]) + +-- +GitLab + + +From 01671986b4ee8eb76dc7f63dfe034a7faf4a4c28 Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Sat, 13 Feb 2021 19:35:31 -0800 +Subject: [PATCH 5/6] libfakeroot.c: fix fts_read and fts_children + +Apply Debian patch from [0], since glibc is usually built without LFS. +__USE_LARGEFILE64 and FTSENT64 should be used anyway for proper support +of this, if needed. See [1] for more details. + +[0]: https://sources.debian.org/patches/fakeroot/1.25.3-1.1/eglibc-fts-without-LFS/ +[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676428 + +Signed-off-by: Ilya Lipnitskiy +--- + libfakeroot.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/libfakeroot.c b/libfakeroot.c +index 31480f8..169f4da 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -2066,11 +2066,7 @@ FTSENT *fts_read(FTS *ftsp) { + || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK)) + r->fts_statp = NULL; /* Otherwise fts_statp may be a random pointer */ + if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ +-# if defined(STAT64_SUPPORT) && !defined(__APPLE__) +- SEND_GET_STAT64(r->fts_statp, _STAT_VER); +-# else + SEND_GET_STAT(r->fts_statp, _STAT_VER); +-# endif + } + + return r; +@@ -2089,11 +2085,7 @@ FTSENT *fts_children(FTS *ftsp, int options) { + first=next_fts_children(ftsp, options); + for(r = first; r; r = r->fts_link) { + if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ +-# if defined(STAT64_SUPPORT) && !defined(__APPLE__) +- SEND_GET_STAT64(r->fts_statp, _STAT_VER); +-# else + SEND_GET_STAT(r->fts_statp, _STAT_VER); +-# endif + } + } + +-- +GitLab + + +From f5e0a89ab6f0024f3d3bec5fd9cf631676b44f6c Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy +Date: Sat, 13 Feb 2021 20:05:17 -0800 +Subject: [PATCH 6/6] OS X portability + +OS X portability work from OpenWrt. + +Cc: Felix Fietkau +Signed-off-by: Ilya Lipnitskiy +--- + configure.ac | 1 + + libfakeroot.c | 36 ++++++++++++++++++++++++++++++++++-- + wrapawk_macosx | 10 +++++++--- + wrapfunc.inp | 4 ++-- + 4 files changed, 44 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d85566f..35f9ecf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -146,6 +146,7 @@ for first in size_t int; do + #include + #endif + #include ++#include + #ifdef HAVE_GRP_H + #include + #endif +diff --git a/libfakeroot.c b/libfakeroot.c +index 169f4da..7593dd6 100644 +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -122,8 +122,16 @@ + #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER) + #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER) + #define INT_SEND_GET_STAT(a,b) SEND_GET_STAT(a,b) ++ ++/* 10.10 uses id_t in getpriority/setpriority calls, so pretend ++ id_t is used everywhere, just happens to be int on some OSes */ ++#ifndef _ID_T ++#define _ID_T ++typedef int id_t; ++#endif + #endif + ++#include + #include + #include + #include +@@ -135,7 +143,6 @@ + #include + #include + #include +-#include + #ifdef HAVE_SYS_ACL_H + #include + #endif /* HAVE_SYS_ACL_H */ +@@ -198,6 +205,15 @@ extern int unsetenv (const char *name); + #undef __lxstat64 + #undef _FILE_OFFSET_BITS + ++ ++#ifndef AT_EMPTY_PATH ++#define AT_EMPTY_PATH 0 ++#endif ++ ++#ifndef AT_NO_AUTOMOUNT ++#define AT_NO_AUTOMOUNT 0 ++#endif ++ + /* + // next_wrap_st: + // this structure is used in next_wrap, which is defined in +@@ -1969,7 +1985,7 @@ ssize_t fremovexattr(int fd, const char *name) + } + #endif /* HAVE_FREMOVEXATTR */ + +-int setpriority(int which, int who, int prio){ ++int setpriority(int which, id_t who, int prio){ + if (fakeroot_disabled) + return next_setpriority(which, who, prio); + next_setpriority(which, who, prio); +@@ -2570,3 +2586,19 @@ int sysinfo(int command, char *buf, long count) + } + } + #endif ++ ++#ifdef HAVE_OPENAT ++int openat(int dir_fd, const char *pathname, int flags, ...) ++{ ++ mode_t mode; ++ ++ if (flags & O_CREAT) { ++ va_list args; ++ va_start(args, flags); ++ mode = va_arg(args, int); ++ va_end(args); ++ } ++ ++ return next_openat(dir_fd, pathname, flags, mode); ++} ++#endif +diff --git a/wrapawk_macosx b/wrapawk_macosx +index 088a7f4..f783219 100644 +--- a/wrapawk_macosx ++++ b/wrapawk_macosx +@@ -46,26 +46,30 @@ BEGIN{ + argtype=$3; + argname=$4; + MACRO=$5; ++ argtype_def=$6 ++ if(!argtype_def) { ++ argtype_def = argtype ++ } + if(MACRO){ + print "extern " ret " MY_DEF(" name ")" argtype " __attribute__((visibility(\"hidden\")));" > headerfile; + print "INTERPOSE(MY_DEF(" name "_RAW)," name "_RAW);" > structfile; + print "#undef " name > deffile + print "#define " name " MY_DEF(" name "_RAW)" > deffile + +- print "extern " ret, name, argtype ";" > tmpffile; ++ print "extern " ret, name, argtype_def ";" > tmpffile; + print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " __attribute__((always_inline));" > tmpffile; + print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " {" > tmpffile; + print " return " name, argname ";" > tmpffile; + print "}" > tmpffile; + print "" > tmpffile; + } else { +- print "extern " ret " my_" name, argtype " __attribute__((visibility(\"hidden\")));" > headerfile; ++ print "extern " ret " my_" name, argtype_def " __attribute__((visibility(\"hidden\")));" > headerfile; + print "#undef " name > structfile; + print "INTERPOSE(my_" name "," name ");" > structfile; + print "#define " name " my_" name > structfile + print "#define " name " my_" name > deffile + +- print "extern " ret, name, argtype ";" > tmpffile; ++ print "extern " ret, name, argtype_def ";" > tmpffile; + if(argname){ + print "static __inline__ " ret " next_" name, argtype " __attribute__((always_inline));" > tmpffile; + print "static __inline__ " ret " next_" name, argtype " {" > tmpffile; +diff --git a/wrapfunc.inp b/wrapfunc.inp +index f7ad186..556af34 100644 +--- a/wrapfunc.inp ++++ b/wrapfunc.inp +@@ -146,7 +146,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid) + initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group) + getgroups;int;(int size, gid_t list[]);(size, list) + setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list) +-setpriority;int;(int which, int who, int prio);(which, who, prio) ++setpriority;int;(int which, id_t who, int prio);(which, who, prio) + #ifdef HAVE_CAPSET + capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap) + #endif /* HAVE_CAPSET */ +@@ -198,7 +198,7 @@ fchownat;int;(int dir_fd, const char *path, uid_t owner, gid_t group, int flags) + mkdirat;int;(int dir_fd, const char *pathname, mode_t mode);(dir_fd, pathname, mode) + #endif /* HAVE_MKDIRAT */ + #ifdef HAVE_OPENAT +-openat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, flags) ++openat;int;(int dir_fd, const char *pathname, int flags, mode_t mode);(dir_fd, pathname, flags, mode);;(int dir_fd, const char *pathname, int flags, ...) + #endif /* HAVE_OPENAT */ + #ifdef HAVE_RENAMEAT + renameat;int;(int olddir_fd, const char *oldpath, int newdir_fd, const char *newpath);(olddir_fd, oldpath, newdir_fd, newpath) +-- +GitLab + -- cgit v1.2.3