From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E979138334 for ; Wed, 31 Jul 2019 14:06:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 500D9E0837; Wed, 31 Jul 2019 14:06:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22B43E0837 for ; Wed, 31 Jul 2019 14:06:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A712349081 for ; Wed, 31 Jul 2019 14:06:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C65D0741 for ; Wed, 31 Jul 2019 14:06:51 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1564582008.bcd58187d0fe53114f2968d7f345bd48f50b89df.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/Manifest sys-apps/systemd/files/243-rc1-analyze.patch sys-apps/systemd/systemd-243_rc1.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: bcd58187d0fe53114f2968d7f345bd48f50b89df X-VCS-Branch: master Date: Wed, 31 Jul 2019 14:06:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 82951518-a654-4705-b0b7-8057b75ec684 X-Archives-Hash: 787c1832db2622e2738b1b8cc318b45b commit: bcd58187d0fe53114f2968d7f345bd48f50b89df Author: Mike Gilbert gentoo org> AuthorDate: Wed Jul 31 14:06:37 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Jul 31 14:06:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd58187 sys-apps/systemd: bump to 243-rc1 Package-Manager: Portage-2.3.69_p8_p111567, Repoman-2.3.16_p17_p111567 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/systemd/Manifest | 1 + sys-apps/systemd/files/243-rc1-analyze.patch | 125 +++++++ sys-apps/systemd/systemd-243_rc1.ebuild | 472 +++++++++++++++++++++++++++ 3 files changed, 598 insertions(+) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 88ceb157a23..da67bf86c71 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1 +1,2 @@ DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4 +DIST systemd-243-rc1.tar.gz 8209533 BLAKE2B 6f28d839563104b488bfe030483bf1b24c3d01cedb59ffa655f03a37d7c636c2daef34ca9d13b9fbe848b131d21920138583c63a049c1747f7e569c68384c0bf SHA512 6626d7fd5781578d01a30c0d2647a293668d0819f2f85ce78a6aaf62ae1aa4b2c687cf237ca833c5befbc00321a344ff5ca56747cedc6ce00cd0f51c71dd25ff diff --git a/sys-apps/systemd/files/243-rc1-analyze.patch b/sys-apps/systemd/files/243-rc1-analyze.patch new file mode 100644 index 00000000000..e38b51eb121 --- /dev/null +++ b/sys-apps/systemd/files/243-rc1-analyze.patch @@ -0,0 +1,125 @@ +From 417b82e1c341946d277383471f2972b7227061ff Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Tue, 30 Jul 2019 14:51:38 -0400 +Subject: [PATCH] analyze: declare dump_exit_status outside of HAVE_SECCOMP + block + +Fixes: 76ed04d936f757763c32db5dbaaebd8b13785d7b +Closes: https://github.com/systemd/systemd/issues/13230 +--- + src/analyze/analyze.c | 92 +++++++++++++++++++++---------------------- + 1 file changed, 46 insertions(+), 46 deletions(-) + +diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c +index f62879371d..4d81026084 100644 +--- a/src/analyze/analyze.c ++++ b/src/analyze/analyze.c +@@ -1608,6 +1608,52 @@ static int dump_unit_paths(int argc, char *argv[], void *userdata) { + return 0; + } + ++static int dump_exit_status(int argc, char *argv[], void *userdata) { ++ _cleanup_(table_unrefp) Table *table = NULL; ++ int r; ++ ++ table = table_new("name", "status", "class"); ++ if (!table) ++ return log_oom(); ++ ++ r = table_set_align_percent(table, table_get_cell(table, 0, 1), 100); ++ if (r < 0) ++ return log_error_errno(r, "Failed to right-align status: %m"); ++ ++ if (strv_isempty(strv_skip(argv, 1))) ++ for (size_t i = 0; i < ELEMENTSOF(exit_status_mappings); i++) { ++ if (!exit_status_mappings[i].name) ++ continue; ++ ++ r = table_add_many(table, ++ TABLE_STRING, exit_status_mappings[i].name, ++ TABLE_INT, (int) i, ++ TABLE_STRING, exit_status_class(i)); ++ if (r < 0) ++ return r; ++ } ++ else ++ for (int i = 1; i < argc; i++) { ++ int status; ++ ++ status = exit_status_from_string(argv[i]); ++ if (status < 0) ++ return log_error_errno(r, "Invalid exit status \"%s\": %m", argv[i]); ++ ++ assert(status >= 0 && (size_t) status < ELEMENTSOF(exit_status_mappings)); ++ r = table_add_many(table, ++ TABLE_STRING, exit_status_mappings[status].name ?: "-", ++ TABLE_INT, status, ++ TABLE_STRING, exit_status_class(status) ?: "-"); ++ if (r < 0) ++ return r; ++ } ++ ++ (void) pager_open(arg_pager_flags); ++ ++ return table_print(table, NULL); ++} ++ + #if HAVE_SECCOMP + + static int load_kernel_syscalls(Set **ret) { +@@ -1685,52 +1731,6 @@ static void dump_syscall_filter(const SyscallFilterSet *set) { + printf(" %s%s%s\n", syscall[0] == '@' ? ansi_underline() : "", syscall, ansi_normal()); + } + +-static int dump_exit_status(int argc, char *argv[], void *userdata) { +- _cleanup_(table_unrefp) Table *table = NULL; +- int r; +- +- table = table_new("name", "status", "class"); +- if (!table) +- return log_oom(); +- +- r = table_set_align_percent(table, table_get_cell(table, 0, 1), 100); +- if (r < 0) +- return log_error_errno(r, "Failed to right-align status: %m"); +- +- if (strv_isempty(strv_skip(argv, 1))) +- for (size_t i = 0; i < ELEMENTSOF(exit_status_mappings); i++) { +- if (!exit_status_mappings[i].name) +- continue; +- +- r = table_add_many(table, +- TABLE_STRING, exit_status_mappings[i].name, +- TABLE_INT, (int) i, +- TABLE_STRING, exit_status_class(i)); +- if (r < 0) +- return r; +- } +- else +- for (int i = 1; i < argc; i++) { +- int status; +- +- status = exit_status_from_string(argv[i]); +- if (status < 0) +- return log_error_errno(r, "Invalid exit status \"%s\": %m", argv[i]); +- +- assert(status >= 0 && (size_t) status < ELEMENTSOF(exit_status_mappings)); +- r = table_add_many(table, +- TABLE_STRING, exit_status_mappings[status].name ?: "-", +- TABLE_INT, status, +- TABLE_STRING, exit_status_class(status) ?: "-"); +- if (r < 0) +- return r; +- } +- +- (void) pager_open(arg_pager_flags); +- +- return table_print(table, NULL); +-} +- + static int dump_syscall_filters(int argc, char *argv[], void *userdata) { + bool first = true; + +-- +2.22.0 + diff --git a/sys-apps/systemd/systemd-243_rc1.ebuild b/sys-apps/systemd/systemd-243_rc1.ebuild new file mode 100644 index 00000000000..529c0bffc49 --- /dev/null +++ b/sys-apps/systemd/systemd-243_rc1.ebuild @@ -0,0 +1,472 @@ +# 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 + +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 dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +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= ) + dns-over-tls? ( >=net-libs/gnutls-3.5.3: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=[epoll(+)] + >=net-libs/gnutls-3.1.4:0= + ) + idn? ( net-dns/libidn2:= ) + 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= )" + +# Newer linux-headers needed by ia64, bug #480218 +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-${MINKV} + gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) +" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + acct-group/adm + acct-group/wheel + acct-group/kmem + acct-group/tty + acct-group/utmp + acct-group/audio + acct-group/cdrom + acct-group/dialout + acct-group/disk + acct-group/input + acct-group/kvm + acct-group/render + acct-group/tape + acct-group/video + acct-group/systemd-journal + acct-user/systemd-journal-remote + acct-user/systemd-coredump + acct-user/systemd-network + acct-user/systemd-resolve + acct-user/systemd-timesync + >=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 +} + +save_enabled_units() { + ENABLED_UNITS=() + type systemctl &>/dev/null || return + for x; do + if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then + ENABLED_UNITS+=( "${x}" ) + fi + done +} + +pkg_preinst() { + save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service +} + +pkg_postinst() { + 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 [[ ${ENABLED_UNITS[@]} ]]; then + systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" + fi + + if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then + rm "${EROOT}/var/lib/systemd/timesync" + fi + + 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 +}