commit: a0e1a91d1b191aca42bee226457008e25660ed89 Author: stefson <herrtimson <AT> yahoo <DOT> de> AuthorDate: Sun Sep 3 11:35:16 2017 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sun Sep 3 20:54:09 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a0e1a91d
sys-apps/portage: bug #617778 is fixed and stablized for all musl arches in portage-2.3.6 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> sys-apps/portage/Manifest | 5 - sys-apps/portage/files/2.3.5-loff_t.patch | 70 -------- sys-apps/portage/files/README.RESCUE | 2 - sys-apps/portage/metadata.xml | 27 --- sys-apps/portage/portage-2.3.5.ebuild | 279 ------------------------------ 5 files changed, 383 deletions(-) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest deleted file mode 100644 index e43af65..0000000 --- a/sys-apps/portage/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX 2.3.5-loff_t.patch 2569 SHA256 709f0374f9f88cc89f379356ae8bffc6560e240f2157ccab367d0ebc2e523438 SHA512 e944be00cd7bca618202a5f3084624eb110a02edc5d5cac44603c7a9c16132305b13e916578bfd06f6792c978cc78c60282823fc162df7120032c9239880e21f WHIRLPOOL dd638c53a1ecf36b7501bed36eccb8099f581d6a5b4c061015e40dd34cbd4bb58af3c14c18bfcab76a762813b365d5e80e8d298d230a0d29fe7a741449158cb2 -AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5 -DIST portage-2.3.5.tar.bz2 933047 SHA256 9b3282eee8f7f5728a4a71864d6b34315d71d43c52b2b650cf0d8f412c871941 SHA512 c403578caf40d97e8081c203d433b515cb2fdb14cb8b7d2652ed664bd079e65db32b54ce12ff495af6dd5fb468c5a1ef58d335e202ede5355d115049e21a6a35 WHIRLPOOL 25dbb6547d6488cebc1baf093a600e2034e17558306fd55f5502346330a78012e32d3c49dcf0445664c69d4e3e6b2580762417324ccd0bf3aa08575245165a24 -EBUILD portage-2.3.5.ebuild 8633 SHA256 2e353b0fbb3e9e06a84af2f236e85b4e9fe4e204ca22bcb93ff74c367db487f8 SHA512 0fa9d646f5e0e80990b31e9c39fe4b994efdec13530b610da22046eaa6023224dc6f7bec27865d478eb440389632e99a60a8d4f3f9c8eea9d114b2ee1b04f704 WHIRLPOOL 302ad07d96b58b5730ef868079137e184de1428b650182dfb45847a9712023aaa6fa844b77b5cec0c1a8b796c55ffef9e4634a8be57cd1578427427d6b7cc6de -MISC metadata.xml 1147 SHA256 c4832ae64ab0915c65eadca15e4540680d109c21d572464f69e218d14fe6bd8b SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c WHIRLPOOL bf901ca7474f9b8358c458edad904f9c0c853187c6dc8ea0bc0c327bded60940c6f8b20f0231d78d86aa7dc5235b23d70c69f7153cca9e375fa271c7c93707b9 diff --git a/sys-apps/portage/files/2.3.5-loff_t.patch b/sys-apps/portage/files/2.3.5-loff_t.patch deleted file mode 100644 index 95a3b86..0000000 --- a/sys-apps/portage/files/2.3.5-loff_t.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 1a7aeb58c4e687e4d4012054b56373f27941a067 Mon Sep 17 00:00:00 2001 -From: Zac Medico <[email protected]> -Date: Sun, 7 May 2017 16:32:19 -0700 -Subject: [PATCH] file_copy: replace loff_t with off_t for portability (bug - 617778) - -The loff_t type is a GNU extension, so use the portable off_t -type instead. Also, enable Large File Support macros in setup.py, -for 64-bit offsets. - -Reported-by: Patrick Steinhardt <[email protected]> -X-Gentoo-bug: 617778 -X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=617778 -Acked-by: Anthony G. Basile <[email protected]> -Acked-by: Brian Dolbec <[email protected]> ---- - setup.py | 5 ++++- - src/portage_util_file_copy_reflink_linux.c | 6 +++--- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index e993177..1ba6f87 100755 ---- a/setup.py -+++ b/setup.py -@@ -676,7 +676,10 @@ setup( - ['$sysconfdir/portage/repo.postsync.d', ['cnf/repo.postsync.d/example']], - ], - -- ext_modules = [Extension(name=n, sources=m) for n, m in x_c_helpers.items()], -+ ext_modules = [Extension(name=n, sources=m, -+ extra_compile_args=['-D_FILE_OFFSET_BITS=64', -+ '-D_LARGEFILE_SOURCE', '-D_LARGEFILE64_SOURCE']) -+ for n, m in x_c_helpers.items()], - - cmdclass = { - 'build': x_build, -diff --git a/src/portage_util_file_copy_reflink_linux.c b/src/portage_util_file_copy_reflink_linux.c -index b031d96..2fb17a0 100644 ---- a/src/portage_util_file_copy_reflink_linux.c -+++ b/src/portage_util_file_copy_reflink_linux.c -@@ -66,7 +66,7 @@ initreflink_linux(void) - * (errno is set appropriately). - */ - static ssize_t --cfr_wrapper(int fd_out, int fd_in, loff_t *off_out, size_t len) -+cfr_wrapper(int fd_out, int fd_in, off_t *off_out, size_t len) - { - #ifdef __NR_copy_file_range - return syscall(__NR_copy_file_range, fd_in, NULL, fd_out, -@@ -96,7 +96,7 @@ cfr_wrapper(int fd_out, int fd_in, loff_t *off_out, size_t len) - * reaches EOF. - */ - static off_t --do_lseek_data(int fd_out, int fd_in, loff_t *off_out) { -+do_lseek_data(int fd_out, int fd_in, off_t *off_out) { - #ifdef SEEK_DATA - /* Use lseek SEEK_DATA/SEEK_HOLE for sparse file support, - * as suggested in the copy_file_range man page. -@@ -189,7 +189,7 @@ _reflink_linux_file_copy(PyObject *self, PyObject *args) - ssize_t buf_bytes, buf_offset, copyfunc_ret; - struct stat stat_in, stat_out; - char* buf; -- ssize_t (*copyfunc)(int, int, loff_t *, size_t); -+ ssize_t (*copyfunc)(int, int, off_t *, size_t); - - if (!PyArg_ParseTuple(args, "ii", &fd_in, &fd_out)) - return NULL; --- -2.10.2 - diff --git a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE deleted file mode 100644 index 70c494e..0000000 --- a/sys-apps/portage/files/README.RESCUE +++ /dev/null @@ -1,2 +0,0 @@ -Please see http://www.gentoo.org/proj/en/portage/doc/manually-fixing-portage.xml -for a recovery guide for a broken portage installation. diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml deleted file mode 100644 index c662419..0000000 --- a/sys-apps/portage/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <upstream> - <bugs-to>mailto:[email protected]</bugs-to> - <changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog> - <doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc> - </upstream> - <maintainer type="project"> - <email>[email protected]</email> - </maintainer> - <use> - <flag name="epydoc">Build html API documentation with epydoc.</flag> - <flag name="ipc">Use inter-process communication between portage and - running ebuilds. - </flag> - <flag name="native-extensions"> - Compiles native "C" extensions (speedups, instead of using python - backup code). Currently includes libc-locales. - This should only be temporarily disabled for some bootstrapping - operations. Cross-compilation is not supported. - </flag> - <flag name="xattr">Preserve extended attributes (filesystem-stored metadata) - when installing files. Usually only required for hardened systems. - </flag> - </use> -</pkgmetadata> diff --git a/sys-apps/portage/portage-2.3.5.ebuild b/sys-apps/portage/portage-2.3.5.ebuild deleted file mode 100644 index a912c81..0000000 --- a/sys-apps/portage/portage-2.3.5.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( - pypy - python3_3 python3_4 python3_5 python3_6 - python2_7 -) -PYTHON_REQ_USE='bzip2(+),threads(+)' - -inherit distutils-r1 multilib - -DESCRIPTION="Portage is the package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"; - -LICENSE="GPL-2" -KEYWORDS="amd64 arm ~mips ppc x86" -SLOT="0" -IUSE="build doc epydoc +ipc linguas_ru +native-extensions 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). -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 - ) - 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 ) - >=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) - ) ) - !<app-admin/logrotate-3.8.0" -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - userland_GNU? ( >=sys-apps/coreutils-6.4 ) - )" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync - -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" - -SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"; - -PATCHES=( "${FILESDIR}"/${PV}-loff_t.patch ) - -prefix_src_archives() { - local x y - for x in ${@}; do - for y in ${SRC_ARCHIVES}; do - echo ${y}/${x} - done - done -} - -TARBALL_PV=${PV} -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" - -pkg_setup() { - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) -} - -python_prepare_all() { - distutils-r1_python_prepare_all - - 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 pym/_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 [[ -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 pym/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|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - - 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 ) - use epydoc && targets+=( install_epydoc ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - # 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 - - if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ - has_version "<${CATEGORY}/${PN}-2.3.3"; then - SYNC_DEPTH_UPGRADE=true - else - SYNC_DEPTH_UPGRADE=false - fi -} - -get_ownership() { - case ${USERLAND} in - BSD) - stat -f '%Su:%Sg' "${1}" - ;; - *) - stat -c '%U:%G' "${1}" - ;; - esac -} - -new_config_protect() { - # Generate a ._cfg file even if the target file - # does not exist, ensuring that the user will - # notice the config change. - local basename=${1##*/} - local dirname=${1%/*} - local i=0 - while true ; do - local filename=$( - echo -n "${dirname}/._cfg" - printf "%04d" ${i} - echo -n "_${basename}" - ) - [[ -e ${filename} ]] || break - (( i++ )) - done - echo "${filename}" -} - -pkg_postinst() { - if ${SYNC_DEPTH_UPGRADE}; then - ewarn "Please note that this release no longer respects sync-depth for" - ewarn "git repositories. There have been too many problems and" - ewarn "performance issues. See bugs 552814, 559008" - fi - einfo "" - einfo "This release of portage NO LONGER contains the repoman code base." - einfo "Repoman has its own ebuild and release package." - einfo "For repoman functionality please emerge app-portage/repoman" - einfo "Please report any bugs you may encounter." - einfo "" -}
