- rediffed, release 2

diff --git a/udev-libexecdir.patch b/udev-libexecdir.patch
index d0a29b64416788671c7964f5b0fb8827930f9ef4..47a70c4b2bdbe5f3ffec981512cff7a9c9830c66 100644 (file)
--- a/udev-libexecdir.patch
+++ b/udev-libexecdir.patch
@@ -1,8 +1,8 @@
-diff -ur eudev-2.1.1.orig/configure.ac eudev-2.1.1/configure.ac
---- eudev-2.1.1.orig/configure.ac      2014-10-29 20:19:58.000000000 +0000
-+++ eudev-2.1.1/configure.ac   2015-01-30 13:20:36.433000000 +0000
-@@ -128,6 +128,15 @@
-         [with_rootlibexecdir=${with_rootlibdir}/udev]
+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]
  )
  
 +AC_ARG_WITH(
@@ -17,9 +17,9 @@ diff -ur eudev-2.1.1.orig/configure.ac eudev-2.1.1/configure.ac
  AC_ARG_ENABLE(
          [split-usr],
          [AS_HELP_STRING(
-@@ -149,15 +158,15 @@
- AC_SUBST([rootprefix], [$with_rootprefix])
- AC_SUBST([rootlibdir], [$with_rootlibdir])
+@@ -168,15 +177,15 @@ AS_IF(
+ AC_SUBST([rootprefix], [${with_rootprefix}])
+ AC_SUBST([rootlibdir], [${with_rootlibdir}])
  AC_SUBST([rootlibexecdir], [${with_rootlibexecdir}])
 -AC_SUBST([udevlibexecdir], [${rootlibexecdir}])
 +AC_SUBST([udevlibexecdir], [${with_udevlibexecdir}])
@@ -35,8 +35,8 @@ diff -ur eudev-2.1.1.orig/configure.ac eudev-2.1.1/configure.ac
  AC_SUBST([udevkeymapdir],[${udevlibexecdir}/keymaps])
  AC_SUBST([udevkeymapforceredir],[${udevkeymapdir}/force-release])
  AC_SUBST([udevrulesdir],[${udevlibexecdir}/rules.d])
-@@ -389,10 +398,10 @@
-         datarootdir:             ${datarootdir}
+@@ -340,10 +349,10 @@ AC_MSG_RESULT([
+         rootrundir:              ${rootrundir}
  
          udevconfdir:             ${udevconfdir}
 +        udevlibexecdir:          ${udevlibexecdir}

diff --git a/udev-ploop-rules.patch b/udev-ploop-rules.patch
index 3b7c480c81ccc6f9ffc310aebaa61695097edc4b..c8d7979321c5022b83349fd9dc1536eb964db492 100644 (file)
--- a/udev-ploop-rules.patch
+++ b/udev-ploop-rules.patch
@@ -1,9 +1,9 @@
-diff -ru udev-182.orig/rules/60-persistent-storage.rules udev-182/rules/60-persistent-storage.rules
---- udev-182.orig/rules/60-persistent-storage.rules    2012-02-23 16:26:16.000000000 +0100
-+++ udev-182/rules/60-persistent-storage.rules 2012-05-24 11:23:01.000000000 +0200
-@@ -16,6 +16,8 @@
- # skip rules for inappropriate block devices
- KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end"
+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"
  
 +KERNEL=="ploop*", GOTO="persistent_storage_end"
 +

diff --git a/udev.spec b/udev.spec
index ab2d2021d82bfd764cb5fabc397c4e268b0bf79a..a012cbd3f71daff050c8c24885b89cccfdf43fe7 100644 (file)
--- a/udev.spec
+++ b/udev.spec
@@ -9,7 +9,7 @@ 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:       1
+Release:       2
 Epoch:         2
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base