diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2017-08-13 19:02:17 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2017-08-13 19:07:15 -0400 |
| commit | 3a1a0a2241cc8e2874ff3d85333136fc491b06ec (patch) | |
| tree | 76d55b8ed1b86a80ec0fdb59fc75975bb9c15e74 /sys-apps/systemd | |
| parent | sys-kernel/vanilla-sources: Version bumps. Remove old. (diff) | |
| download | gentoo-3a1a0a2241cc8e2874ff3d85333136fc491b06ec.tar.gz gentoo-3a1a0a2241cc8e2874ff3d85333136fc491b06ec.tar.bz2 gentoo-3a1a0a2241cc8e2874ff3d85333136fc491b06ec.zip | |
sys-apps/systemd: replace uucp sed with a patch
Bug: https://bugs.gentoo.org/625720
Package-Manager: Portage-2.3.6_p34, Repoman-2.3.3_p12
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/files/234-uucp-group.patch | 11 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-234-r2.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/sys-apps/systemd/files/234-uucp-group.patch b/sys-apps/systemd/files/234-uucp-group.patch new file mode 100644 index 000000000000..89cf552c8295 --- /dev/null +++ b/sys-apps/systemd/files/234-uucp-group.patch @@ -0,0 +1,11 @@ +--- a/rules/50-udev-default.rules.in ++++ b/rules/50-udev-default.rules.in +@@ -22,7 +22,7 @@ + SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" +-KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" ++KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp" + + SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" + diff --git a/sys-apps/systemd/systemd-234-r2.ebuild b/sys-apps/systemd/systemd-234-r2.ebuild index 9d10c9d3fe47..dceb9eda7110 100644 --- a/sys-apps/systemd/systemd-234-r2.ebuild +++ b/sys-apps/systemd/systemd-234-r2.ebuild @@ -147,9 +147,6 @@ src_unpack() { } src_prepare() { - # Bug 463376 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - local PATCHES=( "${FILESDIR}"/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch ) @@ -159,6 +156,7 @@ src_prepare() { "${FILESDIR}/218-Dont-enable-audit-by-default.patch" "${FILESDIR}/228-noclean-tmp.patch" "${FILESDIR}/233-systemd-user-pam.patch" + "${FILESDIR}/234-uucp-group.patch" ) fi diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 78c85bbcdd16..835ac073e82f 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -147,9 +147,6 @@ src_unpack() { } src_prepare() { - # Bug 463376 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - local PATCHES=( ) @@ -158,6 +155,7 @@ src_prepare() { "${FILESDIR}/218-Dont-enable-audit-by-default.patch" "${FILESDIR}/228-noclean-tmp.patch" "${FILESDIR}/233-systemd-user-pam.patch" + "${FILESDIR}/234-uucp-group.patch" ) fi |