summaryrefslogtreecommitdiff
path: root/sys-fs/udev
diff options
context:
space:
mode:
Diffstat (limited to 'sys-fs/udev')
-rw-r--r--sys-fs/udev/Manifest5
-rw-r--r--sys-fs/udev/files/242-gcc-9.patch163
-rw-r--r--sys-fs/udev/udev-242.ebuild25
-rw-r--r--sys-fs/udev/udev-9999.ebuild20
4 files changed, 194 insertions, 19 deletions
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 8ca86f738cc8..e3a69c3fee15 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -3,6 +3,7 @@ AUX 239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch 1098 BLAKE2B
AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
AUX 239-stat-0.patch 3553 BLAKE2B 225dd5e8e001a10a33c7ecb5c1378589b3eeecbea4fc746f27cc72d8eb8787c6966b8787c5922f0d0cefa28ac966c7c4f65ed341335d4105bc109df14110604c SHA512 a982c6384fcad2a1ad709564e932231e837ef799b764bbfa73eff5c42635a4bdc0dcf36e72300482ed188b492da723d3cd7ae04dda9b2c16c70fd1871c556a46
AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b238d028227e19cb7ba4933a115e2e82652b3179462ed0d2115058bff5d8d0212f439a919857f083c318d SHA512 6aee279728d0e609956c825ced6d2c00d8f4905327492c0348ad6ee8e862287b101ec4e2f1daa19533cf51f2ba1a15f0ea2dd6ccde44a4ff1b0fb151ffc7381e
+AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf113889189d3a5da3e0eb287163449d023755269827e3b5dc8db758a51cd9f37c3f3a69510de31b43109 SHA512 57add7e3215f25ec5547a905c7257ca06adca30d2f4a031eee9882ac16586ea5c5c9d3b50206674dffdb182c78f048834b6c73ab1490253a1ddae15c35878554
DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
@@ -21,6 +22,6 @@ EBUILD udev-240-r3.ebuild 9664 BLAKE2B 2daaa3124df1ce0ea5b3247200a55020d75b92383
EBUILD udev-241.ebuild 9673 BLAKE2B 33c6d4cf7c1d58645481dcb957f1a3e28587911dc5a2ead16d1a91d2b0eca5ad0765203661a8088fac4699e501162759cc927f2692bfb170c98394b8e03e7978 SHA512 f1d6f1aa6d131605b6a63aea994bd7c7c2354714a41f0de85fe884389d0893d737ebbacea2a34d9a15f7173cf10f0d225125aacef33725684565044c6d1edcd8
EBUILD udev-241_rc1.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
EBUILD udev-241_rc2.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
-EBUILD udev-242.ebuild 9673 BLAKE2B 33c6d4cf7c1d58645481dcb957f1a3e28587911dc5a2ead16d1a91d2b0eca5ad0765203661a8088fac4699e501162759cc927f2692bfb170c98394b8e03e7978 SHA512 f1d6f1aa6d131605b6a63aea994bd7c7c2354714a41f0de85fe884389d0893d737ebbacea2a34d9a15f7173cf10f0d225125aacef33725684565044c6d1edcd8
-EBUILD udev-9999.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
+EBUILD udev-242.ebuild 9611 BLAKE2B 44037308847edaa3d7050392784e10e17dabb1b6d2b906b62ec815a6daf394b7d99d02b85ca8fe1c096ae1cd25bc53dae57738e1a16bb859bb72961d037efb67 SHA512 6f24c9c2b115ba77c09911080795b2d9c8e40f5a111ff5e91da58d125f3235cc66e9e885c5fe343990f2130de5fdf3a517ebf20090ecf94b978bc2aeb751d06a
+EBUILD udev-9999.ebuild 9591 BLAKE2B 72ccdcaf7791558859483b8d161908a040cae8284e01b3c3f333ce55715d5c61f4173a34fdbf3b910a8b258a5d6f4feff5880b3366853f5b2c39c3b3ed5eafbb SHA512 f8d7823de0ff335ea169c312a5e79111463005714858ccd248de73df76fce4dfab872b5387bef596f4113dfb4c3a97c0c4d14680c53fe194aaa37816fcab79bf
MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/files/242-gcc-9.patch b/sys-fs/udev/files/242-gcc-9.patch
new file mode 100644
index 000000000000..e9f690a65be5
--- /dev/null
+++ b/sys-fs/udev/files/242-gcc-9.patch
@@ -0,0 +1,163 @@
+From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 7 May 2019 13:46:55 +0200
+Subject: [PATCH] network: remove redunant link name in message
+
+Fixes #12454.
+
+gcc was complaining that the link->ifname argument is NULL. Adding
+assert(link->ifname) right before the call has no effect. It seems that
+gcc is confused by the fact that log_link_warning_errno() internally
+calls log_object(), with link->ifname passed as the object. log_object()
+is also a macro and is does a check whether the passed object is NULL.
+So we have a check if something is NULL right next an unconditional use
+of it where it cannot be NULL. I think it's a bug in gcc.
+
+Anyway, we don't need to use link->ifname here. log_object() already prepends
+the object name to the message.
+---
+ src/network/networkd-link.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
+index 533193ac932..6fc82940033 100644
+--- a/src/network/networkd-link.c
++++ b/src/network/networkd-link.c
+@@ -338,8 +338,7 @@ static int link_enable_ipv6(Link *link) {
+
+ r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled);
+ if (r < 0)
+- log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m",
+- enable_disable(!disabled), link->ifname);
++ log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled));
+ else
+ log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
+
+From bcb846f30f9ca8f42e79d109706aee9f2032261b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 22 May 2019 10:31:01 -0400
+Subject: [PATCH] shared/machine-image: avoid passing NULL to log_debug_errno
+
+Fixes: https://github.com/systemd/systemd/issues/12534
+---
+ src/shared/machine-image.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
+index 6b9d8fb97a6..6a6d952b424 100644
+--- a/src/shared/machine-image.c
++++ b/src/shared/machine-image.c
+@@ -201,11 +201,13 @@ static int image_make(
+ Image **ret) {
+
+ _cleanup_free_ char *pretty_buffer = NULL;
++ _cleanup_free_ char *cwd = NULL;
+ struct stat stbuf;
+ bool read_only;
+ int r;
+
+ assert(dfd >= 0 || dfd == AT_FDCWD);
++ assert(path || dfd == AT_FDCWD);
+ assert(filename);
+
+ /* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block
+@@ -221,6 +223,9 @@ static int image_make(
+ st = &stbuf;
+ }
+
++ if (!path)
++ safe_getcwd(&cwd);
++
+ read_only =
+ (path && path_startswith(path, "/usr")) ||
+ (faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS);
+@@ -359,7 +364,7 @@ static int image_make(
+
+ block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
+ if (block_fd < 0)
+- log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path, filename);
++ log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+ else {
+ /* Refresh stat data after opening the node */
+ if (fstat(block_fd, &stbuf) < 0)
+@@ -373,13 +378,13 @@ static int image_make(
+ int state = 0;
+
+ if (ioctl(block_fd, BLKROGET, &state) < 0)
+- log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path, filename);
++ log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+ else if (state)
+ read_only = true;
+ }
+
+ if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
+- log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path, filename);
++ log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+
+ block_fd = safe_close(block_fd);
+ }
+From 2570578d908a8e010828fa1f88826b1c45d534ff Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 24 May 2019 10:54:09 +0200
+Subject: [PATCH] machine-image: openat() doesn't operate on the cwd if the
+ first argument is specified
+
+A fix-up for bcb846f30f9ca8f42e79d109706aee9f2032261b.
+---
+ src/shared/machine-image.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
+index 6a6d952b424..55e5f08f91e 100644
+--- a/src/shared/machine-image.c
++++ b/src/shared/machine-image.c
+@@ -200,8 +200,7 @@ static int image_make(
+ const struct stat *st,
+ Image **ret) {
+
+- _cleanup_free_ char *pretty_buffer = NULL;
+- _cleanup_free_ char *cwd = NULL;
++ _cleanup_free_ char *pretty_buffer = NULL, *parent = NULL;
+ struct stat stbuf;
+ bool read_only;
+ int r;
+@@ -223,8 +222,12 @@ static int image_make(
+ st = &stbuf;
+ }
+
+- if (!path)
+- safe_getcwd(&cwd);
++ if (!path) {
++ if (dfd == AT_FDCWD)
++ (void) safe_getcwd(&parent);
++ else
++ (void) fd_get_path(dfd, &parent);
++ }
+
+ read_only =
+ (path && path_startswith(path, "/usr")) ||
+@@ -364,7 +367,7 @@ static int image_make(
+
+ block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
+ if (block_fd < 0)
+- log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++ log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+ else {
+ /* Refresh stat data after opening the node */
+ if (fstat(block_fd, &stbuf) < 0)
+@@ -378,13 +381,13 @@ static int image_make(
+ int state = 0;
+
+ if (ioctl(block_fd, BLKROGET, &state) < 0)
+- log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++ log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+ else if (state)
+ read_only = true;
+ }
+
+ if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
+- log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++ log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+
+ block_fd = safe_close(block_fd);
+ }
diff --git a/sys-fs/udev/udev-242.ebuild b/sys-fs/udev/udev-242.ebuild
index e3c9cbfb5d88..6aa2af42bb05 100644
--- a/sys-fs/udev/udev-242.ebuild
+++ b/sys-fs/udev/udev-242.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git"
@@ -13,7 +13,7 @@ else
MY_P=systemd-${MY_PV}
S=${WORKDIR}/${MY_P}
SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -47,6 +47,18 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt"
RDEPEND="${COMMON_DEPEND}
+ acct-group/kmem
+ acct-group/tty
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/tape
+ acct-group/video
!<sys-fs/lvm2-2.02.103
!<sec-policy/selinux-base-2.20120725-r10"
PDEPEND=">=sys-apps/hwids-20140304[udev]
@@ -85,7 +97,7 @@ src_prepare() {
fi
local PATCHES=(
- "${FILESDIR}/236-uucp-group.patch"
+ "${FILESDIR}"/242-gcc-9.patch
)
default
@@ -311,13 +323,6 @@ pkg_postinst() {
eend $?
fi
- # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
- # https://bugs.gentoo.org/246847
- # https://bugs.gentoo.org/514174
- enewgroup input
- enewgroup kvm 78
- enewgroup render
-
# Update hwdb database in case the format is changed by udev version.
if has_version 'sys-apps/hwids[udev]'; then
udevadm hwdb --update --root="${ROOT%/}"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index ba1551d202d3..0490d5f1dea2 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git"
@@ -47,6 +47,18 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt"
RDEPEND="${COMMON_DEPEND}
+ acct-group/kmem
+ acct-group/tty
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/tape
+ acct-group/video
!<sys-fs/lvm2-2.02.103
!<sec-policy/selinux-base-2.20120725-r10"
PDEPEND=">=sys-apps/hwids-20140304[udev]
@@ -85,7 +97,6 @@ src_prepare() {
fi
local PATCHES=(
- "${FILESDIR}/236-uucp-group.patch"
)
default
@@ -311,11 +322,6 @@ pkg_postinst() {
eend $?
fi
- # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
- # https://bugs.gentoo.org/246847
- # https://bugs.gentoo.org/514174
- enewgroup input
-
# Update hwdb database in case the format is changed by udev version.
if has_version 'sys-apps/hwids[udev]'; then
udevadm hwdb --update --root="${ROOT%/}"