Updates to libs

Signed-off-by: Umer Saleem <[email protected]>

contrib/debian/control

@@ -259,10 +259,9 @@ Depends: openzfs-libnvpair3 (= ${binary:Version}),
          openzfs-libuutil3 (= ${binary:Version}),
          openzfs-libzfs4 (= ${binary:Version}),
          openzfs-libzpool5 (= ${binary:Version}),
-	 openzfs-python3-libzfsacl (= ${binary:Version})
+         openzfs-python3-libzfsacl (= ${binary:Version}),
          python3,
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Recommends: lsb-base, openzfs-zfs-modules | openzfs-zfs-dkms, openzfs-zfs-zed
 Breaks: openrc,
         spl (<< 0.7.9-2),

contrib/debian/openzfs-python3-libzfsacl.install

@@ -1,2 +1,4 @@
 usr/lib/python3/dist-packages/libzfsacl-*.egg-info
 usr/lib/python3/dist-packages/libzfsacl.cpython-*.so
+lib/x86_64-linux-gnu/libzfsacl.so.*
+lib/x86_64-linux-gnu/libsunacl.so.*

include/Makefile.am

@@ -190,7 +190,9 @@ USER_H = \
 	libzfs_core.h \
 	libzfsbootenv.h \
 	libzutil.h \
-	thread_pool.h
+	sunacl.h \
+	thread_pool.h \
+	zfsacl.h
 
 
 if CONFIG_USER

lib/libzfsacl/sunacl.h → include/sunacl.h

@@ -28,7 +28,7 @@
  */
 
 #ifndef SUNACL_H
-#define	SUNACL_H
+#define	SUNACL_H extern __attribute__((visibility("default")))
 
 #include <sys/types.h> /* uid_t */
 

lib/libzfsacl/libzfsacl.h → include/zfsacl.h

@@ -1,14 +1,15 @@
 #ifndef	__ZFSACL_H__
-#define	__ZFSACL_H__
+#define	__ZFSACL_H__  extern __attribute__((visibility("default")))
 
 #include <zfs_config.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <sys/types.h>
 
