commit: 1b238be7fbba7bbcd603127374ae40ee05dd5391 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Fri Dec 2 00:22:01 2016 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Fri Dec 2 00:22:01 2016 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1b238be7
Merge remote-tracking branch 'origin/master' into catalyst3 ...18.9.config => admincd-4.4.8-r1-selinux.config} | 822 +++++++++++++++------ ...mincd-3.18.9.config => admincd-4.4.8-r1.config} | 813 ++++++++++++++------ ...allcd-3.18.12.config => installcd-4.4.6.config} | 686 +++++++++++++---- .../weekly/portage/stages/package.keywords/openssh | 2 - releases/weekly/specs/alpha/installcd-stage1.spec | 3 - .../amd64/hardened/admincd-stage1-selinux.spec | 3 - .../specs/amd64/hardened/admincd-stage1.spec | 3 - .../amd64/hardened/admincd-stage2-selinux.spec | 2 +- .../specs/amd64/hardened/admincd-stage2.spec | 2 +- releases/weekly/specs/amd64/installcd-stage1.spec | 3 +- .../specs/amd64/installcd-stage2-minimal.spec | 2 +- releases/weekly/specs/amd64/livecd-stage1.spec | 2 - releases/weekly/specs/amd64/livedvd-stage1.spec | 1 - releases/weekly/specs/hppa/installcd-stage1.spec | 1 - releases/weekly/specs/ia64/installcd-stage1.spec | 3 - .../weekly/specs/ppc/ppc64/installcd-stage1.spec | 2 - .../specs/sparc/sparc64/installcd-stage1.spec | 3 - .../weekly/specs/x86/hardened/admincd-stage1.spec | 3 - .../specs/x86/hardened/installcd-stage1.spec | 2 - releases/weekly/specs/x86/i686/livecd-stage1.spec | 2 - releases/weekly/specs/x86/i686/livedvd-stage1.spec | 1 - releases/weekly/specs/x86/installcd-stage1.spec | 3 +- .../portage.amd64.hardened/package.accept_keywords | 2 +- .../portage.amd64.vanilla/package.accept_keywords | 1 + .../package.accept_keywords | 2 +- .../portage.armv7a.vanilla/package.accept_keywords | 1 + .../portage.i686.vanilla/package.accept_keywords | 1 + .../package.accept_keywords | 1 + .../package.accept_keywords | 1 + .../portage.ppc.vanilla/package.accept_keywords | 1 + .../portage.amd64.hardened/env/net-misc_iputils_0 | 1 + .../portage.amd64.hardened/package.accept_keywords | 1 - tools-uclibc/portage.amd64.hardened/package.env | 1 + .../portage.amd64.hardened/package.use/uclibc | 1 - .../portage.amd64.hardened/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/uclibc-ng} | 43 +- .../portage.amd64.vanilla/env/net-misc_iputils_0 | 1 + tools-uclibc/portage.amd64.vanilla/package.env | 1 + .../portage.amd64.vanilla/package.use/uclibc | 1 - .../portage.amd64.vanilla/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/uclibc-ng} | 43 +- .../env/{perl.conf => dev-lang_perl_0} | 0 .../portage.armv7a.hardened/env/net-misc_iputils_0 | 1 + .../package.accept_keywords | 1 - tools-uclibc/portage.armv7a.hardened/package.env | 3 +- .../portage.armv7a.hardened/package.use/uclibc | 1 - .../portage.armv7a.hardened/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/{uclibc => uclibc-ng} | 47 +- .../env/{perl.conf => dev-lang_perl_0} | 0 .../portage.armv7a.vanilla/env/net-misc_iputils_0 | 1 + tools-uclibc/portage.armv7a.vanilla/package.env | 3 +- .../portage.armv7a.vanilla/package.use/uclibc | 1 - .../portage.armv7a.vanilla/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/{uclibc => uclibc-ng} | 49 +- .../env/{perl.conf => dev-lang_perl_0} | 0 .../portage.i686.hardened/env/net-misc_iputils_0 | 1 + .../portage.i686.hardened/package.accept_keywords | 1 - tools-uclibc/portage.i686.hardened/package.env | 3 +- .../portage.i686.hardened/package.use/uclibc | 1 - .../portage.i686.hardened/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/uclibc | 271 ------- .../savedconfig/sys-libs/uclibc-ng} | 56 +- .../portage.i686.vanilla/env/net-misc_iputils_0 | 1 + tools-uclibc/portage.i686.vanilla/package.env | 1 + .../portage.i686.vanilla/package.use/uclibc | 1 - .../portage.i686.vanilla/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/uclibc | 271 ------- .../savedconfig/sys-libs/uclibc-ng} | 56 +- .../env/net-misc_iputils_0 | 1 + tools-uclibc/portage.mips32r2.hardened/package.env | 1 + .../portage.mips32r2.hardened/package.use/uclibc | 1 - .../package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/{uclibc => uclibc-ng} | 53 +- .../env/net-misc_iputils_0 | 1 + tools-uclibc/portage.mips32r2.vanilla/package.env | 1 + .../portage.mips32r2.vanilla/package.use/uclibc | 1 - .../portage.mips32r2.vanilla/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/{uclibc => uclibc-ng} | 53 +- .../env/net-misc_iputils_0 | 1 + tools-uclibc/portage.mipsel3.hardened/package.env | 1 + .../portage.mipsel3.hardened/package.use/uclibc | 1 - .../portage.mipsel3.hardened/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/{uclibc => uclibc-ng} | 52 +- .../portage.mipsel3.vanilla/env/net-misc_iputils_0 | 1 + tools-uclibc/portage.mipsel3.vanilla/package.env | 1 + .../portage.mipsel3.vanilla/package.use/uclibc | 1 - .../portage.mipsel3.vanilla/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/{uclibc => uclibc-ng} | 52 +- .../portage.ppc.hardened/env/net-misc_iputils_0 | 1 + .../portage.ppc.hardened/package.accept_keywords | 1 - tools-uclibc/portage.ppc.hardened/package.env | 1 + .../portage.ppc.hardened/package.use/uclibc | 1 - .../portage.ppc.hardened/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/uclibc-ng} | 54 +- .../portage.ppc.vanilla/env/net-misc_iputils_0 | 1 + tools-uclibc/portage.ppc.vanilla/package.env | 1 + .../portage.ppc.vanilla/package.use/uclibc | 1 - .../portage.ppc.vanilla/package.use/uclibc-ng | 1 + .../savedconfig/sys-libs/uclibc-ng} | 54 +- 99 files changed, 2104 insertions(+), 1482 deletions(-)