Bump libzfs.so and libzpool.so versions

Bump the library versions as advised by the libtool guidelines.

https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html

Two new functions were added but no existing functions were changed,
so we increase the version and the age (version:revision:age).

Added functions (2):
- boolean_t zpool_is_draid_spare(const char *);
- zpool_compat_status_t zpool_load_compat(const char *,
      boolean_t *, char *, char *);

Additionally bump the libzpool.so version information.  This library
is for internal use but we still want to update the version to track
major changes to the interfaces.

The libzfsbootenv, libuutil, libnvpair and libzfs_core libraries
have not been updated.

Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #11817

diff --git a/config/deb.am b/config/deb.am
index 639a46efddbf3d84915deef28311952e601550fa..4ed3c17aa669c86cab77a223cfac7178bddf31cd 100644 (file)
--- a/config/deb.am
+++ b/config/deb.am
@@ -43,9 +43,9 @@ deb-utils: deb-local rpm-utils-initramfs
        pkg1=$${name}-$${version}.$${arch}.rpm; \
        pkg2=libnvpair3-$${version}.$${arch}.rpm; \
        pkg3=libuutil3-$${version}.$${arch}.rpm; \
-       pkg4=libzfs4-$${version}.$${arch}.rpm; \
-       pkg5=libzpool4-$${version}.$${arch}.rpm; \
-       pkg6=libzfs4-devel-$${version}.$${arch}.rpm; \
+       pkg4=libzfs5-$${version}.$${arch}.rpm; \
+       pkg5=libzpool5-$${version}.$${arch}.rpm; \
+       pkg6=libzfs5-devel-$${version}.$${arch}.rpm; \
        pkg7=$${name}-test-$${version}.$${arch}.rpm; \
        pkg8=$${name}-dracut-$${version}.noarch.rpm; \
        pkg9=$${name}-initramfs-$${version}.$${arch}.rpm; \
@@ -56,7 +56,7 @@ deb-utils: deb-local rpm-utils-initramfs
        path_prepend=`mktemp -d /tmp/intercept.XXXXXX`; \
        echo "#$(SHELL)" > $${path_prepend}/dh_shlibdeps; \
        echo "`which dh_shlibdeps` -- \
-        -xlibuutil3linux -xlibnvpair3linux -xlibzfs4linux -xlibzpool4linux" \
+        -xlibuutil3linux -xlibnvpair3linux -xlibzfs5linux -xlibzpool5linux" \
         >> $${path_prepend}/dh_shlibdeps; \
 ## These -x arguments are passed to dpkg-shlibdeps, which exclude the
 ## Debianized packages from the auto-generated dependencies of the new debs,

diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
index 621021a1218e2b3a2c00ff4d3c203478894be0fe..1a7698b4760e6ef3bff91a4cc18eef3458df3c07 100644 (file)
--- a/lib/libzfs/Makefile.am
+++ b/lib/libzfs/Makefile.am
@@ -87,7 +87,7 @@ if BUILD_FREEBSD
 libzfs_la_LIBADD += -lutil -lgeom
 endif
 
-libzfs_la_LDFLAGS += -version-info 4:0:0
+libzfs_la_LDFLAGS += -version-info 5:0:1
 
 include $(top_srcdir)/config/CppCheck.am
 

diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
index 929f5bed8b2f2dbae49bdffe70c2ffbab5621db5..c9a55591e5ca8250a2e10acc55319c73d78d1ebd 100644 (file)
--- a/lib/libzpool/Makefile.am
+++ b/lib/libzpool/Makefile.am
@@ -230,7 +230,7 @@ if BUILD_FREEBSD
 libzpool_la_LIBADD += -lgeom
 endif
 
-libzpool_la_LDFLAGS += -version-info 4:0:0
+libzpool_la_LDFLAGS += -version-info 5:0:0
 
 if TARGET_CPU_POWERPC
 vdev_raidz_math_powerpc_altivec.$(OBJEXT): CFLAGS += -maltivec

diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index f46a633db6b658eeb29f806570f1b3802ddcf1b4..fea4087ee52ecd5ec274e4c8004426506d79b0ac 100644 (file)
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -120,10 +120,10 @@ License:        @ZFS_META_LICENSE@
 URL:            https://github.com/openzfs/zfs
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       libzpool4 = %{version}
+Requires:       libzpool5 = %{version}
 Requires:       libnvpair3 = %{version}
 Requires:       libuutil3 = %{version}
-Requires:       libzfs4 = %{version}
+Requires:       libzfs5 = %{version}
 Requires:       %{name}-kmod = %{version}
 Provides:       %{name}-kmod-common = %{version}
 Obsoletes:      spl
@@ -162,17 +162,17 @@ Requires:  sysstat
 %description
 This package contains the core ZFS command line utilities.
 
-%package -n libzpool4
+%package -n libzpool5
 Summary:        Native ZFS pool library for Linux
 Group:          System Environment/Kernel
 Obsoletes:      libzpool2
 
-%description -n libzpool4
+%description -n libzpool5
 This package contains the zpool library, which provides support
 for managing zpools
 
-%post -n libzpool4 -p /sbin/ldconfig
-%postun -n libzpool4 -p /sbin/ldconfig
+%post -n libzpool5 -p /sbin/ldconfig
+%postun -n libzpool5 -p /sbin/ldconfig
 
 %package -n libnvpair3
 Summary:        Solaris name-value library for Linux
@@ -207,31 +207,31 @@ This library provides a variety of compatibility functions for OpenZFS:
 %post -n libuutil3 -p /sbin/ldconfig
 %postun -n libuutil3 -p /sbin/ldconfig
 
-%package -n libzfs4
+%package -n libzfs5
 Summary:        Native ZFS filesystem library for Linux
 Group:          System Environment/Kernel
 Obsoletes:      libzfs2
 
-%description -n libzfs4
+%description -n libzfs5
 This package provides support for managing ZFS filesystems
 
-%post -n libzfs4 -p /sbin/ldconfig
-%postun -n libzfs4 -p /sbin/ldconfig
+%post -n libzfs5 -p /sbin/ldconfig
+%postun -n libzfs5 -p /sbin/ldconfig
 
-%package -n libzfs4-devel
+%package -n libzfs5-devel
 Summary:        Development headers
 Group:          System Environment/Kernel
-Requires:       libzfs4 = %{version}
-Requires:       libzpool4 = %{version}
+Requires:       libzfs5 = %{version}
+Requires:       libzpool5 = %{version}
 Requires:       libnvpair3 = %{version}
 Requires:       libuutil3 = %{version}
-Provides:       libzpool4-devel
+Provides:       libzpool5-devel
 Provides:       libnvpair3-devel
 Provides:       libuutil3-devel
 Obsoletes:      zfs-devel
 Obsoletes:      libzfs2-devel
 
-%description -n libzfs4-devel
+%description -n libzfs5-devel
 This package contains the header files needed for building additional
 applications against the ZFS libraries.
 
@@ -278,7 +278,7 @@ Summary:        Python %{python_version} wrapper for libzfs_core
 Group:          Development/Languages/Python
 License:        Apache-2.0
 BuildArch:      noarch
-Requires:       libzfs4 = %{version}
+Requires:       libzfs5 = %{version}
 Requires:       libnvpair3 = %{version}
 Requires:       libffi
 Requires:       python%{__python_pkg_version}
@@ -483,7 +483,7 @@ systemctl --system daemon-reload >/dev/null || true
 %{_datadir}/pam-configs/*
 %endif
 
-%files -n libzpool4
+%files -n libzpool5
 %{_libdir}/libzpool.so.*
 
 %files -n libnvpair3
@@ -492,10 +492,10 @@ systemctl --system daemon-reload >/dev/null || true
 %files -n libuutil3
 %{_libdir}/libuutil.so.*
 
-%files -n libzfs4
+%files -n libzfs5
 %{_libdir}/libzfs*.so.*
 
-%files -n libzfs4-devel
+%files -n libzfs5-devel
 %{_pkgconfigdir}/libzfs.pc
 %{_pkgconfigdir}/libzfsbootenv.pc
 %{_pkgconfigdir}/libzfs_core.pc