| 1 |
commit: cc7faaaefdb480c904faa827ee2917a3e3472c4e |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 13 23:07:04 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 13 23:07:59 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7faaae |
| 7 |
|
| 8 |
sys-fs/udev: 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-fs/udev/files/234-uucp-group.patch | 11 +++++++++++ |
| 14 |
sys-fs/udev/{udev-234.ebuild => udev-234-r1.ebuild} | 19 ++++--------------- |
| 15 |
sys-fs/udev/udev-9999.ebuild | 21 +++++---------------- |
| 16 |
3 files changed, 20 insertions(+), 31 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-fs/udev/files/234-uucp-group.patch b/sys-fs/udev/files/234-uucp-group.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..89cf552c829 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-fs/udev/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-fs/udev/udev-234.ebuild b/sys-fs/udev/udev-234-r1.ebuild |
| 37 |
similarity index 95% |
| 38 |
rename from sys-fs/udev/udev-234.ebuild |
| 39 |
rename to sys-fs/udev/udev-234-r1.ebuild |
| 40 |
index e8469928824..03c1796fcac 100644 |
| 41 |
--- a/sys-fs/udev/udev-234.ebuild |
| 42 |
+++ b/sys-fs/udev/udev-234-r1.ebuild |
| 43 |
@@ -9,13 +9,7 @@ if [[ ${PV} = 9999* ]]; then |
| 44 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
| 45 |
inherit git-r3 |
| 46 |
else |
| 47 |
- patchset= |
| 48 |
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" |
| 49 |
- if [[ -n "${patchset}" ]]; then |
| 50 |
- SRC_URI+=" |
| 51 |
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz |
| 52 |
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz" |
| 53 |
- fi |
| 54 |
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" |
| 55 |
fi |
| 56 |
|
| 57 |
@@ -92,22 +86,17 @@ src_prepare() { |
| 58 |
fi |
| 59 |
fi |
| 60 |
|
| 61 |
- # backport some patches |
| 62 |
- if [[ -n "${patchset}" ]]; then |
| 63 |
- eapply "${WORKDIR}"/patch |
| 64 |
- fi |
| 65 |
- |
| 66 |
cat <<-EOF > "${T}"/40-gentoo.rules |
| 67 |
# Gentoo specific floppy and usb groups |
| 68 |
ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" |
| 69 |
ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" |
| 70 |
EOF |
| 71 |
|
| 72 |
- # change rules back to group uucp instead of dialout for now wrt #454556 |
| 73 |
- sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die |
| 74 |
+ local PATCHES=( |
| 75 |
+ "${FILESDIR}/234-uucp-group.patch" |
| 76 |
+ ) |
| 77 |
|
| 78 |
- # apply user patches |
| 79 |
- eapply_user |
| 80 |
+ default |
| 81 |
|
| 82 |
if ! use elibc_glibc; then #443030 |
| 83 |
echo '#define secure_getenv(x) NULL' >> config.h.in |
| 84 |
|
| 85 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild |
| 86 |
index b7834ccec24..03c1796fcac 100644 |
| 87 |
--- a/sys-fs/udev/udev-9999.ebuild |
| 88 |
+++ b/sys-fs/udev/udev-9999.ebuild |
| 89 |
@@ -9,14 +9,8 @@ if [[ ${PV} = 9999* ]]; then |
| 90 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
| 91 |
inherit git-r3 |
| 92 |
else |
| 93 |
- patchset= |
| 94 |
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" |
| 95 |
- if [[ -n "${patchset}" ]]; then |
| 96 |
- SRC_URI+=" |
| 97 |
- https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz |
| 98 |
- https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz" |
| 99 |
- fi |
| 100 |
- KEYWORDS="~amd64 ~x86" |
| 101 |
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" |
| 102 |
fi |
| 103 |
|
| 104 |
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" |
| 105 |
@@ -92,22 +86,17 @@ src_prepare() { |
| 106 |
fi |
| 107 |
fi |
| 108 |
|
| 109 |
- # backport some patches |
| 110 |
- if [[ -n "${patchset}" ]]; then |
| 111 |
- eapply "${WORKDIR}"/patch |
| 112 |
- fi |
| 113 |
- |
| 114 |
cat <<-EOF > "${T}"/40-gentoo.rules |
| 115 |
# Gentoo specific floppy and usb groups |
| 116 |
ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" |
| 117 |
ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" |
| 118 |
EOF |
| 119 |
|
| 120 |
- # change rules back to group uucp instead of dialout for now wrt #454556 |
| 121 |
- sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die |
| 122 |
+ local PATCHES=( |
| 123 |
+ "${FILESDIR}/234-uucp-group.patch" |
| 124 |
+ ) |
| 125 |
|
| 126 |
- # apply user patches |
| 127 |
- eapply_user |
| 128 |
+ default |
| 129 |
|
| 130 |
if ! use elibc_glibc; then #443030 |
| 131 |
echo '#define secure_getenv(x) NULL' >> config.h.in |
Archives