| 1 |
commit: 3a1a0a2241cc8e2874ff3d85333136fc491b06ec |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 13 23:02:17 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 13 23:07:15 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1a0a22 |
| 7 |
|
| 8 |
sys-apps/systemd: replace uucp sed with a patch |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/625720 |
| 11 |
Package-Manager: Portage-2.3.6_p34, Repoman-2.3.3_p12 |
| 12 |
|
| 13 |
sys-apps/systemd/files/234-uucp-group.patch | 11 +++++++++++ |
| 14 |
sys-apps/systemd/systemd-234-r2.ebuild | 4 +--- |
| 15 |
sys-apps/systemd/systemd-9999.ebuild | 4 +--- |
| 16 |
3 files changed, 13 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/systemd/files/234-uucp-group.patch b/sys-apps/systemd/files/234-uucp-group.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..89cf552c829 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-apps/systemd/files/234-uucp-group.patch |
| 23 |
@@ -0,0 +1,11 @@ |
| 24 |
+--- a/rules/50-udev-default.rules.in |
| 25 |
++++ b/rules/50-udev-default.rules.in |
| 26 |
+@@ -22,7 +22,7 @@ |
| 27 |
+ SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" |
| 28 |
+ SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" |
| 29 |
+ SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" |
| 30 |
+-KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" |
| 31 |
++KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp" |
| 32 |
+ |
| 33 |
+ SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" |
| 34 |
+ |
| 35 |
|
| 36 |
diff --git a/sys-apps/systemd/systemd-234-r2.ebuild b/sys-apps/systemd/systemd-234-r2.ebuild |
| 37 |
index 9d10c9d3fe4..dceb9eda711 100644 |
| 38 |
--- a/sys-apps/systemd/systemd-234-r2.ebuild |
| 39 |
+++ b/sys-apps/systemd/systemd-234-r2.ebuild |
| 40 |
@@ -147,9 +147,6 @@ src_unpack() { |
| 41 |
} |
| 42 |
|
| 43 |
src_prepare() { |
| 44 |
- # Bug 463376 |
| 45 |
- sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die |
| 46 |
- |
| 47 |
local PATCHES=( |
| 48 |
"${FILESDIR}"/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch |
| 49 |
) |
| 50 |
@@ -159,6 +156,7 @@ src_prepare() { |
| 51 |
"${FILESDIR}/218-Dont-enable-audit-by-default.patch" |
| 52 |
"${FILESDIR}/228-noclean-tmp.patch" |
| 53 |
"${FILESDIR}/233-systemd-user-pam.patch" |
| 54 |
+ "${FILESDIR}/234-uucp-group.patch" |
| 55 |
) |
| 56 |
fi |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 60 |
index 78c85bbcdd1..835ac073e82 100644 |
| 61 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 62 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 63 |
@@ -147,9 +147,6 @@ src_unpack() { |
| 64 |
} |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
- # Bug 463376 |
| 68 |
- sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die |
| 69 |
- |
| 70 |
local PATCHES=( |
| 71 |
) |
| 72 |
|
| 73 |
@@ -158,6 +155,7 @@ src_prepare() { |
| 74 |
"${FILESDIR}/218-Dont-enable-audit-by-default.patch" |
| 75 |
"${FILESDIR}/228-noclean-tmp.patch" |
| 76 |
"${FILESDIR}/233-systemd-user-pam.patch" |
| 77 |
+ "${FILESDIR}/234-uucp-group.patch" |
| 78 |
) |
| 79 |
fi |
Archives