[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/
commit: fea2b533e5855d2d06fbe973635b78f48a23460d Author: Mike Gilbert gentoo org> AuthorDate: Mon Sep 19 00:50:04 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Sep 19 21:00:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fea2b533 sys-fs/udev: drop 249.6-r2, 249.9, Signed-off-by: Mike Gilbert gentoo.org> sys-fs/udev/Manifest| 3 - sys-fs/udev/files/249.9-cross-compile.patch | 23 -- sys-fs/udev/files/40-gentoo.rules | 3 - sys-fs/udev/metadata.xml| 3 - sys-fs/udev/udev-249.6-r2.ebuild| 311 --- sys-fs/udev/udev-249.9.ebuild | 312 sys-fs/udev/udev-.ebuild| 311 --- 7 files changed, 966 deletions(-) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest deleted file mode 100644 index 1739d2c01014.. --- a/sys-fs/udev/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -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 -DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164 diff --git a/sys-fs/udev/files/249.9-cross-compile.patch b/sys-fs/udev/files/249.9-cross-compile.patch deleted file mode 100644 index e063d303c7d8.. --- a/sys-fs/udev/files/249.9-cross-compile.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Tue, 21 Dec 2021 20:10:09 +0900 -Subject: [PATCH] meson: fix cross compiling - -(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8) - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 02495d16c9..c76cab535d 100644 a/meson.build -+++ b/meson.build -@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include ')) - conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include ')) - conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include ')) - conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include ')) --conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include ')) -+conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include ')) - - decl_headers = ''' - #include diff --git a/sys-fs/udev/files/40-gentoo.rules b/sys-fs/udev/files/40-gentoo.rules deleted file mode 100644 index 6b96bd07051e.. --- a/sys-fs/udev/files/40-gentoo.rules +++ /dev/null @@ -1,3 +0,0 @@ -# Gentoo specific groups -ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" -ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" diff --git a/sys-fs/udev/metadata.xml b/sys-fs/udev/metadata.xml index 4371b65f936b..dd0c7f195866 100644 --- a/sys-fs/udev/metadata.xml +++ b/sys-fs/udev/metadata.xml @@ -4,9 +4,6 @@ syst...@gentoo.org - - Enable kernel module loading/unloading support using sys-apps/kmod - cpe:/a:kernel:udev systemd/systemd diff --git a/sys-fs/udev/udev-249.6-r2.ebuild b/sys-fs/udev/udev-249.6-r2.ebuild deleted file mode 100644 index 46e093544366.. --- a/sys-fs/udev/udev-249.6-r2.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 2003-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -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; - inherit git-r3 -else - if [[ ${PV} == *.* ]] ; then - MY_PN=systemd-stable - else - MY_PN=systemd - fi - - MY_PV="${PV/_/-}" - MY_P="${MY_PN}-${MY_PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz; - - # musl patches taken from: - #
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/
commit: 769425232fb53ec7c5cd1c0ddcc388f9198c7691 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jan 15 16:10:26 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Jan 15 16:10:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76942523 sys-fs/udev: backport cross compile fix Bug: https://bugs.gentoo.org/831221 Signed-off-by: Mike Gilbert gentoo.org> sys-fs/udev/files/249.9-cross-compile.patch | 23 +++ sys-fs/udev/udev-249.9.ebuild | 1 + 2 files changed, 24 insertions(+) diff --git a/sys-fs/udev/files/249.9-cross-compile.patch b/sys-fs/udev/files/249.9-cross-compile.patch new file mode 100644 index ..e063d303c7d8 --- /dev/null +++ b/sys-fs/udev/files/249.9-cross-compile.patch @@ -0,0 +1,23 @@ +From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Tue, 21 Dec 2021 20:10:09 +0900 +Subject: [PATCH] meson: fix cross compiling + +(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8) +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 02495d16c9..c76cab535d 100644 +--- a/meson.build b/meson.build +@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include ')) + conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include ')) + conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include ')) + conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include ')) +-conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include ')) ++conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include ')) + + decl_headers = ''' + #include diff --git a/sys-fs/udev/udev-249.9.ebuild b/sys-fs/udev/udev-249.9.ebuild index 07a6665a0772..0b8e93be4fa5 100644 --- a/sys-fs/udev/udev-249.9.ebuild +++ b/sys-fs/udev/udev-249.9.ebuild @@ -117,6 +117,7 @@ pkg_setup() { src_prepare() { local PATCHES=( + "${FILESDIR}/249.9-cross-compile.patch" ) use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/
commit: ac2e319813282c3a79c1a704aee66387bc10a149 Author: Sam James gentoo org> AuthorDate: Sun Nov 14 08:02:21 2021 + Commit: Sam James gentoo org> CommitDate: Sun Nov 14 08:02:36 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac2e3198 sys-fs/udev: fix build with linux-headers-5.15 Just like tmpfiles and systemd itself. Closes: https://bugs.gentoo.org/821550 Signed-off-by: Sam James gentoo.org> .../udev/files/249-udev-linux-headers-5-15.patch | 22 ++ sys-fs/udev/udev-249-r3.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/sys-fs/udev/files/249-udev-linux-headers-5-15.patch b/sys-fs/udev/files/249-udev-linux-headers-5-15.patch new file mode 100644 index ..844099b72819 --- /dev/null +++ b/sys-fs/udev/files/249-udev-linux-headers-5-15.patch @@ -0,0 +1,22 @@ +https://github.com/systemd/systemd-stable/pull/132/commits/92bbfcdc733d39ec4097d8678bc92a7aaaf78ae1.patch +https://bugs.gentoo.org/821550 + +From: Chris Packham +Date: Fri, 10 Sep 2021 09:51:36 +1200 +Subject: [PATCH 1/2] basic/linux: Sync if_arp.h with Linux 5.14 + +ARPHRD_MCTP was added in 5.14. Sync if_arp.h to pick up the definition + +Fixes #20694 + +(cherry picked from commit 7c5b9952c4f6e2b72f90edbe439982528b7cf223) +--- a/src/basic/linux/if_arp.h b/src/basic/linux/if_arp.h +@@ -54,6 +54,7 @@ + #define ARPHRD_X25271 /* CCITT X.25 */ + #define ARPHRD_HWX25 272 /* Boards with X.25 in firmware */ + #define ARPHRD_CAN280 /* Controller Area Network */ ++#define ARPHRD_MCTP 290 + #define ARPHRD_PPP512 + #define ARPHRD_CISCO 513 /* Cisco HDLC */ + #define ARPHRD_HDLC ARPHRD_CISCO diff --git a/sys-fs/udev/udev-249-r3.ebuild b/sys-fs/udev/udev-249-r3.ebuild index 2e1601d89e08..d8c084d97863 100644 --- a/sys-fs/udev/udev-249-r3.ebuild +++ b/sys-fs/udev/udev-249-r3.ebuild @@ -116,6 +116,7 @@ src_prepare() { # backport from 250 to silence musl warnings "${FILESDIR}/249-sys-include-posix.patch" "${FILESDIR}/249-libudev-static.patch" + "${FILESDIR}/249-udev-linux-headers-5-15.patch" ) use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/
commit: 9d338b39cd9f19977bb47b52bb5e797f2f1563b2 Author: Mike Gilbert gentoo org> AuthorDate: Sun Jul 11 14:40:09 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Jul 11 14:40:09 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d338b39 sys-fs/udev: add static link info to libudev.pc Closes: https://bugs.gentoo.org/801325 Signed-off-by: Mike Gilbert gentoo.org> sys-fs/udev/files/249-libudev-static.patch | 26 ++ .../udev/{udev-249.ebuild => udev-249-r1.ebuild} | 1 + 2 files changed, 27 insertions(+) diff --git a/sys-fs/udev/files/249-libudev-static.patch b/sys-fs/udev/files/249-libudev-static.patch new file mode 100644 index 000..73375b716e9 --- /dev/null +++ b/sys-fs/udev/files/249-libudev-static.patch @@ -0,0 +1,26 @@ +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/udev-249.ebuild b/sys-fs/udev/udev-249-r1.ebuild similarity index 99% rename from sys-fs/udev/udev-249.ebuild rename to sys-fs/udev/udev-249-r1.ebuild index d23c86c0aeb..0154e132439 100644 --- a/sys-fs/udev/udev-249.ebuild +++ b/sys-fs/udev/udev-249-r1.ebuild @@ -94,6 +94,7 @@ pkg_setup() { src_prepare() { local PATCHES=( + "${FILESDIR}/249-libudev-static.patch" ) default
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/
commit: 8c90d2bd447948c268517c779d7ada27a2649949 Author: Mike Gilbert gentoo org> AuthorDate: Sun Jan 10 17:25:58 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Jan 10 17:55:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c90d2bd sys-fs/udev: move 40-gentoo.rules to FILESDIR Signed-off-by: Mike Gilbert gentoo.org> sys-fs/udev/files/40-gentoo.rules | 3 +++ sys-fs/udev/udev-.ebuild | 12 +--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/sys-fs/udev/files/40-gentoo.rules b/sys-fs/udev/files/40-gentoo.rules new file mode 100644 index 000..6b96bd07051 --- /dev/null +++ b/sys-fs/udev/files/40-gentoo.rules @@ -0,0 +1,3 @@ +# Gentoo specific groups +ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" +ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" diff --git a/sys-fs/udev/udev-.ebuild b/sys-fs/udev/udev-.ebuild index cf615425a34..f028328e33e 100644 --- a/sys-fs/udev/udev-.ebuild +++ b/sys-fs/udev/udev-.ebuild @@ -93,16 +93,6 @@ pkg_setup() { } src_prepare() { - 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 - - if [[ -d "${WORKDIR}/patches" ]]; then - eapply "${WORKDIR}/patches" - fi - local PATCHES=( ) @@ -222,7 +212,7 @@ multilib_src_install_all() { # see src_prepare() for content of 40-gentoo.rules insinto /lib/udev/rules.d - doins "${T}"/40-gentoo.rules + doins "${FILESDIR}"/40-gentoo.rules doins "${S}"/rules.d/*.rules dobashcomp shell-completion/bash/udevadm
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/
commit: dbb9fccb96b31a786aeedcaded94e9402de635ae Author: Mike Gilbert gentoo org> AuthorDate: Mon Oct 29 03:04:28 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Oct 30 01:15:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb9fccb sys-fs/udev: glibc-2.28 compat with stat.h Package-Manager: Portage-2.3.51_p2, Repoman-2.3.11_p27 Signed-off-by: Mike Gilbert gentoo.org> sys-fs/udev/files/239-stat-0.patch | 108 + sys-fs/udev/files/239-stat-1.patch | 74 + sys-fs/udev/udev-239.ebuild| 2 + 3 files changed, 184 insertions(+) diff --git a/sys-fs/udev/files/239-stat-0.patch b/sys-fs/udev/files/239-stat-0.patch new file mode 100644 index 000..e136b703a2f --- /dev/null +++ b/sys-fs/udev/files/239-stat-0.patch @@ -0,0 +1,108 @@ +From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001 +From: Filipe Brandenburger +Date: Sun, 15 Jul 2018 22:43:35 -0700 +Subject: [PATCH] build-sys: Detect whether struct statx is defined in + sys/stat.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a +definition for struct statx, in which case include file linux/stat.h should be +avoided, in order to prevent a duplicate definition. + +In file included from ../src/basic/missing.h:18, +from ../src/basic/util.h:28, +from ../src/basic/hashmap.h:10, +from ../src/shared/bus-util.h:12, +from ../src/libsystemd/sd-bus/bus-creds.c:11: +/usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’ + struct statx { + ^ +In file included from /usr/include/sys/stat.h:446, +from ../src/basic/util.h:19, +from ../src/basic/hashmap.h:10, +from ../src/shared/bus-util.h:12, +from ../src/libsystemd/sd-bus/bus-creds.c:11: +/usr/include/bits/statx.h:36:8: note: originally defined here + struct statx + ^ + +Extend our meson.build to look for struct statx when only sys/stat.h is +included and, in that case, do not include linux/stat.h anymore. + +Tested that systemd builds correctly when using a glibc version that includes a +definition for struct statx. + +glibc Fedora RPM update: +https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae + +glibc upstream commit: +https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd +--- + meson.build| 5 + + src/basic/missing.h| 5 - + src/basic/xattr-util.c | 1 - + 3 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index dd904c7148..68423bdfa5 100644 +--- a/meson.build b/meson.build +@@ -425,6 +425,7 @@ decl_headers = ''' + #include + ''' + # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail ++# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time + + foreach decl : ['char16_t', + 'char32_t', +@@ -439,6 +440,10 @@ foreach decl : ['char16_t', + conf.set10('HAVE_' + decl.underscorify().to_upper(), have) + endforeach + ++conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : ''' ++#include ++''', args : '-D_GNU_SOURCE') > 0) ++ + foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], + ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'], + ['IFLA_VRF_TABLE', 'linux/if_link.h'], +diff --git a/src/basic/missing.h b/src/basic/missing.h +index 71a07d0574..14ad3d4914 100644 +--- a/src/basic/missing.h b/src/basic/missing.h +@@ -15,7 +15,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -25,6 +24,10 @@ + #include + #include + ++#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H ++#include ++#endif ++ + #if HAVE_AUDIT + #include + #endif +diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c +index c5c55ea846..0ee0979837 100644 +--- a/src/basic/xattr-util.c b/src/basic/xattr-util.c +@@ -2,7 +2,6 @@ + + #include + #include +-#include + #include + #include + #include +-- +2.19.1 + diff --git a/sys-fs/udev/files/239-stat-1.patch b/sys-fs/udev/files/239-stat-1.patch new file mode 100644 index 000..1104de3c9c1 --- /dev/null +++ b/sys-fs/udev/files/239-stat-1.patch @@ -0,0 +1,74 @@ +From 9c869d08d82c73f62ab3527567858ce4b0cf1257 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 18 Jul 2018 17:26:17 +0200 +Subject: [PATCH] meson: unify linux/stat.h check with other checks and use + _GNU_SOURCE + +Using _GNU_SOURCE is better because that's how we include the headers in the +actual build, and some headers define different stuff when it is
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/
commit: abebe048fd7040d7f5ee143e3385953858011717 Author: Mike Gilbert gentoo org> AuthorDate: Sat Sep 29 15:26:33 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Sep 29 15:26:57 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abebe048 sys-fs/udev: rename meson debug option Closes: https://bugs.gentoo.org/667240 Signed-off-by: Mike Gilbert gentoo.org> Package-Manager: Portage-2.3.50_p2, Repoman-2.3.11_p9 sys-fs/udev/files/239-debug-extra.patch | 40 + sys-fs/udev/udev-239.ebuild | 3 ++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/sys-fs/udev/files/239-debug-extra.patch b/sys-fs/udev/files/239-debug-extra.patch new file mode 100644 index 000..19db590257c --- /dev/null +++ b/sys-fs/udev/files/239-debug-extra.patch @@ -0,0 +1,40 @@ +From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Sun, 19 Aug 2018 19:11:30 +0200 +Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra + +Meson added -Doptimization and -Ddebug options, which obviously causes +a conflict with our -Ddebug options. Let's rename it. + +Fixes #9883. +--- + meson.build | 2 +- + meson_options.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index f79ac4b12e7..2209c935ad6 100644 +--- a/meson.build b/meson.build +@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) + + enable_debug_hashmap = false + enable_debug_mmap_cache = false +-foreach name : get_option('debug') ++foreach name : get_option('debug-extra') + if name == 'hashmap' + enable_debug_hashmap = true + elif name == 'mmap-cache' +diff --git a/meson_options.txt b/meson_options.txt +index e3140c8c110..7b1f61bf464 100644 +--- a/meson_options.txt b/meson_options.txt +@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', +description : 'path to debug shell binary') + option('debug-tty', type : 'string', value : '/dev/tty9', +description : 'specify the tty device for debug shell') +-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], ++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], +description : 'enable extra debugging') + option('memory-accounting-default', type : 'boolean', +description : 'enable MemoryAccounting= by default') diff --git a/sys-fs/udev/udev-239.ebuild b/sys-fs/udev/udev-239.ebuild index b09e0c65e66..b6ffc09d185 100644 --- a/sys-fs/udev/udev-239.ebuild +++ b/sys-fs/udev/udev-239.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -83,6 +83,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}/236-uucp-group.patch" "${FILESDIR}/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch" + "${FILESDIR}/239-debug-extra.patch" ) default
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/
commit: f3a2f4fa829092888e04a46204f7552682ab704e Author: William Hubbs gentoo org> AuthorDate: Thu Jul 26 13:23:35 2018 + Commit: William Hubbs gentoo org> CommitDate: Thu Jul 26 13:23:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a2f4fa sys-fs/udev: removed several old versions Package-Manager: Portage-2.3.40, Repoman-2.3.9 sys-fs/udev/Manifest| 4 - sys-fs/udev/files/233-fix-includes.patch| 38 --- sys-fs/udev/files/233-format-warnings.patch | 84 - sys-fs/udev/metadata.xml| 2 - sys-fs/udev/udev-216.ebuild | 485 sys-fs/udev/udev-225-r1.ebuild | 426 sys-fs/udev/udev-233.ebuild | 405 --- 7 files changed, 1444 deletions(-) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 01bd656d0f2..8892a91fea5 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,7 +1,3 @@ -DIST systemd-216.tar.xz 3612960 BLAKE2B 677fa79e7a8dae5d62f37115c3087d89c46a28515c1fe48abbd77016ee41565583e407913b5a9738908436a2ccc36a1d3305392d8dfa5ac053a44ca66d587611 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 -DIST systemd-225.tar.gz 3878442 BLAKE2B 24bf9f6bfdd7d7c585829c1b172f73e669e137020b990ecd07dffafbe6890f1819e6c8efd5b322008473a62007a4a6f6ab2fb209be7db4ecb89a2bc01d60aaab SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 -DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e 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 udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4 diff --git a/sys-fs/udev/files/233-fix-includes.patch b/sys-fs/udev/files/233-fix-includes.patch deleted file mode 100644 index 44b06214f89..000 --- a/sys-fs/udev/files/233-fix-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/files/233-format-warnings.patch b/sys-fs/udev/files/233-format-warnings.patch deleted file mode 100644 index 7bb08f0a320..000 --- a/sys-fs/udev/files/233-format-warnings.patch +++ /dev/null @@ -1,84 +0,0 @@ -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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/
commit: a6af105145328ed25fb7325942507dbbba762643 Author: William Hubbs gentoo org> AuthorDate: Tue Jul 10 19:43:26 2018 + Commit: William Hubbs gentoo org> CommitDate: Tue Jul 10 19:44:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6af1051 sys-fs/udev: 239 version bump Package-Manager: Portage-2.3.40, Repoman-2.3.9 sys-fs/udev/Manifest | 1 + ...issing-comma-in-raw_clone-assembly-for-sp.patch | 29 ++ sys-fs/udev/udev-239.ebuild| 324 + 3 files changed, 354 insertions(+) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 879d26bb80f..01bd656d0f2 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-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 udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4 diff --git a/sys-fs/udev/files/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch b/sys-fs/udev/files/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch new file mode 100644 index 000..5f253bbaab9 --- /dev/null +++ b/sys-fs/udev/files/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch @@ -0,0 +1,29 @@ +From 7a022d7583f13fb3d4fb437d386364782f4efa88 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Wed, 27 Jun 2018 10:36:50 -0400 +Subject: [PATCH 18/19] basic: add missing comma in raw_clone assembly for + sparc + +Fixes: 96f64eb5741b157f26a9089816fdd992e959792e +Closes: https://github.com/systemd/systemd/issues/9444 +(cherry picked from commit 358248caa3eca525751694de7c34b16bb46d5a9c) +--- + src/basic/raw-clone.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h +index 1f134ba7f..b8857b0cd 100644 +--- a/src/basic/raw-clone.h b/src/basic/raw-clone.h +@@ -60,7 +60,7 @@ static inline pid_t raw_clone(unsigned long flags) { + "mov %%o0, %1" : + "=r"(in_child), "=r"(child_pid), "=r"(error) : + "i"(__NR_clone), "r"(flags) : +- "%o1", "%o0", "%g1" "cc" ); ++ "%o1", "%o0", "%g1", "cc" ); + + if (error) { + errno = child_pid; +-- +2.18.0.rc2 + diff --git a/sys-fs/udev/udev-239.ebuild b/sys-fs/udev/udev-239.ebuild new file mode 100644 index 000..b09e0c65e66 --- /dev/null +++ b/sys-fs/udev/udev-239.ebuild @@ -0,0 +1,324 @@ +# Copyright 1999-2018 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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/
commit: 441221345e1852d21798290de7464f97bc07608c Author: Mike Gilbert floppym AT gentoo DOT org AuthorDate: Sat Aug 22 22:07:00 2015 + Commit: Mike Gilbert floppym AT gentoo DOT org CommitDate: Sat Aug 22 22:07:00 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44122134 sys-fs/udev: Backport build fix on alpha Bug: https://bugs.gentoo.org/543900 Package-Manager: portage-2.2.20_p134 sys-fs/udev/Manifest | 4 --- ...e-getxpid-syscall-on-alpha-for-raw_getpid.patch | 30 ++ sys-fs/udev/udev-224-r2.ebuild | 2 ++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 9875832..e21e829 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,15 +1,11 @@ -DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03 DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494 DIST systemd-217.tar.xz 3694524 SHA256 a031e6fbcdc7077b37338bae8074d9428ee2fa98033beb4923a62871890f7498 SHA512 7a0b13330b621ec179499018bfbe9619a91cdbd120ae2067e19cbb9bbc25c80dd0f80aac217d823be1332054439bc9b2153ac78fc1eb231fa0fd55cb3bf7a70f WHIRLPOOL f22674a629b7b928875b6b06b0cffaf5874cdcb90c44787279cd8ff2a798e5bc525c1058f8b2bfe746d100c4d7686e36a6f604276d5735f7554122e4caad6689 DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b09075010a97c7aa08eee3fd59b SHA512 c183cce8532ccb4716b84587c96a626eea390202a5469b9d89c8cee7f703e40d7c584e05f29501d375b8cd2a1409d011de564df16f54e27f66b3c3007a6e5bd4 WHIRLPOOL 4d0bcf3ddfecd3354d9f4ab13851f8da6baf31e89e64d3b1ac671159f16f23597d88cc2525aece2f867c140fc97e80bce086a5af91f84b8095e2503c13995e6d DIST systemd-219.tar.xz 3938228 SHA256 5c57113454e37c040d0cb481bd960ae7cf3a3fe0a231ff4945259bc74503f2d9 SHA512 19a92891996723bbd83fe745f365d25b2879a059466670aebb9e9fbb6a79a3ed6e1a93e8b76042605038766cabad3ddb89aff40b4a11ab830ffa7dc64f87234f WHIRLPOOL 440868c47bed26571084009fa86d267c921cd5cbbc63b596c1161ef7f33a1b9427ad315450014cd729c761b27bf42542c3b0b7ca68e09b23fc8f606147e7e9fb DIST systemd-220.tar.xz 4036028 SHA256 3659588c40221ee7257502c0735491f72796dbe17be560013f6d310deb446332 SHA512 c309b4309f8b8d2d97450fb281053feec7b89227626b69e37f3a0d2154c2810c217e58e218f17da11c04f703c6196cec21c4afdcf63879bc736bbdca058a5da5 WHIRLPOOL 2f8974eacb706987e85c7907a517f6b2d47b009f9259a36375537c8bd09bc4774c81e8dc853aa83e644d7c1b579f5113d0bb8a504c7caa5a9240750f9936d561 -DIST udev-208-patches-1.tar.xz 964 SHA256 b2df84afd8631736aceee1317d332fd9bee347df503aa55cd78bcf1b375e8f75 SHA512 6e85daaf8639255bbaa76364cda02f8b034ec5f687730a7e3ea7427b53031b4cdcbe1b8758e1474104d52e04781605ee3c1e31bbec2df33c95e606cee8eb0f28 WHIRLPOOL 054d1e954c4eacd10fcdacf130bf6cf2dd165f3da10ba5629f4bd8e488a221e8e5d7db3ab821593af8dd92011dee98daadf09e5dd726a4c99861f4abaea6aca0 DIST udev-216-patches-2.tar.xz 1264 SHA256 18b7b8f852f11c2ac2a58458462ce686ebec48859562df99c5b9c29c95ddfa3c SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4 WHIRLPOOL 8f93f982de2d1fa10f7e3c6541c559f2c881730276498b14d4d27b8577bdb340d49b2dc7a50a40e8a13fcabbbabb3dfa5f1605aa842e325d12c17e82d2dc787b DIST udev-217-patches-1.tar.xz 616 SHA256 80c0e57caa2845164b3fda1a9a74d07763a6b18e55c6e1ec60c0d888cdf24cf8 SHA512 e0ffd9c515c79da30b51448f1a78f6cc442ca595dd0bcd0f766fee31fd1324af6b820238ab342c8e40d6953ce17b872344deb0e7d1803830952d7dcc6f3479cd WHIRLPOOL a4e28fdae7b67fcd65a2d0fbf7e080e9dde6b4cdaacaa845d2bffc26717aa8f7a498fc0e6ad6edf8a553759a0f4b4ddb5da768211b294a1b37a21eecc225cf10 DIST udev-218-patches-1.tar.xz 616 SHA256 80c0e57caa2845164b3fda1a9a74d07763a6b18e55c6e1ec60c0d888cdf24cf8 SHA512 e0ffd9c515c79da30b51448f1a78f6cc442ca595dd0bcd0f766fee31fd1324af6b820238ab342c8e40d6953ce17b872344deb0e7d1803830952d7dcc6f3479cd WHIRLPOOL a4e28fdae7b67fcd65a2d0fbf7e080e9dde6b4cdaacaa845d2bffc26717aa8f7a498fc0e6ad6edf8a553759a0f4b4ddb5da768211b294a1b37a21eecc225cf10 -DIST udev-220-patches-1.tar.xz 1760 SHA256 ac2e778776db9dc13d431b871d5b67aad378bc4bd0b7108476500313ab9c8d2a SHA512 0cbaf904a5aadedfc3bd8aee735f700b2489112e51938ea54ed34a7fdef4e8f26749eb251a82bbc409fb631f1abc4f70c732cf9b2de7ced739efd3cfadcd5cc2 WHIRLPOOL