commit: 3a1a0a2241cc8e2874ff3d85333136fc491b06ec Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Aug 13 23:02:17 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Aug 13 23:07:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1a0a22
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 sys-apps/systemd/files/234-uucp-group.patch | 11 +++++++++++ sys-apps/systemd/systemd-234-r2.ebuild | 4 +--- 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 00000000000..89cf552c829 --- /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 9d10c9d3fe4..dceb9eda711 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 78c85bbcdd1..835ac073e82 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
