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 1CFBC138359 for ; Sun, 8 Nov 2020 17:51:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CBC2E076B; Sun, 8 Nov 2020 17:51:29 +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 5C4C5E076B for ; Sun, 8 Nov 2020 17:51:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CCB35335D08 for ; Sun, 8 Nov 2020 17:51:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B4923AB for ; Sun, 8 Nov 2020 17:51:25 +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: <1604857850.e25dac18a28a39570cbd3bc258be1b573c8fa9dc.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/Manifest sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch sys-apps/systemd/systemd-247_rc1.ebuild sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/files/ sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e25dac18a28a39570cbd3bc258be1b573c8fa9dc X-VCS-Branch: master Date: Sun, 8 Nov 2020 17:51:25 +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: 3f1f45a4-a419-4a8d-b4d2-deaabba96989 X-Archives-Hash: 6383d2d1a0af5707d1b242a1f1ec2c55 commit: e25dac18a28a39570cbd3bc258be1b573c8fa9dc Author: Mike Gilbert gentoo org> AuthorDate: Sun Nov 8 17:50:35 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Nov 8 17:50:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25dac18 sys-apps/systemd: bump to 247-rc1 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/systemd/Manifest | 1 + .../gentoo-systemctl-disable-sysv-sync-r1.patch | 25 ++++++++++++++++++++++ ...{systemd-9999.ebuild => systemd-247_rc1.ebuild} | 2 +- sys-apps/systemd/systemd-9999.ebuild | 2 +- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 470a6c699a3..530182fc3ff 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,2 +1,3 @@ DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f +DIST systemd-247-rc1.tar.gz 9838448 BLAKE2B 99eeafb9ef35d7786f39e8089820ea7b838e06b7ad74271a193c27e716275cb96e0cfe213fa546abc304978fdf95be37e23f31c2059aa6aff28739979a1a036d SHA512 5c04b013ceebbf466c917d093189a60a2a77c57a844eed840c911669855d4d9d783dcaec1ba6b488c5e96e7f9a9f3d4e39cff240c46c013ec2fcce5a5b7c4aee DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9 diff --git a/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch new file mode 100644 index 00000000000..a9d40be4ab7 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch @@ -0,0 +1,25 @@ +From d9059d2ef1b0d6034267cc8ff44871d0f82f840f Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 8 Nov 2020 12:34:11 -0500 +Subject: [PATCH] systemctl: disable synchronizaion of sysv init scripts + +--- + src/systemctl/systemctl-sysv-compat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/systemctl/systemctl-sysv-compat.c b/src/systemctl/systemctl-sysv-compat.c +index 2dca9e480f..5dcf13ba17 100644 +--- a/src/systemctl/systemctl-sysv-compat.c ++++ b/src/systemctl/systemctl-sysv-compat.c +@@ -111,7 +111,7 @@ int parse_shutdown_time_spec(const char *t, usec_t *ret) { + int enable_sysv_units(const char *verb, char **args) { + int r = 0; + +-#if HAVE_SYSV_COMPAT ++#if 0 + _cleanup_(lookup_paths_free) LookupPaths paths = {}; + unsigned f = 0; + +-- +2.29.0 + diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-247_rc1.ebuild similarity index 99% copy from sys-apps/systemd/systemd-9999.ebuild copy to sys-apps/systemd/systemd-247_rc1.ebuild index 4c0c3699148..016f308320d 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-247_rc1.ebuild @@ -208,7 +208,7 @@ src_prepare() { if ! use vanilla; then PATCHES+=( "${FILESDIR}/gentoo-generator-path-r2.patch" - "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" "${FILESDIR}/gentoo-journald-audit.patch" "${FILESDIR}/gentoo-pam.patch" ) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 4c0c3699148..016f308320d 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -208,7 +208,7 @@ src_prepare() { if ! use vanilla; then PATCHES+=( "${FILESDIR}/gentoo-generator-path-r2.patch" - "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" "${FILESDIR}/gentoo-journald-audit.patch" "${FILESDIR}/gentoo-pam.patch" )