- update to 3.2.12

diff --git a/udev-libexecdir.patch b/udev-libexecdir.patch
index 47a70c4b2bdbe5f3ffec981512cff7a9c9830c66..3b2d5b85bd284aae35c26219cf93574bfdd1f5f8 100644 (file)
--- a/udev-libexecdir.patch
+++ b/udev-libexecdir.patch
@@ -1,8 +1,8 @@
-diff -urNp -x '*.orig' eudev-3.2.9.org/configure.ac eudev-3.2.9/configure.ac
---- eudev-3.2.9.org/configure.ac       2019-10-26 22:17:49.000000000 +0200
-+++ eudev-3.2.9/configure.ac   2021-03-21 11:36:54.687515690 +0100
-@@ -147,6 +147,15 @@ AC_ARG_WITH(
-         [with_rootrundir=/run]
+diff -ur eudev-3.2.12.orig/configure.ac eudev-3.2.12/configure.ac
+--- eudev-3.2.12.orig/configure.ac     2023-07-18 15:38:51.005165860 +0200
++++ eudev-3.2.12/configure.ac  2023-07-18 15:40:15.159408657 +0200
+@@ -145,6 +145,15 @@
+       [with_rootrundir=/run]
  )
  
 +AC_ARG_WITH(
@@ -15,9 +15,9 @@ diff -urNp -x '*.orig' eudev-3.2.9.org/configure.ac eudev-3.2.9/configure.ac
 +)
 +
  AC_ARG_ENABLE(
-         [split-usr],
-         [AS_HELP_STRING(
-@@ -168,15 +177,15 @@ AS_IF(
+       [split-usr],
+       [AS_HELP_STRING(
+@@ -166,15 +175,15 @@
  AC_SUBST([rootprefix], [${with_rootprefix}])
  AC_SUBST([rootlibdir], [${with_rootlibdir}])
  AC_SUBST([rootlibexecdir], [${with_rootlibexecdir}])
@@ -35,16 +35,3 @@ diff -urNp -x '*.orig' eudev-3.2.9.org/configure.ac eudev-3.2.9/configure.ac
  AC_SUBST([udevkeymapdir],[${udevlibexecdir}/keymaps])
  AC_SUBST([udevkeymapforceredir],[${udevkeymapdir}/force-release])
  AC_SUBST([udevrulesdir],[${udevlibexecdir}/rules.d])
-@@ -340,10 +349,10 @@ AC_MSG_RESULT([
-         rootrundir:              ${rootrundir}
- 
-         udevconfdir:             ${udevconfdir}
-+        udevlibexecdir:          ${udevlibexecdir}
-         udevconffile:            ${udevconffile}
--        udevhwdbdir:             ${udevhwdbdir}
-         udevhwdbbin:             ${udevhwdbbin}
--        udevlibexecdir:          ${udevlibexecdir}
-+        udevhwdbdir:             ${udevhwdbdir}
-         udevkeymapdir:           ${udevkeymapdir}
-         udevkeymapforceredir:    ${udevkeymapforceredir}
-         udevrulesdir:            ${udevrulesdir}

diff --git a/udev-net.ifnames.patch b/udev-net.ifnames.patch
index 5749ab59962353b61368906ae4f48b0c729c50be..35c35d6a91d8ff77baaaf9323f46e799892491c3 100644 (file)
--- a/udev-net.ifnames.patch
+++ b/udev-net.ifnames.patch
@@ -1,6 +1,6 @@
-diff -ur eudev-3.1.2.orig/rules/80-net-name-slot.rules eudev-3.1.2/rules/80-net-name-slot.rules
---- eudev-3.1.2.orig/rules/80-net-name-slot.rules      2015-06-02 14:08:44.000000000 +0000
-+++ eudev-3.1.2/rules/80-net-name-slot.rules   2015-07-23 18:59:41.569173961 +0000
+diff -ur eudev-3.2.12.orig/rules/80-net-name-slot.rules eudev-3.2.12/rules/80-net-name-slot.rules
+--- eudev-3.2.12.orig/rules/80-net-name-slot.rules     2023-07-18 15:43:45.132509561 +0200
++++ eudev-3.2.12/rules/80-net-name-slot.rules  2023-07-18 15:44:00.123730954 +0200
 @@ -5,7 +5,7 @@
  NAME!="", GOTO="net_name_slot_end"
  

diff --git a/udev-ploop-rules.patch b/udev-ploop-rules.patch
index c8d7979321c5022b83349fd9dc1536eb964db492..199e9b6d81b0dc6a5e553412c3dd7308be95a494 100644 (file)
--- a/udev-ploop-rules.patch
+++ b/udev-ploop-rules.patch
@@ -1,9 +1,9 @@
-diff -urNp -x '*.orig' eudev-3.2.9.org/rules/60-persistent-storage.rules eudev-3.2.9/rules/60-persistent-storage.rules
---- eudev-3.2.9.org/rules/60-persistent-storage.rules  2018-02-20 13:36:20.000000000 +0100
-+++ eudev-3.2.9/rules/60-persistent-storage.rules      2021-03-21 11:36:45.105515690 +0100
-@@ -9,6 +9,8 @@ ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULE
- SUBSYSTEM!="block", GOTO="persistent_storage_end"
- KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*", GOTO="persistent_storage_end"
+diff -ur eudev-3.2.12.orig/rules/60-persistent-storage.rules eudev-3.2.12/rules/60-persistent-storage.rules
+--- eudev-3.2.12.orig/rules/60-persistent-storage.rules        2022-06-23 22:00:01.000000000 +0200
++++ eudev-3.2.12/rules/60-persistent-storage.rules     2023-07-18 15:37:48.232238827 +0200
+@@ -9,6 +9,8 @@
+ SUBSYSTEM!="block|ubi", GOTO="persistent_storage_end"
+ KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end"
  
 +KERNEL=="ploop*", GOTO="persistent_storage_end"
 +

diff --git a/udev.spec b/udev.spec
index 15630b6d275ba2791a19f92e5836647315cab5aa..ff50020c4fb817f4bb18b8746ccbb5cbccffafbf 100644 (file)
--- a/udev.spec
+++ b/udev.spec
@@ -1,6 +1,3 @@
-# TODO:
-#   - get rules patches from systemd (if any)
-#
 # Conditional build:
 %bcond_without selinux         # without SELinux support
 %bcond_with    apidocs         # with API docs
@@ -8,13 +5,13 @@
 Summary:       Device manager for the Linux kernel
 Summary(pl.UTF-8):     Zarządca urządzeń dla jądra Linuksa
 Name:          udev
-Version:       3.2.9
-Release:       3
+Version:       3.2.12
+Release:       1
 Epoch:         2
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
-Source0:       http://dev.gentoo.org/~blueness/eudev/eudev-%{version}.tar.gz
-# Source0-md5: dedfb1964f6098fe9320de827957331f
+Source0:       https://github.com/eudev-project/eudev/releases/download/v%{version}/eudev-%{version}.tar.gz
+# Source0-md5: 6f1559ca7c27013ff68816e2732498a3
 # rules
 Source101:     udev-alsa.rules
 Source102:     udev.rules
@@ -266,6 +263,8 @@ fi
 
 %attr(755,root,root) /lib/udev/ata_id
 %attr(755,root,root) /lib/udev/cdrom_id
+%attr(755,root,root) /lib/udev/dmi_memory_id
+%attr(755,root,root) /lib/udev/fido_id
 %attr(755,root,root) /lib/udev/mtd_probe
 %attr(755,root,root) /lib/udev/scsi_id
 %attr(755,root,root) /lib/udev/v4l_id
@@ -276,6 +275,7 @@ fi
 /lib/udev/hwdb.d/20-OUI.hwdb
 /lib/udev/hwdb.d/20-acpi-vendor.hwdb
 /lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
+/lib/udev/hwdb.d/20-dmi-id.hwdb
 /lib/udev/hwdb.d/20-net-ifname.hwdb
 /lib/udev/hwdb.d/20-pci-classes.hwdb
 /lib/udev/hwdb.d/20-pci-vendor-model.hwdb
@@ -284,12 +284,22 @@ fi
 /lib/udev/hwdb.d/20-usb-classes.hwdb
 /lib/udev/hwdb.d/20-usb-vendor-model.hwdb
 /lib/udev/hwdb.d/20-vmbus-class.hwdb
+/lib/udev/hwdb.d/60-autosuspend.hwdb
+/lib/udev/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
 /lib/udev/hwdb.d/60-evdev.hwdb
+/lib/udev/hwdb.d/60-input-id.hwdb
 /lib/udev/hwdb.d/60-keyboard.hwdb
+/lib/udev/hwdb.d/60-seat.hwdb
 /lib/udev/hwdb.d/60-sensor.hwdb
+/lib/udev/hwdb.d/70-analyzers.hwdb
+/lib/udev/hwdb.d/70-av-production.hwdb
+/lib/udev/hwdb.d/70-cameras.hwdb
+/lib/udev/hwdb.d/70-joystick.hwdb
 /lib/udev/hwdb.d/70-mouse.hwdb
+/lib/udev/hwdb.d/70-pda.hwdb
 /lib/udev/hwdb.d/70-pointingstick.hwdb
 /lib/udev/hwdb.d/70-touchpad.hwdb
+/lib/udev/hwdb.d/80-ieee1394-unit-function.hwdb
 
 %attr(755,root,root) %{_sbindir}/start_udev
 %attr(755,root,root) %{_sbindir}/udevd
@@ -311,10 +321,12 @@ fi
 
 # rules below are NOT supposed to be changed by users
 /lib/udev/rules.d/50-udev-default.rules
+/lib/udev/rules.d/60-autosuspend.rules
 /lib/udev/rules.d/60-cdrom_id.rules
 /lib/udev/rules.d/60-block.rules
 /lib/udev/rules.d/60-drm.rules
 /lib/udev/rules.d/60-evdev.rules
+/lib/udev/rules.d/60-fido-id.rules
 /lib/udev/rules.d/60-input-id.rules
 /lib/udev/rules.d/60-persistent-alsa.rules
 /lib/udev/rules.d/60-persistent-input.rules
@@ -324,7 +336,9 @@ fi
 /lib/udev/rules.d/60-sensor.rules
 /lib/udev/rules.d/60-serial.rules
 /lib/udev/rules.d/64-btrfs.rules
+/lib/udev/rules.d/70-camera.rules
 /lib/udev/rules.d/70-joystick.rules
+/lib/udev/rules.d/70-memory.rules
 /lib/udev/rules.d/70-mouse.rules
 /lib/udev/rules.d/70-touchpad.rules
 /lib/udev/rules.d/75-net-description.rules
@@ -332,7 +346,10 @@ fi
 /lib/udev/rules.d/78-sound-card.rules
 /lib/udev/rules.d/80-drivers.rules
 /lib/udev/rules.d/80-net-name-slot.rules
+/lib/udev/rules.d/81-net-dhcp.rules
+
 %{_mandir}/man5/udev.conf.5*
+%{_mandir}/man7/hwdb.7*
 %{_mandir}/man7/udev.7*
 %{_mandir}/man8/udevadm.8*
 %{_mandir}/man8/udevd.8*