util-linux: Update to 2.30.1

[people/arne_f/ipfire-3.x.git] / util-linux / util-linux.nm

diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index a8f3629a508d7dfdcb58429147619c50e64fa067..9d4c1a4475f3f197143cd2dea0377991e593a439 100644 (file)
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -4,8 +4,9 @@
 ###############################################################################
 
 name       = util-linux
-major_ver  = 2.25
-minor_ver  = 2
+major_ver  = 2.30
+minor_ver  = 1
+#version    = %{major_ver}
 version    = %{major_ver}.%{minor_ver}
 release    = 1
 
@@ -22,18 +23,15 @@ description
        program.
 end
 
-source_dl  = ftp://ftp.kernel.org/pub/linux/utils/util-linux/v%{major_ver}/
+source_dl  = https://www.kernel.org/pub/linux/utils/%{name}/v%{major_ver}/
 
 build
        requires
-               audit-devel
-               automake >= 1.13
+               automake >= 1.15
                coreutils >= 8.19
                gettext
                libcap-devel
                libcap-ng-devel
-               libselinux-devel
-               libsepol-devel
                libudev-devel
                ncurses-devel
                pam-devel
@@ -57,8 +55,6 @@ build
                --enable-runuser \
                --enable-su \
                --with-systemd \
-               --with-selinux \
-               --with-audit \
                --with-udev \
                --disable-makeinstall-chown \
                --disable-static \
@@ -72,7 +68,7 @@ build
 
        # Build nolodin
        build_cmds
-               gcc %{CFLAGS} -o nologin %{DIR_SOURCE}/nologin.c
+               gcc %{CFLAGS} %{LDFLAGS} -o nologin %{DIR_SOURCE}/nologin.c
        end
 
        install_cmds
@@ -144,7 +140,7 @@ packages
                        coreutils < 8.19
                        setup < 3.0-2
                        util-linux-ng
-                       sysvinit <= 2.86-2
+                       sysvinit <= 2.86-6
                end
 
                preprequires += coreutils
@@ -275,6 +271,28 @@ packages
                end
        end
 
+       # Package information for libfdisk.
+       package libfdisk
+               summary = Partitioning library for fdisk-like programs.
+               description = %{summary}
+
+               files
+                       %{libdir}/libfdisk.*
+               end
+       end
+
+       # Package information for libfdisk-devel.
+       package libfidsk-devel
+               summary = Development library and headers of libfdisk.
+               description = %{summary}
+
+               files
+                       %{includedir}/libfdisk/*
+                       %{libdir}/libfdisk.so
+                       %{libdir}/pkgconfig/fdisk.pc
+               end
+       end
+
        package uuidd
                summary = Helper daemon to guarantee uniqueness of time-based UUIDs.
                description