diff --git a/.gitignore b/.gitignore index c5032ce..e20255e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /kmod-16.tar.xz /kmod-17.tar.xz /kmod-18.tar.xz +/kmod-19.tar.xz diff --git a/0001-static-nodes-indicate-that-creation-of-static-nodes-.patch b/0001-static-nodes-indicate-that-creation-of-static-nodes-.patch deleted file mode 100644 index f8cb8f7..0000000 --- a/0001-static-nodes-indicate-that-creation-of-static-nodes-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 27eceb2e4ecbf2e31940b67cee682a6935f61e6c Mon Sep 17 00:00:00 2001 -From: Tom Gundersen -Date: Mon, 27 Oct 2014 17:55:03 +0100 -Subject: [PATCH] static-nodes: indicate that creation of static nodes should - only happen at boot - -udev will only manage static nodes that exist at the time udev is started, so -creating static nodes later on will likely not behave as expected. In -particular, recreating the static nodes at run-time will reset any permissions -udev may have applied to the nodes at boot. - -See and the discussion -following . - -Note that this requires (the yet to be released) systemd v217 or a backport -of systemd patch 8c94052ee543c3598a3c7b0c46688150aa2c6168. ---- - tools/static-nodes.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/static-nodes.c b/tools/static-nodes.c -index d1e3b6e..8d2356d 100644 ---- a/tools/static-nodes.c -+++ b/tools/static-nodes.c -@@ -96,7 +96,7 @@ static int write_tmpfiles(FILE *out, char modname[], char devname[], char type, - return EXIT_FAILURE; - } - -- ret = fprintf(out, "%c /dev/%s 0600 - - - %u:%u\n", -+ ret = fprintf(out, "%c! /dev/%s 0600 - - - %u:%u\n", - type, devname, maj, min); - if (ret < 0) - return EXIT_FAILURE; --- -1.9.3 - diff --git a/kmod.spec b/kmod.spec index 5a5075c..156cbd6 100644 --- a/kmod.spec +++ b/kmod.spec @@ -1,6 +1,6 @@ Name: kmod -Version: 18 -Release: 4%{?dist} +Version: 19 +Release: 1%{?dist} Summary: Linux kernel module management utilities Group: System Environment/Kernel @@ -22,8 +22,6 @@ Provides: module-init-tools = 4.0-1 Obsoletes: module-init-tools < 4.0-1 Provides: /sbin/modprobe -Patch1: 0001-static-nodes-indicate-that-creation-of-static-nodes-.patch - %description The kmod package provides various programs needed for automatic loading and unloading of modules under 2.6, 3.x, and later kernels, as well @@ -50,7 +48,6 @@ applications that wish to load or unload Linux kernel modules. %prep %setup -q -%patch1 -p1 %build export V=1 @@ -114,6 +111,9 @@ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/weak-modules %{_libdir}/libkmod.so %changelog +* Sun Nov 16 2014 Josh Boyer - 19-1 +- Update to version 19 + * Wed Oct 29 2014 Josh Boyer - 18-4 - Backport patch to fix device node permissions (rhbz 1147248) diff --git a/sources b/sources index aa8eb9b..afedb25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82835c7f01983634e06ca72b4ee30cc6 kmod-18.tar.xz +a08643f814aa4efc12211c6e5909f4d9 kmod-19.tar.xz