[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: 14ca519cc16eee5cb7b7c0eda524ac8d98fa36c3
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Dec 24 19:59:34 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sat Dec 25 00:02:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ca519c
sys-fs/udev: drop 249-r3, 249.6
Signed-off-by: Mike Gilbert gentoo.org>
sys-fs/udev/Manifest | 2 -
sys-fs/udev/files/249-libudev-static.patch | 26 --
sys-fs/udev/files/249-sys-include-posix.patch | 67 -
.../udev/files/249-udev-linux-headers-5-15.patch | 22 --
sys-fs/udev/udev-249-r3.ebuild | 300
sys-fs/udev/udev-249.6.ebuild | 303 -
6 files changed, 720 deletions(-)
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index c58cfe1e2b1a..8ce148c0811d 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,4 +1,2 @@
-DIST systemd-249.tar.gz 10588828 BLAKE2B
f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27
SHA512
0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
-DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B
25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c
SHA512
4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a
DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B
6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006
SHA512
4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B
9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf
SHA512
7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f
diff --git a/sys-fs/udev/files/249-libudev-static.patch
b/sys-fs/udev/files/249-libudev-static.patch
deleted file mode 100644
index 73375b716e9b..
--- a/sys-fs/udev/files/249-libudev-static.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f2c57d4f3805775e0ffdc80ce578eaa737017d31 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert
-Date: Fri, 9 Jul 2021 13:05:23 -0400
-Subject: [PATCH] libudev: add "Libs.private: -lrt -pthread" to libudev.pc
-
-This resolves a failure when linking cryptsetup.static against libudev.a.
-
-```
-libtool: link: x86_64-pc-linux-gnu-gcc -Wall -O2 -pipe -march=amdfam10 -static
-O2 -o cryptsetup.static lib/utils_crypt.o lib/utils_loop.o lib/utils_io.o
lib/utils_blkid.o src/utils_tools.o src/utils_password.o src/utils_luks2.o
src/utils_blockdev.o src/cryptsetup.o -pthread -pthread -Wl,--as-needed
./.libs/libcryptsetup.a -largon2 -lrt -ljson-c -lpopt -luuid -lblkid -lssl
-lcrypto -lz -ldl -ldevmapper -lm -lpthread -ludev -pthread
-/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../x86_64-pc-linux-gnu/bin/ld:
/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../lib64/libudev.a(src_libsystemd_sd-daemon_sd-daemon.c.o):
in function `sd_is_mq':
-(.text.sd_is_mq+0x3a): undefined reference to `mq_getattr'
-```
- src/libudev/libudev.pc.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in
-index 89028aaa6bf2..1d6487fa4084 100644
a/src/libudev/libudev.pc.in
-+++ b/src/libudev/libudev.pc.in
-@@ -16,4 +16,5 @@ Name: libudev
- Description: Library to access udev device information
- Version: {{PROJECT_VERSION}}
- Libs: -L${libdir} -ludev
-+Libs.private: -lrt -pthread
- Cflags: -I${includedir}
diff --git a/sys-fs/udev/files/249-sys-include-posix.patch
b/sys-fs/udev/files/249-sys-include-posix.patch
deleted file mode 100644
index 6d9e0039b9c9..
--- a/sys-fs/udev/files/249-sys-include-posix.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Silence annoying #warning's on musl
-
-https://github.com/systemd/systemd/pull/20362
-https://github.com/systemd/systemd/pull/20364
-
-From f8d54f7810aeea5ff27a5db03e1aab7ea54c8268 Mon Sep 17 00:00:00 2001
-From: David Seifert
-Date: Mon, 2 Aug 2021 12:41:38 +0200
-Subject: [PATCH] Use correct `` include
-
-* `` is not specified in POSIX
- src/basic/fileio.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/basic/fileio.h b/src/basic/fileio.h
-index af797cfafdbf..4295b84a85c5 100644
a/src/basic/fileio.h
-+++ b/src/basic/fileio.h
-@@ -2,11 +2,11 @@
- #pragma once
-
- #include
-+#include
- #include
- #include
- #include
- #include
--#include
- #include
-
- #include "macro.h"
-From 2b6c0bb2a341c95223ce672249e43c743b03d78c Mon Sep 17
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: eb6b84e59fabdec573a61ea845edc144541c6b75
Author: David Seifert gentoo org>
AuthorDate: Tue Aug 3 11:27:33 2021 +
Commit: David Seifert gentoo org>
CommitDate: Tue Aug 3 11:27:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6b84e5
sys-fs/udev: enable musl
Closes: https://github.com/gentoo/gentoo/pull/21862
Signed-off-by: David Seifert gentoo.org>
sys-fs/udev/Manifest | 1 +
sys-fs/udev/files/249-sys-include-posix.patch | 67 +++
sys-fs/udev/udev-249-r2.ebuild| 64 +++--
3 files changed, 127 insertions(+), 5 deletions(-)
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index f3904e20d03..507013c24e8 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,2 +1,3 @@
DIST systemd-248.tar.gz 10306883 BLAKE2B
3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af
SHA512
486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
DIST systemd-249.tar.gz 10588828 BLAKE2B
f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27
SHA512
0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
+DIST systemd-musl-patches-249.1-r0.tar.xz 24276 BLAKE2B
ba96bcfb04096d639d7ee028b219bb90648b6aa8aaefe804cd658d3fb8c4f9770b617dc9c5ddfb93e876b739ad927d037c881cbfb19d2db095fa897f3bb83d20
SHA512
9bd7ea515184e44bfa50c9f415200c62f931c657a49cd53a15ee9719991f3773c12ca7162dc12f61a7e67ed791405e879f9b5a13c9fa09fab464be269508f31f
diff --git a/sys-fs/udev/files/249-sys-include-posix.patch
b/sys-fs/udev/files/249-sys-include-posix.patch
new file mode 100644
index 000..6d9e0039b9c
--- /dev/null
+++ b/sys-fs/udev/files/249-sys-include-posix.patch
@@ -0,0 +1,67 @@
+Silence annoying #warning's on musl
+
+https://github.com/systemd/systemd/pull/20362
+https://github.com/systemd/systemd/pull/20364
+
+From f8d54f7810aeea5ff27a5db03e1aab7ea54c8268 Mon Sep 17 00:00:00 2001
+From: David Seifert
+Date: Mon, 2 Aug 2021 12:41:38 +0200
+Subject: [PATCH] Use correct `` include
+
+* `` is not specified in POSIX
+---
+ src/basic/fileio.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/basic/fileio.h b/src/basic/fileio.h
+index af797cfafdbf..4295b84a85c5 100644
+--- a/src/basic/fileio.h
b/src/basic/fileio.h
+@@ -2,11 +2,11 @@
+ #pragma once
+
+ #include
++#include
+ #include
+ #include
+ #include
+ #include
+-#include
+ #include
+
+ #include "macro.h"
+From 2b6c0bb2a341c95223ce672249e43c743b03d78c Mon Sep 17 00:00:00 2001
+From: David Seifert
+Date: Mon, 2 Aug 2021 16:09:10 +0200
+Subject: [PATCH] Use correct `` include
+
+* `` is not specified in POSIX
+---
+ src/shared/nscd-flush.c | 2 +-
+ src/shared/varlink.c| 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c
+index dfc47c423441..19e16d93455c 100644
+--- a/src/shared/nscd-flush.c
b/src/shared/nscd-flush.c
+@@ -1,5 +1,5 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+-#include
++#include
+
+ #include "fd-util.h"
+ #include "io-util.h"
+diff --git a/src/shared/varlink.c b/src/shared/varlink.c
+index 3a53c16a7242..4033947d3b8c 100644
+--- a/src/shared/varlink.c
b/src/shared/varlink.c
+@@ -1,7 +1,7 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+ #include
+-#include
++#include
+
+ #include "alloc-util.h"
+ #include "errno-util.h"
diff --git a/sys-fs/udev/udev-249-r2.ebuild b/sys-fs/udev/udev-249-r2.ebuild
index ae3ddedfae4..e2c3e613c5e 100644
--- a/sys-fs/udev/udev-249-r2.ebuild
+++ b/sys-fs/udev/udev-249-r2.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
-inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1
toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
python-any-r1 toolchain-funcs udev usr-ldscript
if [[ ${PV} = * ]] ; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git";
@@ -22,14 +22,21 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sparc ~x86"
fi
+# musl patches taken from:
+#
http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
+SRC_URI+="
+ elibc_musl? (
+
https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${PV}.1-r0.tar.xz
+
https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${PV}.1-r0.tar.xz
+ )"
+
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace
devfs)"
HOMEP
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: e1c9784d3db136c7ce82dd00bcad18839dd11fee
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Jan 6 15:47:10 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Jan 6 15:47:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c9784d
sys-fs/udev: remove old
Signed-off-by: Mike Gilbert gentoo.org>
sys-fs/udev/Manifest | 1 -
sys-fs/udev/files/242-gcc-9.patch | 163 ---
sys-fs/udev/udev-242.ebuild | 333 --
3 files changed, 497 deletions(-)
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 299515c5f11..d0bd75c2b5b 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,4 +1,3 @@
-DIST systemd-242.tar.gz 7831435 BLAKE2B
288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd
SHA512
578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
DIST systemd-243.tar.gz 8242522 BLAKE2B
89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb
SHA512
56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
DIST systemd-246.tar.gz 9534036 BLAKE2B
71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0
SHA512
7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B
7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d
SHA512
47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
diff --git a/sys-fs/udev/files/242-gcc-9.patch
b/sys-fs/udev/files/242-gcc-9.patch
deleted file mode 100644
index e9f690a65be..000
--- a/sys-fs/udev/files/242-gcc-9.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
-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
-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(
-
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: c675e266b1c5b8fe4e5db814db6de7c3994cb6d2 Author: William Hubbs gentoo org> AuthorDate: Fri Oct 11 04:37:09 2019 + Commit: William Hubbs gentoo org> CommitDate: Fri Oct 11 04:37:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c675e266 sys-fs/udev: remove several old versions Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: William Hubbs gentoo.org> sys-fs/udev/Manifest | 9 - sys-fs/udev/files/236-uucp-group.patch | 13 - ...issing-comma-in-raw_clone-assembly-for-sp.patch | 29 -- sys-fs/udev/files/239-debug-extra.patch| 40 --- sys-fs/udev/files/239-stat-0.patch | 108 --- sys-fs/udev/files/239-stat-1.patch | 74 - sys-fs/udev/udev-236-r1.ebuild | 336 - sys-fs/udev/udev-238.ebuild| 323 sys-fs/udev/udev-239.ebuild| 327 sys-fs/udev/udev-240-r2.ebuild | 325 sys-fs/udev/udev-240-r3.ebuild | 325 sys-fs/udev/udev-241.ebuild| 328 sys-fs/udev/udev-241_rc1.ebuild| 326 sys-fs/udev/udev-241_rc2.ebuild| 326 14 files changed, 2889 deletions(-) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index b53cebb6825..875ca45a4ae 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,11 +1,2 @@ -DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515fdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d -DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8 -DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f -DIST systemd-240-patches-1.tar.gz 15364 BLAKE2B e5cf4c2b8666a5c03e658f46674422d2566a748d3dc088f3cda0f5c5e7b51aec00a531ef7e9d047fd59504299d2e8a44faa353da1183260ae72156bb486d51f7 SHA512 1541810dbcfcc75c4323015c056c963ef69d633761293dea7f27aa6106e3ccc59a84263c703fc5542cf2fb3410c846e97ffb11ecc7d56a98ca658b43b73b6313 -DIST systemd-240-patches-3.tar.gz 31952 BLAKE2B 0677d24c4f4e1575dbd4953eb75734f0773671e4ffc2a8d848353a379f5ea2caf4f96620ed6303d98ec00a15367d5e2124b493aaef80b1a0fe118866a1c04ada SHA512 e604e1de17bcd4c941036f12d2e3ae96dd6e86647db2b07576e8468405900b6e8af6a0e55a50c7e9b19704601930b8152c8ac506b2624e261ee0cd35dfc91a21 -DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5 -DIST systemd-241-rc1.tar.gz 7617965 BLAKE2B 6c491297b71ad3c473d644de04bb334f902ee4110d647b654c5452f34401cfc11c7564b290022072555f3fbd46674ce009f587622f412f8a66330a7089db34c5 SHA512 168ba80d6e8abadbf1ed84270f2b02e257f1490b61021bb6fb704d9b5fad2670b63e0fc0cb26071e8d56c993faa30274e80d53cf49154cce2b609f47c73b30e0 -DIST systemd-241-rc2.tar.gz 7619504 BLAKE2B 610940b3141d36a0534cf477d303eb681f418f8c04d7e9ff1d28832d02c05d68195aec108b15392662b134020c28df5b35f6c1c85f8eea8e7090cdc210ce5e26 SHA512 69932b1e5d48fbf6fd650a91354763b1e7e8d490def98a011d6377ee8623abc21244f2c8ddd97a500c4d3e6ab11bae2a6148ddc84e325d75a0273b3d456d8f41 -DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: bedd1302f0fdf5d892f9bf8be663e6b3bfa3cb0e
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jul 30 14:44:29 2019 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jul 30 14:45:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bedd1302
sys-fs/udev: backport fixes for gcc 9
Closes: https://bugs.gentoo.org/690356
Package-Manager: Portage-2.3.69_p3, Repoman-2.3.16_p12
Signed-off-by: Mike Gilbert gentoo.org>
sys-fs/udev/files/242-gcc-9.patch | 163 ++
sys-fs/udev/udev-242.ebuild | 1 +
2 files changed, 164 insertions(+)
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 000..e9f690a65be
--- /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?=
+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
+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)
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: e248b7af8903fdb47cd11c203d46f8eded6023c3
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Jan 10 18:20:34 2018 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Jan 10 18:31:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e248b7af
sys-fs/udev: fix 233 build with glibc-2.26
Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37
sys-fs/udev/files/233-fix-includes.patch | 38
sys-fs/udev/udev-233.ebuild | 3 ++-
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/sys-fs/udev/files/233-fix-includes.patch
b/sys-fs/udev/files/233-fix-includes.patch
new file mode 100644
index 000..44b06214f89
--- /dev/null
+++ b/sys-fs/udev/files/233-fix-includes.patch
@@ -0,0 +1,38 @@
+From 284d1cd0a12cad96a5ea61d1afb0dd677dbd147e Mon Sep 17 00:00:00 2001
+From: Matija Skala
+Date: Wed, 15 Mar 2017 13:21:10 +0100
+Subject: [PATCH] fix includes
+
+linux/sockios.h is needed for the SIOCGSTAMPNS macro
+
+xlocale.h is included indirectly in glibc and doesn't even exist in
+other libcs
+---
+ src/basic/parse-util.c | 1 -
+ src/libsystemd-network/sd-lldp.c | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
+index 6e58ced6f5..d86700736d 100644
+--- a/src/basic/parse-util.c
b/src/basic/parse-util.c
+@@ -23,7 +23,6 @@
+ #include
+ #include
+ #include
+-#include
+
+ #include "alloc-util.h"
+ #include "extract-word.h"
+diff --git a/src/libsystemd-network/sd-lldp.c
b/src/libsystemd-network/sd-lldp.c
+index 0702241506..39ddb2461a 100644
+--- a/src/libsystemd-network/sd-lldp.c
b/src/libsystemd-network/sd-lldp.c
+@@ -19,6 +19,7 @@
+ ***/
+
+ #include
++#include
+
+ #include "sd-lldp.h"
+
diff --git a/sys-fs/udev/udev-233.ebuild b/sys-fs/udev/udev-233.ebuild
index c42ecc2c0be..33ba3ae76f4 100644
--- a/sys-fs/udev/udev-233.ebuild
+++ b/sys-fs/udev/udev-233.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -57,6 +57,7 @@ S=${WORKDIR}/systemd-${PV}
PATCHES=(
"${FILESDIR}"/233-format-warnings.patch
+ "${FILESDIR}"/233-fix-includes.patch
)
check_default_rules() {
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: 930b5a6b49bfa99f6d9f01f21a4e1644ff6799d7
Author: William Hubbs gentoo org>
AuthorDate: Sat Dec 16 17:36:32 2017 +
Commit: William Hubbs gentoo org>
CommitDate: Sat Dec 16 17:54:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930b5a6b
sys-fs/udev: 236 version bump
Package-Manager: Portage-2.3.13, Repoman-2.3.3
sys-fs/udev/Manifest | 1 +
sys-fs/udev/files/236-uucp-group.patch | 13 ++
sys-fs/udev/udev-236.ebuild| 329 +
3 files changed, 343 insertions(+)
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index c6ecac5bfc2..4d5255330b8 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -3,4 +3,5 @@ DIST systemd-225.tar.gz 3878442 BLAKE2B
24bf9f6bfdd7d7c585829c1b172f73e669e13702
DIST systemd-233.tar.gz 4660737 BLAKE2B
38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2
SHA512
5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
DIST systemd-234.tar.gz 4800186 BLAKE2B
398ed8869da98909d1374ef5e549ca3e26b02ece577d94dec53e98431de0c6441e50762a3bc2c93fa1c14c236a8f0dca8e3f4102fd276ec977dfb3e77a789165
SHA512
762336a7d96c6583cf71cad62efce95a0ed93cd0a0d7251f128d10dba8200c0c8df0e5a7d168179ababa5b221295a231e73b7e7ea2697cb3fb5c1b33538efa68
DIST systemd-235.tar.gz 6586406 BLAKE2B
f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e
SHA512
243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
+DIST systemd-236.tar.gz 6759035 BLAKE2B
0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3
SHA512
1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515fdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
DIST udev-216-patches-2.tar.xz 1264 BLAKE2B
b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc
SHA512
1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4
diff --git a/sys-fs/udev/files/236-uucp-group.patch
b/sys-fs/udev/files/236-uucp-group.patch
new file mode 100644
index 000..be0ba065430
--- /dev/null
+++ b/sys-fs/udev/files/236-uucp-group.patch
@@ -0,0 +1,13 @@
+diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in
+index 71e716913..f24c9e6ae 100644
+--- a/rules/50-udev-default.rules.in
b/rules/50-udev-default.rules.in
+@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty",
MODE="0620"
+ 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]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*",
GROUP="dialout"
++KERNEL=="tty[A-Z]*[0-9]|ttymxc[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-fs/udev/udev-236.ebuild b/sys-fs/udev/udev-236.ebuild
new file mode 100644
index 000..bab6000491a
--- /dev/null
+++ b/sys-fs/udev/udev-236.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal
toolchain-funcs udev user versionator
+
+if [[ ${PV} = * ]]; then
+ EGIT_REPO_URI="https://github.com/systemd/systemd.git";
+ inherit git-r3
+else
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz ->
systemd-${PV}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace
devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+ sys-libs/libcap[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl )
+ kmod? ( >=sys-apps/kmod-16 )
+ selinux? ( >=sys-libs/libselinux-2.1.9 )
+ ! "${T}"/40-gentoo.rules
+ # Gentoo specific floppy and usb groups
+ ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+ ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+ EOF
+
+ local PATCHES=(
+ "${FILESDIR}/236-uucp-group.patch"
+ )
+
+ default
+
+ if ! use elibc_glibc; then #443030
+ echo '#define secure_get
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: cc7faaaefdb480c904faa827ee2917a3e3472c4e
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Aug 13 23:07:04 2017 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Aug 13 23:07:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7faaae
sys-fs/udev: 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-fs/udev/files/234-uucp-group.patch | 11 +++
sys-fs/udev/{udev-234.ebuild => udev-234-r1.ebuild} | 19 ---
sys-fs/udev/udev-.ebuild| 21 +
3 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/sys-fs/udev/files/234-uucp-group.patch
b/sys-fs/udev/files/234-uucp-group.patch
new file mode 100644
index 000..89cf552c829
--- /dev/null
+++ b/sys-fs/udev/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-fs/udev/udev-234.ebuild b/sys-fs/udev/udev-234-r1.ebuild
similarity index 95%
rename from sys-fs/udev/udev-234.ebuild
rename to sys-fs/udev/udev-234-r1.ebuild
index e8469928824..03c1796fcac 100644
--- a/sys-fs/udev/udev-234.ebuild
+++ b/sys-fs/udev/udev-234-r1.ebuild
@@ -9,13 +9,7 @@ if [[ ${PV} = * ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git";
inherit git-r3
else
- patchset=
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz ->
systemd-${PV}.tar.gz"
- if [[ -n "${patchset}" ]]; then
- SRC_URI+="
-
https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz
-
https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz";
- fi
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
fi
@@ -92,22 +86,17 @@ src_prepare() {
fi
fi
- # backport some patches
- if [[ -n "${patchset}" ]]; then
- eapply "${WORKDIR}"/patch
- fi
-
cat <<-EOF > "${T}"/40-gentoo.rules
# Gentoo specific floppy and usb groups
ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
EOF
- # change rules back to group uucp instead of dialout for now wrt #454556
- sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+ local PATCHES=(
+ "${FILESDIR}/234-uucp-group.patch"
+ )
- # apply user patches
- eapply_user
+ default
if ! use elibc_glibc; then #443030
echo '#define secure_getenv(x) NULL' >> config.h.in
diff --git a/sys-fs/udev/udev-.ebuild b/sys-fs/udev/udev-.ebuild
index b7834ccec24..03c1796fcac 100644
--- a/sys-fs/udev/udev-.ebuild
+++ b/sys-fs/udev/udev-.ebuild
@@ -9,14 +9,8 @@ if [[ ${PV} = * ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git";
inherit git-r3
else
- patchset=
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz ->
systemd-${PV}.tar.gz"
- if [[ -n "${patchset}" ]]; then
- SRC_URI+="
-
https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz
-
https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz";
- fi
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace
devfs)"
@@ -92,22 +86,17 @@ src_prepare() {
fi
fi
- # backport some patches
- if [[ -n "${patchset}" ]]; then
- eapply "${WORKDIR}"/patch
- fi
-
cat <<-EOF > "${T}"/40-gentoo.rules
# Gentoo specific floppy and usb groups
ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
EOF
- # change rules back to group uucp instead of dialout for now wrt #454556
- sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+ local PATCHES=(
+ "${FILESDIR}/234-uucp-group.patch"
+ )
- # apply user patches
- eapply_user
+ default
if ! use elibc_glibc; then #443030
echo '#define secure_getenv(x) NULL' >> config.h.in
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: 247ffd39f221d14cf084a5119a5675b626837c1b
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jul 2 16:10:50 2017 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jul 2 16:11:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=247ffd39
sys-fs/udev: fix build failure on alpha/ia64
Bug: https://bugs.gentoo.org/612102
Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77
sys-fs/udev/files/233-format-warnings.patch | 84 +
sys-fs/udev/udev-233.ebuild | 18 ++-
2 files changed, 89 insertions(+), 13 deletions(-)
diff --git a/sys-fs/udev/files/233-format-warnings.patch
b/sys-fs/udev/files/233-format-warnings.patch
new file mode 100644
index 000..7bb08f0a320
--- /dev/null
+++ b/sys-fs/udev/files/233-format-warnings.patch
@@ -0,0 +1,84 @@
+From 3e7d14d78c4d15ec7789299216cbf5c58e61547b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Sat, 3 Jun 2017 05:41:17 -0400
+Subject: [PATCH] sd-bus: silence format warnings in kdbus code (#6072)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The code is mostly correct, but gcc is trying to outsmart us, and emits a
+warning for a "llu vs lu" mismatch, even though they are the same size (on
alpha):
+
+src/libsystemd/sd-bus/bus-control.c: In function ‘kernel_get_list’:
+src/libsystemd/sd-bus/bus-control.c:267:42: error: format ‘%llu’ expects
argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64 {aka
long unsigned int}’ [-Werror=format=]
+ if (asprintf(&n, ":1.%llu", name->id) < 0) {
+ ^
+src/libsystemd/sd-bus/bus-control.c: In function ‘bus_get_name_creds_kdbus’:
+src/libsystemd/sd-bus/bus-control.c:714:47: error: format ‘%llu’ expects
argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64 {aka
long unsigned int}’ [-Werror=format=]
+ if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) {
+ ^
+This is hard to work around properly, because kdbus.h uses __u64 which is
+defined-differently-despite-being-the-same-size then uint64_t. Thus the simple
+solution of using %PRIu64 fails on amd64:
+
+src/libsystemd/sd-bus/bus-control.c:714:47: error: format ‘%lu’ expects
argument of type ‘long unsigned int’, but argument 3 has type ‘__u64 {aka long
long unsigned int}’ [-Werror=format=]
+ if (asprintf(&c->unique_name, ":1.%"PRIu64, conn_info->id) <
0) {
+ ^~
+
+Let's just avoid the whole issue for now by silencing the warning.
+After the next release, we should just get rid of the kdbus code.
+
+Fixes #5561.
+---
+ src/libsystemd/sd-bus/bus-control.c | 6 ++
+ src/libsystemd/sd-bus/bus-kernel.c | 2 ++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/libsystemd/sd-bus/bus-control.c
b/src/libsystemd/sd-bus/bus-control.c
+index 9e58ffbd8..303ae0f23 100644
+--- a/src/libsystemd/sd-bus/bus-control.c
b/src/libsystemd/sd-bus/bus-control.c
+@@ -264,10 +264,13 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags,
char ***x) {
+ if ((flags & KDBUS_LIST_UNIQUE) && name->id != previous_id &&
!(name->flags & KDBUS_HELLO_ACTIVATOR)) {
+ char *n;
+
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat"
+ if (asprintf(&n, ":1.%llu", name->id) < 0) {
+ r = -ENOMEM;
+ goto fail;
+ }
++#pragma GCC diagnostic pop
+
+ r = strv_consume(x, n);
+ if (r < 0)
+@@ -711,10 +714,13 @@ int bus_get_name_creds_kdbus(
+ }
+
+ if (mask & SD_BUS_CREDS_UNIQUE_NAME) {
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat"
+ if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) {
+ r = -ENOMEM;
+ goto fail;
+ }
++#pragma GCC diagnostic pop
+
+ c->mask |= SD_BUS_CREDS_UNIQUE_NAME;
+ }
+diff --git a/src/libsystemd/sd-bus/bus-kernel.c
b/src/libsystemd/sd-bus/bus-kernel.c
+index c82caeb3f..ca6aee7c0 100644
+--- a/src/libsystemd/sd-bus/bus-kernel.c
b/src/libsystemd/sd-bus/bus-kernel.c
+@@ -51,6 +51,8 @@
+ #include "user-util.h"
+ #include "util.h"
+
++#pragma GCC diagnostic ignored "-Wformat"
++
+ #define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t))
+
+ int bus_kernel_parse_unique_name(const char *s, uint64_t *id) {
+--
+2.13.2
+
diff --git a/sys-fs/udev/udev-233.ebuild b/sys-fs/udev/udev-233.ebuild
index 8662d86b43c..7cdbc7e3da1 100644
--- a/sys-fs/udev/udev-233.ebuild
+++ b/sys-fs/udev/udev-233.ebuild
@@ -9,13 +9,7 @@ if [[ ${PV} = * ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: 09cd09946cdad79faace80036a301784289a7e38
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Jan 16 16:37:11 2017 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jan 16 16:37:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09cd0994
sys-fs/udev: fix build with gperf-3.1
Bug: https://bugs.gentoo.org/605022
Package-Manager: Portage-2.3.3_p32, Repoman-2.3.1_p25
...dd-check-for-gperf-lookup-function-signat.patch | 302 +
sys-fs/udev/udev-230-r1.ebuild | 4 +-
sys-fs/udev/udev-232-r2.ebuild | 3 +-
3 files changed, 307 insertions(+), 2 deletions(-)
diff --git
a/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
b/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
new file mode 100644
index ..440ec75
--- /dev/null
+++
b/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
@@ -0,0 +1,302 @@
+From 016fb3b83b861cfe58694996076a9764dcb46475 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Tue, 10 Jan 2017 02:39:05 -0500
+Subject: [PATCH 2/2] build-sys: add check for gperf lookup function signature
+ (#5055)
+
+gperf-3.1 generates lookup functions that take a size_t length
+parameter instead of unsigned int. Test for this at configure time.
+
+Fixes: https://github.com/systemd/systemd/issues/5039
+---
+ configure.ac | 22 ++
+ src/basic/af-list.c | 2 +-
+ src/basic/arphrd-list.c | 2 +-
+ src/basic/cap-list.c | 2 +-
+ src/basic/errno-list.c | 2 +-
+ src/core/load-fragment.h | 2 +-
+ src/journal/journald-server.h| 2 +-
+ src/login/logind.h | 2 +-
+ src/network/networkd-conf.h | 2 +-
+ src/network/networkd-netdev.h| 2 +-
+ src/network/networkd-network.h | 2 +-
+ src/nspawn/nspawn-settings.h | 2 +-
+ src/resolve/dns-type.c | 2 +-
+ src/resolve/resolved-conf.h | 2 +-
+ src/test/test-af-list.c | 2 +-
+ src/test/test-arphrd-list.c | 2 +-
+ src/timesync/timesyncd-conf.h| 2 +-
+ src/udev/net/link-config.h | 2 +-
+ src/udev/udev-builtin-keyboard.c | 2 +-
+ 19 files changed, 40 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1928e65bd..5c639e32d 100644
+--- a/configure.ac
b/configure.ac
+@@ -258,6 +258,28 @@ AC_CHECK_SIZEOF(rlim_t,,[
+#include
+ ])
+
++GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)"
++
++AC_COMPILE_IFELSE(
++[AC_LANG_PROGRAM([
++#include
++const char * in_word_set(const char *, size_t);
++$GPERF_TEST]
++)],
++[GPERF_LEN_TYPE=size_t],
++[AC_COMPILE_IFELSE(
++[AC_LANG_PROGRAM([
++#include
++const char * in_word_set(const char *, unsigned);
++$GPERF_TEST]
++)],
++[GPERF_LEN_TYPE=unsigned],
++[AC_MSG_ERROR([** unable to determine gperf len type])]
++)]
++)
++
++AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type])
++
+ #
--
+ # we use python to build the man page index
+ have_python=no
+diff --git a/src/basic/af-list.c b/src/basic/af-list.c
+index 3fac9c508..4b291d177 100644
+--- a/src/basic/af-list.c
b/src/basic/af-list.c
+@@ -23,7 +23,7 @@
+ #include "af-list.h"
+ #include "macro.h"
+
+-static const struct af_name* lookup_af(register const char *str, register
unsigned int len);
++static const struct af_name* lookup_af(register const char *str, register
GPERF_LEN_TYPE len);
+
+ #include "af-from-name.h"
+ #include "af-to-name.h"
+diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
+index 6792d1ee3..2d598dc66 100644
+--- a/src/basic/arphrd-list.c
b/src/basic/arphrd-list.c
+@@ -23,7 +23,7 @@
+ #include "arphrd-list.h"
+ #include "macro.h"
+
+-static const struct arphrd_name* lookup_arphrd(register const char *str,
register unsigned int len);
++static const struct arphrd_name* lookup_arphrd(register const char *str,
register GPERF_LEN_TYPE len);
+
+ #include "arphrd-from-name.h"
+ #include "arphrd-to-name.h"
+diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
+index 3e773a06f..d68cc78d0 100644
+--- a/src/basic/cap-list.c
b/src/basic/cap-list.c
+@@ -26,7 +26,7 @@
+ #include "parse-util.h"
+ #include "util.h"
+
+-static const struct capability_name* lookup_capability(register const char
*str, register unsigned int len);
++static const struct capability_name* lookup_capability(register const char
*str, register GPERF_LEN_TYPE len);
+
+ #include "cap-from-name.h"
+ #include "cap-to-name.h"
+diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
+index 31b66bad5..c6a01eec8 100644
+--- a/s
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: 248f71f97378522f6e981b85c8236b0c7abfb72f
Author: Lars Wendler gentoo org>
AuthorDate: Sat Nov 5 13:51:43 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Nov 5 14:13:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=248f71f9
sys-fs/udev: Fixed installation of libudev.so (bug #598988).
Thanks to floppym for reviewing the ebuild patches and creating the
pkgconfig fix he also sent upstream.
Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler gentoo.org>
sys-fs/udev/files/systemd-232-pkgconfig.patch | 50 ++
.../udev/{udev-232.ebuild => udev-232-r1.ebuild} | 11 -
2 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/sys-fs/udev/files/systemd-232-pkgconfig.patch
b/sys-fs/udev/files/systemd-232-pkgconfig.patch
new file mode 100644
index ..50f7921
--- /dev/null
+++ b/sys-fs/udev/files/systemd-232-pkgconfig.patch
@@ -0,0 +1,50 @@
+From a36dad95c447a5cf65f9e3b66c86e906e7f05890 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Sat, 5 Nov 2016 09:17:34 -0400
+Subject: [PATCH] Adjust pkgconfig files to point at rootlibdir
+
+The .so symlinks got moved to rootlibdir in 082210c7.
+---
+ Makefile.am | 1 +
+ src/libsystemd/libsystemd.pc.in | 2 +-
+ src/libudev/libudev.pc.in | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f2d8bf5..73144b1 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -6054,6 +6054,7 @@ EXTRA_DIST += \
+
+ #
--
+ substitutions = \
++ '|rootlibdir=$(rootlibdir)|' \
+'|rootlibexecdir=$(rootlibexecdir)|' \
+'|rootbindir=$(rootbindir)|' \
+'|bindir=$(bindir)|' \
+diff --git a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in
+index e8f7950..7e6d499 100644
+--- a/src/libsystemd/libsystemd.pc.in
b/src/libsystemd/libsystemd.pc.in
+@@ -7,7 +7,7 @@
+
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@rootlibdir@
+ includedir=@includedir@
+
+ Name: systemd
+diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in
+index a0f3f52..770c922 100644
+--- a/src/libudev/libudev.pc.in
b/src/libudev/libudev.pc.in
+@@ -7,7 +7,7 @@
+
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@rootlibdir@
+ includedir=@includedir@
+
+ Name: libudev
diff --git a/sys-fs/udev/udev-232.ebuild b/sys-fs/udev/udev-232-r1.ebuild
similarity index 97%
rename from sys-fs/udev/udev-232.ebuild
rename to sys-fs/udev/udev-232-r1.ebuild
index db5fafc..83e57cb 100644
--- a/sys-fs/udev/udev-232.ebuild
+++ b/sys-fs/udev/udev-232-r1.ebuild
@@ -122,6 +122,8 @@ src_prepare() {
# stub out the am_path_libcrypt function
echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4
+ eapply "${FILESDIR}/systemd-${PV}-pkgconfig.patch"
+
# apply user patches
eapply_user
@@ -244,9 +246,9 @@ multilib_src_install() {
local pkgconfiglib_DATA="src/libudev/libudev.pc"
local targets=(
- install-libLTLIBRARIES
install-includeHEADERS
install-rootbinPROGRAMS
+ install-rootlibLTLIBRARIES
install-rootlibexecPROGRAMS
install-udevlibexecPROGRAMS
install-dist_udevconfDATA
@@ -272,8 +274,13 @@ multilib_src_install() {
)
emake -j1 DESTDIR="${D}" "${targets[@]}"
doman
man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
+
+ # Compatibility symlink for software that looks for libudev.so
+ # without using pkg-config
+ dosym ../../$(get_libdir)/libudev.so.1 \
+ /usr/$(get_libdir)/libudev.so
else
- local rootlib_LTLIBRARIES="libudev.la"
+ local lib_LTLIBRARIES="libudev.la"
local pkgconfiglib_DATA="src/libudev/libudev.pc"
local include_HEADERS="src/libudev/libudev.h"
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/, sys-fs/udev/files/
commit: 06022126809462809479739c0a86e2139b4f8410
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Apr 20 03:16:34 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Apr 20 03:16:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06022126
sys-fs/udev: add upstream fix for building w/glibc #580200
sys-fs/udev/files/udev-229-sysmacros.patch | 82 ++
sys-fs/udev/udev-229-r2.ebuild | 1 +
2 files changed, 83 insertions(+)
diff --git a/sys-fs/udev/files/udev-229-sysmacros.patch
b/sys-fs/udev/files/udev-229-sysmacros.patch
new file mode 100644
index 000..d72eb59
--- /dev/null
+++ b/sys-fs/udev/files/udev-229-sysmacros.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/580200
+https://github.com/systemd/systemd/commit/27d13af71c3af6b2f9b60556d2c046dbb6e36e23
+
+From 27d13af71c3af6b2f9b60556d2c046dbb6e36e23 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger
+Date: Mon, 14 Mar 2016 17:44:49 -0400
+Subject: [PATCH] include sys/sysmacros.h in more places
+
+Since glibc is moving away from implicitly including sys/sysmacros.h
+all the time via sys/types.h, include the header directly in more
+places. This seems to cover most makedev/major/minor usage.
+---
+ src/basic/macro.h | 1 +
+ src/basic/util.h| 1 +
+ src/libudev/libudev.h | 1 +
+ src/systemd/sd-device.h | 1 +
+ src/udev/udev.h | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/basic/macro.h b/src/basic/macro.h
+index c34441d..b36a956 100644
+--- a/src/basic/macro.h
b/src/basic/macro.h
+@@ -23,6 +23,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
+diff --git a/src/basic/util.h b/src/basic/util.h
+index e095254..286db05 100644
+--- a/src/basic/util.h
b/src/basic/util.h
+@@ -36,6 +36,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
+index eb58740..3f6d0ed 100644
+--- a/src/libudev/libudev.h
b/src/libudev/libudev.h
+@@ -21,6 +21,7 @@
+ #define _LIBUDEV_H_
+
+ #include
++#include
+ #include
+
+ #ifdef __cplusplus
+diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h
+index 5bfca6e..c1d0756 100644
+--- a/src/systemd/sd-device.h
b/src/systemd/sd-device.h
+@@ -22,6 +22,7 @@
+ ***/
+
+ #include
++#include
+ #include
+
+ #include "_sd-common.h"
+diff --git a/src/udev/udev.h b/src/udev/udev.h
+index 5659051..8433e8d 100644
+--- a/src/udev/udev.h
b/src/udev/udev.h
+@@ -19,6 +19,7 @@
+ */
+
+ #include
++#include
+ #include
+
+ #include "libudev.h"
+--
+2.7.4
+
diff --git a/sys-fs/udev/udev-229-r2.ebuild b/sys-fs/udev/udev-229-r2.ebuild
index a228a72..9599178 100644
--- a/sys-fs/udev/udev-229-r2.ebuild
+++ b/sys-fs/udev/udev-229-r2.ebuild
@@ -114,6 +114,7 @@ src_prepare() {
if [[ -n "${patchset}" ]]; then
EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
fi
+ epatch "${FILESDIR}"/${PN}-229-sysmacros.patch #580200
cat <<-EOF > "${T}"/40-gentoo.rules
# Gentoo specific floppy and usb groups
