diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,3 +1,4 @@ libc.so.6 liblzma.so.5 libz.so.1 +libzstd.so.1 diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -1,11 +1,9 @@ -libc.so.6:_IO_putc libc.so.6:__asprintf_chk libc.so.6:__assert_fail libc.so.6:__ctype_b_loc libc.so.6:__errno_location libc.so.6:__fprintf_chk -libc.so.6:__fxstat -libc.so.6:__fxstatat +libc.so.6:__isoc99_sscanf libc.so.6:__libc_start_main libc.so.6:__memcpy_chk libc.so.6:__printf_chk @@ -13,10 +11,10 @@ libc.so.6:__snprintf_chk libc.so.6:__sprintf_chk libc.so.6:__stack_chk_fail +libc.so.6:__strncpy_chk libc.so.6:__syslog_chk libc.so.6:__vasprintf_chk libc.so.6:__vfprintf_chk -libc.so.6:__xstat libc.so.6:basename libc.so.6:bsearch libc.so.6:calloc @@ -39,15 +37,20 @@ libc.so.6:fread libc.so.6:free libc.so.6:fseek +libc.so.6:fstat +libc.so.6:fstatat libc.so.6:ftell libc.so.6:fwrite libc.so.6:get_current_dir_name libc.so.6:getc_unlocked libc.so.6:getenv libc.so.6:getopt_long +libc.so.6:getpid +libc.so.6:gettimeofday libc.so.6:init_module libc.so.6:lseek libc.so.6:malloc +libc.so.6:memchr libc.so.6:memcmp libc.so.6:memmove libc.so.6:mkdir @@ -59,7 +62,9 @@ libc.so.6:openlog libc.so.6:optarg libc.so.6:optind +libc.so.6:pread libc.so.6:program_invocation_short_name +libc.so.6:putc libc.so.6:putchar libc.so.6:puts libc.so.6:qsort @@ -72,7 +77,7 @@ libc.so.6:renameat libc.so.6:secure_getenv libc.so.6:setenv -libc.so.6:sscanf +libc.so.6:stat libc.so.6:stderr libc.so.6:stdout libc.so.6:strchr @@ -81,7 +86,9 @@ libc.so.6:strcspn libc.so.6:strdup libc.so.6:strerror +libc.so.6:strlen libc.so.6:strncmp +libc.so.6:strncpy libc.so.6:strnlen libc.so.6:strrchr libc.so.6:strsep @@ -104,3 +111,10 @@ libz.so.1:gzdopen libz.so.1:gzerror libz.so.1:gzread +libzstd.so.1:ZSTD_DStreamOutSize +libzstd.so.1:ZSTD_createDStream +libzstd.so.1:ZSTD_decompressStream +libzstd.so.1:ZSTD_freeDStream +libzstd.so.1:ZSTD_getErrorName +libzstd.so.1:ZSTD_initDStream +libzstd.so.1:ZSTD_isError diff --git a/files/0001-libkmod-Support-usr-lib-to-enable-stateless-configs-.patch b/files/0001-libkmod-Support-usr-lib-to-enable-stateless-configs-.patch --- a/files/0001-libkmod-Support-usr-lib-to-enable-stateless-configs-.patch +++ b/files/0001-libkmod-Support-usr-lib-to-enable-stateless-configs-.patch @@ -10,18 +10,18 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c -index fe68134..49fc865 100644 +index 7c2b889..70b7776 100644 --- a/libkmod/libkmod.c +++ b/libkmod/libkmod.c -@@ -61,7 +61,7 @@ static struct _index_files { - static const char *default_config_paths[] = { +@@ -65,7 +65,7 @@ static const char *default_config_paths[] = { SYSCONFDIR "/modprobe.d", "/run/modprobe.d", + "/usr/local/lib/modprobe.d", - "/lib/modprobe.d", + "/usr/lib/modprobe.d", NULL }; -- -2.7.1 +2.30.2 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,24 +1,26 @@ name : kmod -version : '25' -release : 11 +version : '29' +release : 12 source : - - https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-25.tar.xz : 7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd + - https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz : 0b80eea7aa184ac6fd20cafa2a1fdf290ffecc70869a797079e2cc5c6225a52a component : system.base license : - - LGPL-2.1 # for libkmod, testsuite and helper libraries - - GPL-2.0 # for tools + - LGPL-2.1-or-later # for libkmod, testsuite and helper libraries + - GPL-2.0-or-later # for tools summary : Linux kernel module management utilities description: | Linux kernel module management utilities +builddeps : + - pkgconfig(libzstd) optimize : - lto - size setup : | %patch -p1 < $pkgfiles/0001-libkmod-Support-usr-lib-to-enable-stateless-configs-.patch %configure --bindir=/bin \ - --disable-manpages \ --with-xz \ - --with-zlib + --with-zlib \ + --with-zstd build : | %make install : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,16 +2,16 @@ kmod - Ikey Doherty - ikey@solus-project.com + Reilly Brogan + solus@reillybrogan.com - LGPL-2.1 - GPL-2.0 + LGPL-2.1-or-later + GPL-2.0-or-later system.base Linux kernel module management utilities Linux kernel module management utilities - https://solus-project.com/sources/README.Solus + https://getsol.us/sources/README.Solus kmod @@ -20,10 +20,27 @@ system.base - /bin - /sbin - /usr/lib64/lib*.so.* + /bin/kmod + /sbin/depmod + /sbin/insmod + /sbin/lsmod + /sbin/modinfo + /sbin/modprobe + /sbin/rmmod + /usr/lib64/libkmod.so.2 + /usr/lib64/libkmod.so.2.3.7 /usr/share/bash-completion/completions/kmod + /usr/share/man/man5/depmod.d.5 + /usr/share/man/man5/modprobe.d.5 + /usr/share/man/man5/modules.dep.5 + /usr/share/man/man5/modules.dep.bin.5 + /usr/share/man/man8/depmod.8 + /usr/share/man/man8/insmod.8 + /usr/share/man/man8/kmod.8 + /usr/share/man/man8/lsmod.8 + /usr/share/man/man8/modinfo.8 + /usr/share/man/man8/modprobe.8 + /usr/share/man/man8/rmmod.8 @@ -33,21 +50,21 @@ programming.devel - kmod + kmod - /usr/include/ - /usr/lib64/lib*.so - /usr/lib64/pkgconfig/*.pc + /usr/include/libkmod.h + /usr/lib64/libkmod.so + /usr/lib64/pkgconfig/libkmod.pc - - 2018-02-21 - 25 + + 2022-03-05 + 29 Packaging update - Ikey Doherty - ikey@solus-project.com + Reilly Brogan + solus@reillybrogan.com \ No newline at end of file