-typedef enum { B_FALSE, B_TRUE }	boolean_t;
+#define	zfsace4 zfsacl_entry
 typedef unsigned int		uint_t;
 
 /*
@@ -263,7 +264,6 @@ boolean_t zfsace_set_who(zfsacl_entry_t _entry, zfsace_who_t _who,
     zfsace_id_t _aeid);
 boolean_t zfsace_set_entry_type(zfsacl_entry_t _entry, zfsace_entry_type_t _tp);
 
-
 /*
  * NFSv4 ACL-wide flags
  * used in zfsacl_get_aclflags() and zfsacl_set_aclflags()

lib/Makefile.am

@@ -64,13 +64,15 @@ include $(srcdir)/%D%/libunicode/Makefile.am
 include $(srcdir)/%D%/libuutil/Makefile.am
 include $(srcdir)/%D%/libzfs_core/Makefile.am
 include $(srcdir)/%D%/libzfs/Makefile.am
+include $(srcdir)/%D%/libzfsacl/zfsacl/Makefile.am
 include $(srcdir)/%D%/libzfsacl/Makefile.am
 include $(srcdir)/%D%/libzfsbootenv/Makefile.am
 include $(srcdir)/%D%/libzpool/Makefile.am
 include $(srcdir)/%D%/libzstd/Makefile.am
 include $(srcdir)/%D%/libzutil/Makefile.am
 if BUILD_LINUX
 include $(srcdir)/%D%/libefi/Makefile.am
+include $(srcdir)/%D%/libzfsacl/sunacl/Makefile.am
 endif
 
 

lib/libzfsacl/Makefile.am

@@ -1,10 +1,5 @@
 dist_noinst_DATA += \
-	%D%/sunacl.h \
-	%D%/libzfsacl.h \
-	%D%/libpyzfsacl.c \
-	%D%/libsunacl.c \
-	%D%/libzfsacl_impl_freebsd.c \
-	%D%/libzfsacl_impl_linux.c
+	%D%/libpyzfsacl.c
 
 SUBSTFILES += %D%/setup.py
 

lib/libzfsacl/libpyzfsacl.c

@@ -1,6 +1,7 @@
 
+#include <stdint.h>
+#include <zfsacl.h>
 #include <Python.h>
-#include "libzfsacl.h"
 
 #define	Py_TPFLAGS_HAVE_ITER 0
 

lib/libzfsacl/libzfsacl_impl_linux.c

@@ -796,7 +796,7 @@ format_flags(char *str, size_t sz, const zfsacl_entry_t entry, size_t *off)
 			to_set = '-';
 		}
 		str[cnt] = to_set;
-		cnt += rv;
+		cnt++;
 	}
 
 	*off += cnt;

lib/libzfsacl/setup.py.in

@@ -1,17 +1,13 @@
 from setuptools import setup, Extension, find_packages
 import os
-import sys
 
 srcdir = '@abs_top_srcdir@/lib/libzfsacl'
 
 topsrcdir = '@abs_top_srcdir@'
-relpath_topsrcdir = os.path.relpath(topsrcdir)
-if sys.platform.startswith('linux'):
-    src = ['libzfsacl_impl_linux.c', 'libpyzfsacl.c', 'libsunacl.c']
-else:
-    src = ['libzfsacl_impl_freebsd.c', 'libpyzfsacl.c']
+incdir = [topsrcdir, topsrcdir + '/include', topsrcdir + '/lib/libspl/include' ]
+src = ['libpyzfsacl.c']
 
-libzfsacl_mod = Extension('libzfsacl', include_dirs=[relpath_topsrcdir],
+libzfsacl_mod = Extension('libzfsacl', include_dirs=incdir,
                           sources=src)
 
 setup(

lib/libzfsacl/sunacl/Makefile.am

@@ -0,0 +1,22 @@
+libsunacl_la_CFLAGS  = $(AM_CFLAGS) $(LIBRARY_CFLAGS)
+
+lib_LTLIBRARIES += libsunacl.la
+CPPCHECKTARGETS += libsunacl.la
+
+libsunacl_la_CPPFLAGS  = $(AM_CPPFLAGS)
+
+dist_libsunacl_la_SOURCES = \
+	%D%/libsunacl.c
+
+libsunacl_la_LIBADD = \
+	libzfsacl.la \
+	libzfs.la
+
+libsunacl_la_LDFLAGS =
+
+if !ASAN_ENABLED
+libsunacl_la_LDFLAGS += -Wl,-z,defs
+endif
+
+libsunacl_la_LDFLAGS += -version-info 1:0:0
+

lib/libzfsacl/libsunacl.c → lib/libzfsacl/sunacl/libsunacl.c

@@ -27,16 +27,16 @@
 
 #include <arpa/inet.h>
 #include <assert.h>
-#include "libzfsacl.h"
-#include "sunacl.h"
+#include <zfsacl.h>
+#include <sunacl.h>
 #include <string.h>
 
 
 #define	ACE_GETACL	4
 #define	ACE_SETACL	5
 #define	ACE_GETACLCNT	6
 
-int
+static int
 acl_from_aces(zfsacl_t aclp, const ace_t *aces, int nentries)
 {
 	int i;
@@ -126,7 +126,7 @@ acl_from_aces(zfsacl_t aclp, const ace_t *aces, int nentries)
 	return (0);
 }
 
-int
+static int
 aces_from_acl(ace_t *aces, int *nentries, zfsacl_t aclp)
 {
 	int i;

lib/libzfsacl/zfsacl/Makefile.am

@@ -0,0 +1,20 @@
+libzfsacl_la_CFLAGS  = $(AM_CFLAGS) $(LIBRARY_CFLAGS)
+
+lib_LTLIBRARIES += libzfsacl.la
+CPPCHECKTARGETS += libzfsacl.la
+
+libzfsacl_la_CPPFLAGS  = $(AM_CPPFLAGS)
+
+dist_libzfsacl_la_SOURCES = \
+	%D%/libzfsacl_impl_linux.c
+
+libzfsacl_la_LIBADD = \
+	libzfs.la
+
+libzfsacl_la_LDFLAGS =
+
+if !ASAN_ENABLED
+libzfsacl_la_LDFLAGS += -Wl,-z,defs
+endif
+
+libzfsacl_la_LDFLAGS += -version-info 1:0:0

lib/libzfsacl/libzfsacl_impl_freebsd.c → lib/libzfsacl/zfsacl/libzfsacl_impl_freebsd.c

@@ -1,4 +1,4 @@
-#include "libzfsacl.h"
+#include "zfsacl.h"
 #include <sys/acl.h>
 
 #define	BSDACE(zfsace) ((acl_entry_t)zfsace)