From patchwork Sun Oct 8 19:57:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7275 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4S3XyR1HGDz3wmX for ; Sun, 8 Oct 2023 19:57:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4S3XyM3Zsmz1fS; Sun, 8 Oct 2023 19:57:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4S3XyM0DSPz309N; Sun, 8 Oct 2023 19:57:47 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4S3XyJ1xVXz2xN7 for ; Sun, 8 Oct 2023 19:57:44 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4S3XyH4QL6zkt; Sun, 8 Oct 2023 19:57:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1696795063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v7K0oxvC19BpqTGOV27x03Bv4FE1R+Yhhukr/qJ+/1I=; b=Xl7r9ZK8Hbf0P3RF9Vk+lOm95qmNjItRAz9tPaMmYWrRK6QlAnFf1PRsCmnNtJgA1x+8Xr +WoLsqwFuavkxL9UU7rpqgFl5i3W3zAHn3RSelOkskUdL7oeH5jCl5Jh5YoqNVGu0+yu0s d6Zo5Ukh0m+U7Us3SIO9ZrKhh+c1/ShxeocucnwnMvmsIXZ7OMt4enkmCKb1H4yaMcLxtW MrsgoVC9OrI7lKep1YsY2tF0YDp7ZKuUBW2ymw4qJFaf/e9kkmiKC7JIB3AilvSTxU/4YX MGauERNPlm9Qiku/LQFRFb4wlM1q7/4tqvvF9bzx5co3BPRU7aaqtF1xwmH7Iw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1696795063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v7K0oxvC19BpqTGOV27x03Bv4FE1R+Yhhukr/qJ+/1I=; b=Idocac6jGADJDwHGU4gwpeWHOMfSB0zxMYblVC0N1NeFUHIPnId39f580xot4Lmn172w+8 IWp9BmB40+eEZ1DQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] udev: Update to version 3.2.14 Date: Sun, 8 Oct 2023 21:57:37 +0200 Message-ID: <20231008195737.1026705-2-adolf.belka@ipfire.org> In-Reply-To: <20231008195737.1026705-1-adolf.belka@ipfire.org> References: <20231008195737.1026705-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: EOW6X7HVII3XAUBJ7S6RUIOOIVHNGTRJ X-Message-ID-Hash: EOW6X7HVII3XAUBJ7S6RUIOOIVHNGTRJ X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Update from version 3.2.12 to 3.2.14 - Update of rootfile not required - This version update includes the patches previously used to add the dummies for tags and to update to udev version 251 which is bugfix #253 - Changelog 3.2.14 Clear sysattr cache if a null pointer is passed by @NaofumiHonda in #255 Add /usr/local/lib/udev/rules.d by @bbonev in #260 Fix := not preventing further assignments to RUN by @bbonev in #257 Let libudev find hwdb.bin under UDEV_HWDB_BIN by @vivien-consider-dropping-github in #264 Add a generic --output argument to udevadm hwdb by @vivien-consider-dropping-github in #263 Dynamically get the udevadm hwdb files with a path variable by @vivien-consider-dropping-github in #262 More wording fixes for the manual page for udev by @vivien-consider-dropping-github in #265 Add missing API from 247 by @bbonev in #253 Ensure that standard file descriptors are open by @bbonev in #266 Signed-off-by: Adolf Belka --- lfs/udev | 6 +- ...udev-3.2.12_Bump_udev_version_to_251.patch | 11 --- ...2.12_Export_dummies_for_current_tags.patch | 81 ------------------- 3 files changed, 2 insertions(+), 96 deletions(-) delete mode 100644 src/patches/eudev-3.2.12_Bump_udev_version_to_251.patch delete mode 100644 src/patches/eudev-3.2.12_Export_dummies_for_current_tags.patch diff --git a/lfs/udev b/lfs/udev index 9cb310875..3a9c416b5 100644 --- a/lfs/udev +++ b/lfs/udev @@ -24,7 +24,7 @@ include Config -VER = 3.2.12 +VER = 3.2.14 RULES_VER = 20171102 THISAPP = eudev-$(VER) @@ -42,7 +42,7 @@ objects = $(DL_FILE) udev-lfs-$(RULES_VER).tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) udev-lfs-$(RULES_VER).tar.bz2 = $(DL_FROM)/udev-lfs-$(RULES_VER).tar.bz2 -$(DL_FILE)_BLAKE2 = 1d2dcc158432f722904f645749420cb44ff98f68b8b8fc11917e83750c95280d0dc2c4d9a322909a4acdb9455c6ec373eade77aacb1039096daa8e642076d3d1 +$(DL_FILE)_BLAKE2 = 7d68e77012288ecfac43be31f724224d371cb1084238fe045df248927eff854dbb391ad501e2a36d9b5ea4eb0a8cba3f9f21ea668908584a24c2a65df93ffdf8 udev-lfs-$(RULES_VER).tar.bz2_BLAKE2 = b5fb8177a87719e28adc976b83953024dbcfb8739b0c2e61da186cbc4df5e75e62c888da987d15c64db164002bb0a1e66ce0ff206b143dc953d7571b66d5d5c0 install : $(TARGET) @@ -74,8 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(RULES_VER).tar.bz2 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/eudev-3.2.12_Bump_udev_version_to_251.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/eudev-3.2.12_Export_dummies_for_current_tags.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --bindir=/bin \ diff --git a/src/patches/eudev-3.2.12_Bump_udev_version_to_251.patch b/src/patches/eudev-3.2.12_Bump_udev_version_to_251.patch deleted file mode 100644 index 459d1b6df..000000000 --- a/src/patches/eudev-3.2.12_Bump_udev_version_to_251.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- eudev-3.2.12/configure.orig 2023-05-16 16:20:07.000000000 +0200 -+++ eudev-3.2.12/configure 2023-09-05 14:50:58.167510924 +0200 -@@ -3408,7 +3408,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --UDEV_VERSION=243 -+UDEV_VERSION=251 - - - diff --git a/src/patches/eudev-3.2.12_Export_dummies_for_current_tags.patch b/src/patches/eudev-3.2.12_Export_dummies_for_current_tags.patch deleted file mode 100644 index e0563ab17..000000000 --- a/src/patches/eudev-3.2.12_Export_dummies_for_current_tags.patch +++ /dev/null @@ -1,81 +0,0 @@ -From dacff83d872c1dcb563439f98c9b974e244fcd46 Mon Sep 17 00:00:00 2001 -From: Boian Bonev -Date: Fri, 11 Aug 2023 23:14:02 +0000 -Subject: [PATCH] Export dummies for - - - udev_device_has_current_tag - - udev_device_get_current_tags_list_entry - -since the current eudev device database does not support the concept of -current tags ---- - src/libudev/libudev-device.c | 11 +++++++++++ - src/libudev/libudev.h | 2 ++ - src/libudev/libudev.sym | 6 ++++++ - 3 files changed, 19 insertions(+) - -diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c -index ac67ce846..7d7a6622e 100644 ---- a/src/libudev/libudev-device.c -+++ b/src/libudev/libudev-device.c -@@ -1819,6 +1819,12 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev - return udev_list_get_entry(&udev_device->tags_list); - } - -+_public_ struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device) -+{ -+ // TODO: eudev database does not support current tags -+ return udev_device_get_tags_list_entry(udev_device); -+} -+ - /** - * udev_device_has_tag: - * @udev_device: udev device -@@ -1842,6 +1848,11 @@ _public_ int udev_device_has_tag(struct udev_device *udev_device, const char *ta - return false; - } - -+_public_ int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag) { -+ // TODO: eudev database does not support current tags -+ return udev_device_has_tag(udev_device, tag); -+} -+ - #define ENVP_SIZE 128 - #define MONITOR_BUF_SIZE 4096 - static int update_envp_monitor_buf(struct udev_device *udev_device) -diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h -index 8491d2b81..0202964d6 100644 ---- a/src/libudev/libudev.h -+++ b/src/libudev/libudev.h -@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device *udev_device); - struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device); - struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device); - struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device); -+struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device); - struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device); - const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key); - const char *udev_device_get_driver(struct udev_device *udev_device); -@@ -110,6 +111,7 @@ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device - const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr); - int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value); - int udev_device_has_tag(struct udev_device *udev_device, const char *tag); -+int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag); - - /* - * udev_monitor -diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym -index 76726fca7..d56c2aeab 100644 ---- a/src/libudev/libudev.sym -+++ b/src/libudev/libudev.sym -@@ -118,3 +118,9 @@ global: - udev_queue_flush; - udev_queue_get_fd; - } LIBUDEV_199; -+ -+LIBUDEV_247 { -+global: -+ udev_device_has_current_tag; -+ udev_device_get_current_tags_list_entry; -+} LIBUDEV_215; - -