| 1 |
commit: e76306daa732a15bf0549b8ddae4038b7d0a824e |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 11 23:28:42 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 11 23:28:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76306da |
| 7 |
|
| 8 |
sys-apps/systemd: bump to 243 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.75_p7, Repoman-2.3.17_p49 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/systemd/Manifest | 2 +- |
| 14 |
sys-apps/systemd/{systemd-243_rc2-r1.ebuild => systemd-243.ebuild} | 6 +----- |
| 15 |
sys-apps/systemd/systemd-9999.ebuild | 5 +---- |
| 16 |
3 files changed, 3 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest |
| 19 |
index 097fdeb5e7f..875ca45a4ae 100644 |
| 20 |
--- a/sys-apps/systemd/Manifest |
| 21 |
+++ b/sys-apps/systemd/Manifest |
| 22 |
@@ -1,2 +1,2 @@ |
| 23 |
DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4 |
| 24 |
-DIST systemd-243-rc2.tar.gz 8239802 BLAKE2B 9ab6a12f6dff855265be381616601fb2caf79be810bba7f5c24fa6e91ae34d8d1ead0ae1b45c374e8c9752b883daba01863e5622ef1d34718e8390c0ad837cf0 SHA512 7e9b996c1eeb299fb971f2fd4a39fa62c7cc9178bacaaae6c168008dec438f392b949deb72d08f27060b3cde54b46b70f6a18b1bc70725a56ca2a28a1f96b6a1 |
| 25 |
+DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e |
| 26 |
|
| 27 |
diff --git a/sys-apps/systemd/systemd-243_rc2-r1.ebuild b/sys-apps/systemd/systemd-243.ebuild |
| 28 |
similarity index 98% |
| 29 |
rename from sys-apps/systemd/systemd-243_rc2-r1.ebuild |
| 30 |
rename to sys-apps/systemd/systemd-243.ebuild |
| 31 |
index 56cfe509a08..d38227b0738 100644 |
| 32 |
--- a/sys-apps/systemd/systemd-243_rc2-r1.ebuild |
| 33 |
+++ b/sys-apps/systemd/systemd-243.ebuild |
| 34 |
@@ -185,7 +185,6 @@ src_prepare() { |
| 35 |
|
| 36 |
# Add local patches here |
| 37 |
PATCHES+=( |
| 38 |
- "${FILESDIR}"/CVE-2019-15718.patch |
| 39 |
) |
| 40 |
|
| 41 |
if ! use vanilla; then |
| 42 |
@@ -355,10 +354,7 @@ multilib_src_install_all() { |
| 43 |
# Symlink /etc/sysctl.conf for easy migration. |
| 44 |
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf |
| 45 |
|
| 46 |
- local udevdir=/lib/udev |
| 47 |
- use split-usr || udevdir=/usr/lib/udev |
| 48 |
- |
| 49 |
- rm -r "${ED}${udevdir}/hwdb.d" || die |
| 50 |
+ rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die |
| 51 |
|
| 52 |
if use split-usr; then |
| 53 |
# Avoid breaking boot/reboot |
| 54 |
|
| 55 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 56 |
index f00c416fa38..d38227b0738 100644 |
| 57 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 58 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 59 |
@@ -354,10 +354,7 @@ multilib_src_install_all() { |
| 60 |
# Symlink /etc/sysctl.conf for easy migration. |
| 61 |
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf |
| 62 |
|
| 63 |
- local udevdir=/lib/udev |
| 64 |
- use split-usr || udevdir=/usr/lib/udev |
| 65 |
- |
| 66 |
- rm -r "${ED}${udevdir}/hwdb.d" || die |
| 67 |
+ rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die |
| 68 |
|
| 69 |
if use split-usr; then |
| 70 |
# Avoid breaking boot/reboot |
Archives