Index: head/sysutils/libudisks/Makefile =================================================================== --- head/sysutils/libudisks/Makefile (revision 540341) +++ head/sysutils/libudisks/Makefile (revision 540342) @@ -1,64 +1,64 @@ # $FreeBSD$ PORTNAME= libudisks -PORTVERSION= 2.8.4 +PORTVERSION= 2.9.0 # Obviates the need to specify GH_TAGNAME and repeat the version number later DISTVERSIONPREFIX= udisks- CATEGORIES= sysutils MAINTAINER= pauamma@gundo.com COMMENT= Library to manipulate storage devices, from udisks LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING # pkaction takes care of libpolkit-agent-1 and libpolkit-gobject-1 # which are what we really want (see UDISKSCTL_LIB_DEPENDS). BUILD_DEPENDS= bash:shells/bash \ gtkdocize:textproc/gtk-doc \ pkaction:sysutils/polkit # For some reason, configure wants autopoint from gettext-tools even when # NLS is disabled. USES= autoreconf:build gettext-tools:build gmake gnome \ libtool:build pkgconfig USE_GITHUB= yes GH_ACCOUNT= storaged-project GH_PROJECT= udisks USE_GNOME= glib20 introspection USE_LDCONFIG= yes GNU_CONFIGURE= yes # config.status errors out without --disable-dependency-tracking, with or # without USES=gmake. --with-libintl-prefix is needed because otherwise # configure won't find libintl when PREFIX != LOCALBASE. CONFIGURE_ARGS= --disable-daemon --disable-dependency-tracking \ --with-libintl-prefix=${LOCALBASE} OPTIONS_DEFINE= UDISKSCTL NLS DOCS OPTIONS_DEFAULT= UDISKSCTL NLS DOCS OPTIONS_SUB= yes DOCS_CONFIGURE_ENABLE= gtk-doc NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime UDISKSCTL_DESC= Install udisksctl command line utility UDISKSCTL_LIB_DEPENDS= libpolkit-agent-1.so:sysutils/polkit \ libpolkit-gobject-1.so:sysutils/polkit pre-configure: cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ./autogen.sh post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libudisks2.so.0.0.0 post-install-UDISKSCTL-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/udisksctl # Pacify "make stage-qa". post-install-UDISKSCTL-off: ${RM} ${STAGEDIR}${PREFIX}/bin/udisksctl .include Index: head/sysutils/libudisks/distinfo =================================================================== --- head/sysutils/libudisks/distinfo (revision 540341) +++ head/sysutils/libudisks/distinfo (revision 540342) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567127492 -SHA256 (storaged-project-udisks-udisks-2.8.4_GH0.tar.gz) = 46cc88f26d26818b719a0070587f9d3fe13828b063edb1f0dfc8443d86b94d97 -SIZE (storaged-project-udisks-udisks-2.8.4_GH0.tar.gz) = 1377390 +TIMESTAMP = 1592431145 +SHA256 (storaged-project-udisks-udisks-2.9.0_GH0.tar.gz) = d91ca47f1bebada5898bf5aec5dc3a83f7466cabc75020d982c1e1283853f0dc +SIZE (storaged-project-udisks-udisks-2.9.0_GH0.tar.gz) = 1454123 Index: head/sysutils/libudisks/files/patch-doc_udisks2.types.in.in =================================================================== --- head/sysutils/libudisks/files/patch-doc_udisks2.types.in.in (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_udisks2.types.in.in (nonexistent) @@ -1,48 +0,0 @@ ---- doc/udisks2.types.in.in.orig 2019-07-22 16:24:44 UTC -+++ doc/udisks2.types.in.in -@@ -3,36 +3,6 @@ udisks_object_info_get_type - udisks_partition_type_info_get_type - udisks_partition_type_info_flags_get_type - --udisks_daemon_get_type --udisks_linux_device_get_type --udisks_linux_block_object_get_type --udisks_linux_block_get_type --udisks_linux_drive_object_get_type --udisks_linux_drive_get_type --udisks_linux_drive_ata_get_type --udisks_base_job_get_type --udisks_spawned_job_get_type --udisks_threaded_job_get_type --udisks_simple_job_get_type --udisks_mount_get_type --udisks_mount_monitor_get_type --udisks_provider_get_type --udisks_linux_provider_get_type --udisks_linux_filesystem_get_type --udisks_linux_partition_get_type --udisks_linux_partition_table_get_type --udisks_linux_encrypted_get_type --udisks_linux_swapspace_get_type --udisks_linux_loop_get_type --udisks_linux_manager_get_type --udisks_state_get_type --udisks_fstab_entry_get_type --udisks_fstab_monitor_get_type --udisks_crypttab_entry_get_type --udisks_crypttab_monitor_get_type --udisks_linux_mdraid_object_get_type --udisks_linux_mdraid_get_type -- - udisks_drive_get_type - udisks_drive_proxy_get_type - udisks_drive_skeleton_get_type -@@ -67,6 +37,8 @@ udisks_object_get_type - udisks_object_proxy_get_type - udisks_object_skeleton_get_type - udisks_object_manager_client_get_type -+ -+# DAEMON_TYPES - - # LVM2_TYPES - Property changes on: head/sysutils/libudisks/files/patch-doc_udisks2.types.in.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.in.in =================================================================== --- head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.in.in (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.in.in (nonexistent) @@ -1,80 +0,0 @@ ---- doc/udisks2-docs.xml.in.in.orig 2019-07-22 16:24:44 UTC -+++ doc/udisks2-docs.xml.in.in -@@ -15,12 +15,9 @@ - - - Manual pages and Overview -- -- -- - -- -- -+ -+ - - - -@@ -416,61 +413,7 @@ - - - -- -- Daemon Implementation Details -- -- Core -- -- -- -- -- -- -- -- -- -- State and Configuration -- -- -- -- -- -- -- Jobs -- -- -- -- -- -- -- Linux-specific types -- -- -- -- -- -- Drives on Linux -- -- -- -- -- -- Linux RAID -- -- -- -- -- Block devices on Linux -- -- -- -- -- -- -- -- -- -- -+ - - - Index Property changes on: head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.in.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/libudisks/files/patch-data_Makefile.am =================================================================== --- head/sysutils/libudisks/files/patch-data_Makefile.am (revision 540341) +++ head/sysutils/libudisks/files/patch-data_Makefile.am (nonexistent) @@ -1,18 +0,0 @@ ---- data/Makefile.am.orig 2019-07-22 16:24:44 UTC -+++ data/Makefile.am -@@ -1,6 +1,7 @@ - - NULL = - -+if ENABLE_DAEMON - SUBDIRS = tmpfiles.d - - dbusservicedir = $(datadir)/dbus-1/system-services -@@ -36,6 +37,7 @@ polkit_DATA = $(polkit_in_files:.policy.in=.polic - - $(polkit_DATA): $(polkit_in_files) - $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ -+endif - - completionsdir = $(datadir)/bash-completion/completions - completions_DATA = \ Property changes on: head/sysutils/libudisks/files/patch-data_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/libudisks/files/patch-Makefile.am =================================================================== --- head/sysutils/libudisks/files/patch-Makefile.am (revision 540341) +++ head/sysutils/libudisks/files/patch-Makefile.am (nonexistent) @@ -1,24 +0,0 @@ ---- Makefile.am.orig 2019-07-22 16:24:44 UTC -+++ Makefile.am -@@ -1,13 +1,19 @@ - ## Process this file with automake to produce Makefile.in - --SHELL = /bin/bash -+SHELL = @BASH@ - .SHELLFLAGS = -o pipefail -c - - PYTHON ?= python3 - - NULL = - --SUBDIRS = data udisks src tools modules po doc -+SUBDIRS = data udisks -+ -+if ENABLE_DAEMON -+SUBDIRS += src -+endif -+ -+SUBDIRS += tools modules po doc - - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - Property changes on: head/sysutils/libudisks/files/patch-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/libudisks/files/patch-udisks_udisksclient.c =================================================================== --- head/sysutils/libudisks/files/patch-udisks_udisksclient.c (revision 540341) +++ head/sysutils/libudisks/files/patch-udisks_udisksclient.c (nonexistent) @@ -1,44 +0,0 @@ ---- udisks/udisksclient.c.orig 2019-07-22 16:24:44 UTC -+++ udisks/udisksclient.c -@@ -19,6 +19,7 @@ - */ - - #include "config.h" -+#include - #include - - #include "udisksclient.h" -@@ -26,11 +27,6 @@ - #include "udisks-generated.h" - #include "udisksobjectinfo.h" - --/* For __GNUC_PREREQ usage below */ --#ifdef __GNUC__ --# include --#endif -- - /** - * SECTION:udisksclient - * @title: UDisksClient -@@ -1983,8 +1979,8 @@ udisks_client_get_id_for_display (UDisksClient *client - (g_strcmp0 (id_type[n].version, "*") == 0 && strlen (version) > 0)) - { - /* we know better than the compiler here */ --#if defined( __GNUC_PREREQ) || defined(__clang__) --# if __GNUC_PREREQ(4,6) || __clang__ -+#if defined(__GNUC__) || defined(__clang__) -+# if G_GNUC_CHECK_VERSION(4, 6) || __clang__ - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wformat-nonliteral" - # endif -@@ -1994,8 +1990,8 @@ udisks_client_get_id_for_display (UDisksClient *client - else - ret = g_strdup_printf (g_dpgettext2 (GETTEXT_PACKAGE, "fs-type", id_type[n].short_name), version); - goto out; --#if defined( __GNUC_PREREQ) || defined(__clang__) --# if __GNUC_PREREQ(4,6) || __clang__ -+#if defined(__GNUC__) || defined(__clang__) -+# if G_GNUC_CHECK_VERSION(4, 6) || __clang__ - # pragma GCC diagnostic pop - # endif - #endif Property changes on: head/sysutils/libudisks/files/patch-udisks_udisksclient.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/libudisks/files/patch-tools_Makefile.am =================================================================== --- head/sysutils/libudisks/files/patch-tools_Makefile.am (revision 540341) +++ head/sysutils/libudisks/files/patch-tools_Makefile.am (nonexistent) @@ -1,18 +0,0 @@ ---- tools/Makefile.am.orig 2019-07-22 16:24:44 UTC -+++ tools/Makefile.am -@@ -38,6 +38,7 @@ udisksctl_LDADD = - - # ------------------------------------------------------------------------------ - -+if ENABLE_DAEMON - sbin_PROGRAMS = umount.udisks2 - - umount_udisks2_SOURCES = \ -@@ -54,6 +55,7 @@ umount_udisks2_LDADD = - $(GIO_LIBS) \ - $(top_builddir)/udisks/libudisks2.la \ - $(NULL) -+endif - - # ------------------------------------------------------------------------------ - Property changes on: head/sysutils/libudisks/files/patch-tools_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/libudisks/files/patch-configure.ac =================================================================== --- head/sysutils/libudisks/files/patch-configure.ac (revision 540341) +++ head/sysutils/libudisks/files/patch-configure.ac (nonexistent) @@ -1,388 +0,0 @@ ---- configure.ac.orig 2019-07-22 16:24:44 UTC -+++ configure.ac -@@ -33,6 +33,10 @@ AC_ISC_POSIX - AC_HEADER_STDC - AC_PROG_LIBTOOL - -+AC_PATH_PROG([BASH], [bash]) -+if test -z "$BASH"; then -+ AC_MSG_ERROR([bash is required to run Makefile]) -+fi - - # Compilation - # -@@ -113,6 +117,12 @@ AS_IF([test "$enable_man" != no], [ - ]) - AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no) - -+AC_ARG_ENABLE(daemon, -+ [AS_HELP_STRING([--enable-daemon], -+ [build udisks daemon [default=yes]])],, -+ enable_daemon=yes) -+AM_CONDITIONAL(ENABLE_DAEMON, test "$enable_daemon" != no) -+ - GOBJECT_INTROSPECTION_CHECK([0.6.2]) - - # Behavior -@@ -132,10 +142,6 @@ fi - # Libraries - # - --PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 165]) --AC_SUBST(GUDEV_CFLAGS) --AC_SUBST(GUDEV_LIBS) -- - PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.50]) - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) -@@ -144,14 +150,6 @@ PKG_CHECK_MODULES(GIO, [gio-unix-2.0 >= 2.50]) - AC_SUBST(GIO_CFLAGS) - AC_SUBST(GIO_LIBS) - --PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) --AC_SUBST(GMODULE_CFLAGS) --AC_SUBST(GMODULE_LIBS) -- --PKG_CHECK_MODULES(BLOCKDEV, [blockdev >= 2.19]) --AC_SUBST(BLOCKDEV_CFLAGS) --AC_SUBST(BLOCKDEV_LIBS) -- - PKG_CHECK_MODULES(POLKIT_GOBJECT_1, [polkit-gobject-1 >= 0.102]) - AC_SUBST(POLKIT_GOBJECT_1_CFLAGS) - AC_SUBST(POLKIT_GOBJECT_1_LIBS) -@@ -160,43 +158,61 @@ PKG_CHECK_MODULES(POLKIT_AGENT_1, [polkit-agent-1 >= 0 - AC_SUBST(POLKIT_AGENT_1_CFLAGS) - AC_SUBST(POLKIT_AGENT_1_LIBS) - --PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.17]) --AC_SUBST(LIBATASMART_CFLAGS) --AC_SUBST(LIBATASMART_LIBS) -+if test "x$enable_daemon" = "xyes"; then -+ PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 165]) -+ AC_SUBST(GUDEV_CFLAGS) -+ AC_SUBST(GUDEV_LIBS) - --PKG_CHECK_MODULES(LIBMOUNT, [mount >= 2.30], -- [have_libmount=yes], -- [have_libmount=no]) --AM_CONDITIONAL(HAVE_LIBMOUNT, test x$have_libmount = xyes) --if test "x$have_libmount" = "xyes"; then -- AC_DEFINE([HAVE_LIBMOUNT], 1, [Define to 1 if libmount >= 2.30 is available]) --fi --AC_SUBST(HAVE_LIBMOUNT) --AC_SUBST(LIBMOUNT_CFLAGS) --AC_SUBST(LIBMOUNT_LIBS) -+ PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) -+ AC_SUBST(GMODULE_CFLAGS) -+ AC_SUBST(GMODULE_LIBS) - --PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd >= 209], [have_libsystemd_login=yes], -- [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44 libsystemd-daemon], -- [have_libsystemd_login=yes], -- [have_libsystemd_login=no])]) --AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes) --if test "x$have_libsystemd_login" = "xyes"; then -- AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available]) --fi --AC_SUBST(HAVE_LIBSYSTEMD_LOGIN) --AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS) --AC_SUBST(LIBSYSTEMD_LOGIN_LIBS) -+ PKG_CHECK_MODULES(BLOCKDEV, [blockdev >= 2.19]) -+ AC_SUBST(BLOCKDEV_CFLAGS) -+ AC_SUBST(BLOCKDEV_LIBS) - --PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219], -- [have_libelogind=yes], -- [have_libelogins=no]) --AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes) --if test "x$have_libelogind" = "xyes"; then -- AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available]) -+ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.17]) -+ AC_SUBST(LIBATASMART_CFLAGS) -+ AC_SUBST(LIBATASMART_LIBS) -+ -+ PKG_CHECK_MODULES(LIBMOUNT, [mount >= 2.30], -+ [have_libmount=yes], -+ [have_libmount=no]) -+ if test "x$have_libmount" = "xyes"; then -+ AC_DEFINE([HAVE_LIBMOUNT], 1, [Define to 1 if libmount >= 2.30 is available]) -+ fi -+ AC_SUBST(HAVE_LIBMOUNT) -+ AC_SUBST(LIBMOUNT_CFLAGS) -+ AC_SUBST(LIBMOUNT_LIBS) -+ -+ PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd >= 209], [have_libsystemd_login=yes], -+ [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44 libsystemd-daemon], -+ [have_libsystemd_login=yes], -+ [have_libsystemd_login=no])]) -+ if test "x$have_libsystemd_login" = "xyes"; then -+ AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available]) -+ fi -+ AC_SUBST(HAVE_LIBSYSTEMD_LOGIN) -+ AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS) -+ AC_SUBST(LIBSYSTEMD_LOGIN_LIBS) -+ -+ PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219], -+ [have_libelogind=yes], -+ [have_libelogind=no]) -+ if test "x$have_libelogind" = "xyes"; then -+ AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available]) -+ fi -+ AC_SUBST(HAVE_LIBELOGIND) -+ AC_SUBST(LIBELOGIND_CFLAGS) -+ AC_SUBST(LIBELOGIND_LIBS) -+else -+ have_libmount=no -+ have_libsystemd_login=no -+ have_libelogind=no - fi --AC_SUBST(HAVE_LIBELOGIND) --AC_SUBST(LIBELOGIND_CFLAGS) --AC_SUBST(LIBELOGIND_LIBS) -+AM_CONDITIONAL(HAVE_LIBMOUNT, test x$have_libmount = xyes) -+AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes) -+AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes) - - # udevdir - AC_ARG_WITH([udevdir], -@@ -537,124 +553,126 @@ if test "x$enable_vdo" = "xyes" \ - fi - AM_CONDITIONAL(HAVE_VDO, [test "x$have_vdo" = "xyes"]) - --# libblockdev part --SAVE_CFLAGS=$CFLAGS --SAVE_LDFLAGS=$LDFLAGS -+if test "x$enable_daemon" = "xyes"; then -+ # libblockdev part -+ SAVE_CFLAGS=$CFLAGS -+ SAVE_LDFLAGS=$LDFLAGS - --CFLAGS="$GLIB_CFLAGS" --LDFLAGS="$GLIB_LIBS" --AC_MSG_CHECKING([libblockdev-part presence]) --AC_TRY_COMPILE([#include ], [], -- [AC_MSG_RESULT([yes]) -- have_part=yes], -- [AC_MSG_RESULT([no]) -- have_part=no]) -+ CFLAGS="$GLIB_CFLAGS" -+ LDFLAGS="$GLIB_LIBS" -+ AC_MSG_CHECKING([libblockdev-part presence]) -+ AC_TRY_COMPILE([#include ], [], -+ [AC_MSG_RESULT([yes]) -+ have_part=yes], -+ [AC_MSG_RESULT([no]) -+ have_part=no]) - --CFLAGS=$SAVE_CFLAGS --LDFLAGS=$SAVE_LDFLAGS -+ CFLAGS=$SAVE_CFLAGS -+ LDFLAGS=$SAVE_LDFLAGS - --if test "x$have_part" = "xno"; then -- AC_MSG_ERROR([BlockDev part support requested but header or library not found]) --fi -+ if test "x$have_part" = "xno"; then -+ AC_MSG_ERROR([BlockDev part support requested but header or library not found]) -+ fi - --# libblockdev loop --SAVE_CFLAGS=$CFLAGS --SAVE_LDFLAGS=$LDFLAGS -+ # libblockdev loop -+ SAVE_CFLAGS=$CFLAGS -+ SAVE_LDFLAGS=$LDFLAGS - --CFLAGS="$GLIB_CFLAGS" --LDFLAGS="$GLIB_LIBS" --AC_MSG_CHECKING([libblockdev-loop presence]) --AC_TRY_COMPILE([#include ], [], -- [AC_MSG_RESULT([yes]) -- have_loop=yes], -- [AC_MSG_RESULT([no]) -- have_loop=no]) -+ CFLAGS="$GLIB_CFLAGS" -+ LDFLAGS="$GLIB_LIBS" -+ AC_MSG_CHECKING([libblockdev-loop presence]) -+ AC_TRY_COMPILE([#include ], [], -+ [AC_MSG_RESULT([yes]) -+ have_loop=yes], -+ [AC_MSG_RESULT([no]) -+ have_loop=no]) - --CFLAGS=$SAVE_CFLAGS --LDFLAGS=$SAVE_LDFLAGS -+ CFLAGS=$SAVE_CFLAGS -+ LDFLAGS=$SAVE_LDFLAGS - --if test "x$have_loop" = "xno"; then -- AC_MSG_ERROR([Loop support requested but header or library not found]) --fi -+ if test "x$have_loop" = "xno"; then -+ AC_MSG_ERROR([Loop support requested but header or library not found]) -+ fi - --# libblockdev swap --SAVE_CFLAGS=$CFLAGS --SAVE_LDFLAGS=$LDFLAGS -+ # libblockdev swap -+ SAVE_CFLAGS=$CFLAGS -+ SAVE_LDFLAGS=$LDFLAGS - --CFLAGS="$GLIB_CFLAGS" --LDFLAGS="$GLIB_LIBS" --AC_MSG_CHECKING([libblockdev-swap presence]) --AC_TRY_COMPILE([#include ], [], -- [AC_MSG_RESULT([yes]) -- have_swap=yes], -- [AC_MSG_RESULT([no]) -- have_swap=no]) -+ CFLAGS="$GLIB_CFLAGS" -+ LDFLAGS="$GLIB_LIBS" -+ AC_MSG_CHECKING([libblockdev-swap presence]) -+ AC_TRY_COMPILE([#include ], [], -+ [AC_MSG_RESULT([yes]) -+ have_swap=yes], -+ [AC_MSG_RESULT([no]) -+ have_swap=no]) - --CFLAGS=$SAVE_CFLAGS --LDFLAGS=$SAVE_LDFLAGS -+ CFLAGS=$SAVE_CFLAGS -+ LDFLAGS=$SAVE_LDFLAGS - --if test "x$have_swap" = "xno"; then -- AC_MSG_ERROR([SWAP support requested but header or library not found]) --fi -+ if test "x$have_swap" = "xno"; then -+ AC_MSG_ERROR([SWAP support requested but header or library not found]) -+ fi - --# libblockdev mdraid --SAVE_CFLAGS=$CFLAGS --SAVE_LDFLAGS=$LDFLAGS -+ # libblockdev mdraid -+ SAVE_CFLAGS=$CFLAGS -+ SAVE_LDFLAGS=$LDFLAGS - --CFLAGS="$GLIB_CFLAGS" --LDFLAGS="$GLIB_LIBS" --AC_MSG_CHECKING([libblockdev-mdraid presence]) --AC_TRY_COMPILE([#include ], [], -- [AC_MSG_RESULT([yes]) -- have_mdraid=yes], -- [AC_MSG_RESULT([no]) -- have_mdraid=no]) -+ CFLAGS="$GLIB_CFLAGS" -+ LDFLAGS="$GLIB_LIBS" -+ AC_MSG_CHECKING([libblockdev-mdraid presence]) -+ AC_TRY_COMPILE([#include ], [], -+ [AC_MSG_RESULT([yes]) -+ have_mdraid=yes], -+ [AC_MSG_RESULT([no]) -+ have_mdraid=no]) - --CFLAGS=$SAVE_CFLAGS --LDFLAGS=$SAVE_LDFLAGS -+ CFLAGS=$SAVE_CFLAGS -+ LDFLAGS=$SAVE_LDFLAGS - --if test "x$have_mdraid" = "xno"; then -- AC_MSG_ERROR([BLOCKDEV MDRAID support requested but header or library not found]) --fi -+ if test "x$have_mdraid" = "xno"; then -+ AC_MSG_ERROR([BLOCKDEV MDRAID support requested but header or library not found]) -+ fi - --# libblockdev fs --SAVE_CFLAGS=$CFLAGS --SAVE_LDFLAGS=$LDFLAGS -+ # libblockdev fs -+ SAVE_CFLAGS=$CFLAGS -+ SAVE_LDFLAGS=$LDFLAGS - --CFLAGS="$GLIB_CFLAGS" --LDFLAGS="$GLIB_LIBS" --AC_MSG_CHECKING([libblockdev-fs presence]) --AC_TRY_COMPILE([#include ], [], -- [AC_MSG_RESULT([yes]) -- have_fs=yes], -- [AC_MSG_RESULT([no]) -- have_fs=no]) -+ CFLAGS="$GLIB_CFLAGS" -+ LDFLAGS="$GLIB_LIBS" -+ AC_MSG_CHECKING([libblockdev-fs presence]) -+ AC_TRY_COMPILE([#include ], [], -+ [AC_MSG_RESULT([yes]) -+ have_fs=yes], -+ [AC_MSG_RESULT([no]) -+ have_fs=no]) - --CFLAGS=$SAVE_CFLAGS --LDFLAGS=$SAVE_LDFLAGS -+ CFLAGS=$SAVE_CFLAGS -+ LDFLAGS=$SAVE_LDFLAGS - --if test "x$have_fs" = "xno"; then -- AC_MSG_ERROR([BLOCKDEV FS support requested but header or library not found]) --fi -+ if test "x$have_fs" = "xno"; then -+ AC_MSG_ERROR([BLOCKDEV FS support requested but header or library not found]) -+ fi - --# libblockdev crypto --SAVE_CFLAGS=$CFLAGS --SAVE_LDFLAGS=$LDFLAGS -+ # libblockdev crypto -+ SAVE_CFLAGS=$CFLAGS -+ SAVE_LDFLAGS=$LDFLAGS - --CFLAGS="$GLIB_CFLAGS" --LDFLAGS="$GLIB_LIBS" --AC_MSG_CHECKING([libblockdev-crypto presence]) --AC_TRY_COMPILE([#include ], [], -- [AC_MSG_RESULT([yes]) -- have_crypto=yes], -- [AC_MSG_RESULT([no]) -- have_crypto=no]) -+ CFLAGS="$GLIB_CFLAGS" -+ LDFLAGS="$GLIB_LIBS" -+ AC_MSG_CHECKING([libblockdev-crypto presence]) -+ AC_TRY_COMPILE([#include ], [], -+ [AC_MSG_RESULT([yes]) -+ have_crypto=yes], -+ [AC_MSG_RESULT([no]) -+ have_crypto=no]) - --CFLAGS=$SAVE_CFLAGS --LDFLAGS=$SAVE_LDFLAGS -+ CFLAGS=$SAVE_CFLAGS -+ LDFLAGS=$SAVE_LDFLAGS - --if test "x$have_crypto" = "xno"; then -- AC_MSG_ERROR([BLOCKDEV CRYPTO support requested but header or library not found]) -+ if test "x$have_crypto" = "xno"; then -+ AC_MSG_ERROR([BLOCKDEV CRYPTO support requested but header or library not found]) -+ fi - fi - - -@@ -721,6 +739,10 @@ doc/man/udisksctl.xml - doc/man/umount.udisks2.xml - doc/man/udisks2.conf.5.xml.in - doc/man/udisks2_lsm.conf.5.xml.in -+doc/udisks2-docs.xml.daemon.man -+doc/udisks2-docs.xml.daemon.part -+doc/udisks2-sections.txt.daemon.sections -+doc/udisks2.types.daemon - doc/udisks2-docs.xml.iscsi.dbus - doc/udisks2-docs.xml.iscsi.generated - doc/udisks2-sections.txt.iscsi.sections -@@ -787,6 +809,7 @@ echo " - Building api docs: ${enable_gtk_doc} - Building man pages: ${enable_man} - -+ Enable daemon: ${enable_daemon} - Enable modules: ${enable_modules_info} - - BTRFS module: ${have_btrfs} Property changes on: head/sysutils/libudisks/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.in.in =================================================================== --- head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.in.in (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.in.in (nonexistent) @@ -1,605 +0,0 @@ ---- doc/udisks2-sections.txt.in.in.orig 2019-07-22 16:24:44 UTC -+++ doc/udisks2-sections.txt.in.in -@@ -108,385 +108,6 @@ udisks_object_info_get_type - - -
--udisksdaemon --UDisksDaemon --UDisksDaemon --udisks_daemon_new --udisks_daemon_get_connection --udisks_daemon_get_object_manager --udisks_daemon_get_mount_monitor --udisks_daemon_get_fstab_monitor --udisks_daemon_get_crypttab_monitor --udisks_daemon_get_linux_provider --udisks_daemon_get_authority --udisks_daemon_get_state --UDisksDaemonWaitFunc --udisks_daemon_wait_for_object_sync --udisks_daemon_get_objects --udisks_daemon_find_object --udisks_daemon_find_block --udisks_daemon_find_block_by_device_file --udisks_daemon_find_block_by_sysfs_path --udisks_daemon_launch_simple_job --udisks_daemon_launch_spawned_job --udisks_daemon_launch_spawned_job_sync --udisks_daemon_launch_threaded_job --udisks_daemon_get_disable_modules --udisks_daemon_get_force_load_modules --udisks_daemon_get_module_manager -- --UDISKS_TYPE_DAEMON --UDISKS_DAEMON --UDISKS_IS_DAEMON -- --udisks_daemon_get_type --udisks_daemon_marshal_BOOLEAN__BOOLEAN_BOXED --udisks_daemon_marshal_BOOLEAN__BOXED_INT_BOXED_BOXED --
-- --
--udisksbasejob --UDisksBaseJob --UDisksBaseJob --UDisksBaseJobClass --udisks_base_job_get_daemon --udisks_base_job_get_cancellable --udisks_base_job_get_auto_estimate --udisks_base_job_set_auto_estimate --udisks_base_job_add_object --udisks_base_job_remove_object -- --UDISKS_TYPE_BASE_JOB --UDISKS_BASE_JOB --UDISKS_IS_BASE_JOB --UDISKS_BASE_JOB_CLASS --UDISKS_BASE_JOB_GET_CLASS --UDISKS_IS_BASE_JOB_CLASS --UDisksBaseJobPrivate -- --udisks_base_job_get_type --
-- --
--udisksspawnedjob --UDisksSpawnedJob --UDisksSpawnedJob --udisks_spawned_job_new --udisks_spawned_job_get_command_line --udisks_spawned_job_start -- --UDISKS_TYPE_SPAWNED_JOB --UDISKS_SPAWNED_JOB --UDISKS_IS_SPAWNED_JOB -- --udisks_spawned_job_get_type --
-- --
--udisksthreadedjob --UDisksThreadedJob --UDisksThreadedJob --UDisksThreadedJobFunc --udisks_threaded_job_new --udisks_threaded_job_start --udisks_threaded_job_run_sync --udisks_threaded_job_get_user_data -- --UDISKS_TYPE_THREADED_JOB --UDISKS_THREADED_JOB --UDISKS_IS_THREADED_JOB -- --udisks_threaded_job_get_type --
-- --
--udiskssimplejob --UDisksSimpleJob --UDisksSimpleJob --udisks_simple_job_new --udisks_simple_job_complete -- --UDISKS_TYPE_SIMPLE_JOB --UDISKS_SIMPLE_JOB --UDISKS_IS_SIMPLE_JOB -- --udisks_simple_job_get_type --
-- --
--udiskslinuxdriveobject --UDisksLinuxDriveObject --UDisksLinuxDriveObject --udisks_linux_drive_object_new --udisks_linux_drive_object_uevent --udisks_linux_drive_object_get_daemon --udisks_linux_drive_object_get_block --udisks_linux_drive_object_get_device --udisks_linux_drive_object_get_devices --udisks_linux_drive_object_get_siblings --udisks_linux_drive_object_housekeeping --udisks_linux_drive_object_is_not_in_use -- --UDISKS_TYPE_LINUX_DRIVE_OBJECT --UDISKS_LINUX_DRIVE_OBJECT --UDISKS_IS_LINUX_DRIVE_OBJECT -- --udisks_linux_drive_object_get_type --udisks_linux_drive_object_should_include_device --
-- --
--udiskslinuxdrive --UDisksLinuxDrive --udisks_linux_drive_new --udisks_linux_drive_update -- --UDISKS_LINUX_DRIVE --UDISKS_IS_LINUX_DRIVE --UDISKS_TYPE_LINUX_DRIVE -- --udisks_linux_drive_get_type --
-- --
--udiskslinuxdriveata --UDisksLinuxDriveAta --udisks_linux_drive_ata_new --udisks_linux_drive_ata_update --udisks_linux_drive_ata_refresh_smart_sync --udisks_linux_drive_ata_smart_selftest_sync --udisks_linux_drive_ata_apply_configuration --udisks_linux_drive_ata_secure_erase_sync --udisks_linux_drive_ata_get_pm_state --UDISKS_LINUX_DRIVE_ATA_IS_AWAKE -- --UDISKS_LINUX_DRIVE_ATA --UDISKS_IS_LINUX_DRIVE_ATA --UDISKS_TYPE_LINUX_DRIVE_ATA -- --udisks_linux_drive_ata_get_type --
-- --
--udisksprovider --UDisksProvider --UDisksProvider --UDisksProviderClass --udisks_provider_start --udisks_provider_get_daemon -- --UDISKS_TYPE_PROVIDER --UDISKS_PROVIDER --UDISKS_PROVIDER_GET_CLASS --UDISKS_PROVIDER_CLASS --UDISKS_IS_PROVIDER --UDISKS_IS_PROVIDER_CLASS -- --udisks_provider_get_type --UDisksProviderPrivate --
-- --
--udiskslinuxprovider --UDisksLinuxProvider --UDisksLinuxProvider --udisks_linux_provider_new --udisks_linux_provider_get_udev_client --udisks_linux_provider_get_coldplug -- --UDISKS_TYPE_LINUX_PROVIDER --UDISKS_LINUX_PROVIDER --UDISKS_IS_LINUX_PROVIDER -- --udisks_linux_provider_get_type --
-- --
--udisksmountmonitor --UDisksMountMonitor --UDisksMount --UDisksMountType --udisks_mount_get_dev --udisks_mount_get_mount_type --udisks_mount_get_mount_path --udisks_mount_compare --UDisksMountMonitor --udisks_mount_monitor_new --udisks_mount_monitor_get_mounts_for_dev --udisks_mount_monitor_is_dev_in_use -- --UDISKS_TYPE_MOUNT --UDISKS_MOUNT --UDISKS_IS_MOUNT --UDISKS_TYPE_MOUNT_MONITOR --UDISKS_MOUNT_MONITOR --UDISKS_IS_MOUNT_MONITOR -- --udisks_mount_get_type --udisks_mount_monitor_get_type --
-- --
--udisksstate --UDisksState --UDisksState --udisks_state_new --udisks_state_start_cleanup --udisks_state_stop_cleanup --udisks_state_check --udisks_state_check_sync --udisks_state_get_daemon -- --udisks_state_add_mounted_fs --udisks_state_find_mounted_fs -- --udisks_state_add_unlocked_crypto_dev --udisks_state_find_unlocked_crypto_dev -- --udisks_state_add_loop --udisks_state_has_loop -- --udisks_state_add_mdraid --udisks_state_has_mdraid -- --UDISKS_TYPE_STATE --UDISKS_STATE --UDISKS_IS_STATE -- --udisks_state_get_type --
-- --
--udisksata --UDisksAtaCommandProtocol --UDisksAtaCommandInput --UDisksAtaCommandOutput --udisks_ata_send_command_sync --
-- --
--udiskslinuxdevice --UDisksLinuxDevice --UDisksLinuxDevice --udisks_linux_device_new_sync --udisks_linux_device_reprobe_sync -- --UDISKS_TYPE_LINUX_DEVICE --UDISKS_LINUX_DEVICE --UDISKS_IS_LINUX_DEVICE -- --udisks_linux_device_get_type --
-- --
--udisksdaemonutil --udisks_decode_udev_string --udisks_safe_append_to_object_path --udisks_daemon_util_block_get_size --udisks_daemon_util_resolve_link --udisks_daemon_util_resolve_links --udisks_daemon_util_check_authorization_sync --udisks_daemon_util_get_caller_uid_sync --udisks_daemon_util_get_caller_pid_sync --udisks_daemon_util_setup_by_user --udisks_daemon_util_dup_object --udisks_daemon_util_escape --udisks_daemon_util_escape_and_quote --UDisksInhibitCookie --udisks_daemon_util_inhibit_system_sync --udisks_daemon_util_uninhibit_system_sync --udisks_daemon_util_hexdump --udisks_daemon_util_hexdump_debug --udisks_daemon_util_file_set_contents --udisks_daemon_util_on_user_seat --udisks_daemon_util_get_free_mdraid_device --udisks_ata_identify_get_word --
-- --
--udiskslinuxblockobject --UDisksLinuxBlockObject --UDisksLinuxBlockObject --udisks_linux_block_object_new --udisks_linux_block_object_uevent --udisks_linux_block_object_get_daemon --udisks_linux_block_object_get_device --udisks_linux_block_object_trigger_uevent --udisks_linux_block_object_reread_partition_table -- --UDISKS_TYPE_LINUX_BLOCK_OBJECT --UDISKS_LINUX_BLOCK_OBJECT --UDISKS_IS_LINUX_BLOCK_OBJECT -- --udisks_linux_block_object_get_type --
-- --
--udiskslinuxblock --UDisksLinuxBlock --udisks_linux_block_new --udisks_linux_block_update -- --UDISKS_LINUX_BLOCK --UDISKS_IS_LINUX_BLOCK --UDISKS_TYPE_LINUX_BLOCK -- --udisks_linux_block_get_type --
-- --
--udiskslinuxfilesystem --UDisksLinuxFilesystem --udisks_linux_filesystem_new --udisks_linux_filesystem_update -- --UDISKS_LINUX_FILESYSTEM --UDISKS_IS_LINUX_FILESYSTEM --UDISKS_TYPE_LINUX_FILESYSTEM -- --udisks_linux_filesystem_get_type --
-- --
--udiskslinuxencrypted --UDisksLinuxEncrypted --udisks_linux_encrypted_new --udisks_linux_encrypted_update -- --UDISKS_LINUX_ENCRYPTED --UDISKS_IS_LINUX_ENCRYPTED --UDISKS_TYPE_LINUX_ENCRYPTED -- --udisks_linux_encrypted_get_type --
-- --
--udiskslinuxswapspace --UDisksLinuxSwapspace --udisks_linux_swapspace_new --udisks_linux_swapspace_update -- --UDISKS_LINUX_SWAPSPACE --UDISKS_IS_LINUX_SWAPSPACE --UDISKS_TYPE_LINUX_SWAPSPACE -- --udisks_linux_swapspace_get_type --
-- --
--udiskslinuxloop --UDisksLinuxLoop --udisks_linux_loop_new --udisks_linux_loop_update -- --UDISKS_LINUX_LOOP --UDISKS_IS_LINUX_LOOP --UDISKS_TYPE_LINUX_LOOP -- --udisks_linux_loop_get_type --
-- --
- UDisksObject - UDisksObject - UDisksObject -@@ -1310,20 +931,6 @@ udisks_manager_skeleton_get_type -
- -
--udiskslinuxmanager --UDisksLinuxManager --UDisksLinuxManager --udisks_linux_manager_new --udisks_linux_manager_get_daemon -- --UDISKS_TYPE_LINUX_MANAGER --UDISKS_LINUX_MANAGER --UDISKS_IS_LINUX_MANAGER -- --udisks_linux_manager_get_type --
-- --
- UDisksLoop - UDisksLoop - UDisksLoopIface -@@ -1379,6 +986,8 @@ udisks_loop_proxy_get_type - udisks_loop_skeleton_get_type -
- -+ -+ - - - -@@ -1394,77 +1003,6 @@ udisks_loop_skeleton_get_type - - -
--udisksfstabmonitor --UDisksFstabMonitor --UDisksFstabEntry --udisks_fstab_entry_get_fsname --udisks_fstab_entry_get_dir --udisks_fstab_entry_get_fstype --udisks_fstab_entry_get_opts --udisks_fstab_entry_get_freq --udisks_fstab_entry_get_passno --udisks_fstab_entry_compare --UDisksFstabMonitor --udisks_fstab_monitor_new --udisks_fstab_monitor_get_entries -- --UDISKS_TYPE_FSTAB_ENTRY --UDISKS_FSTAB_ENTRY --UDISKS_IS_FSTAB_ENTRY --UDISKS_TYPE_FSTAB_MONITOR --UDISKS_FSTAB_MONITOR --UDISKS_IS_FSTAB_MONITOR -- --udisks_fstab_entry_get_type --udisks_fstab_monitor_get_type --
-- --
--udiskscrypttabmonitor --UDisksCrypttabMonitor --UDisksCrypttabEntry --udisks_crypttab_entry_get_name --udisks_crypttab_entry_get_device --udisks_crypttab_entry_get_passphrase_path --udisks_crypttab_entry_get_options --udisks_crypttab_entry_compare --UDisksCrypttabMonitor --udisks_crypttab_monitor_new --udisks_crypttab_monitor_get_entries -- --UDISKS_TYPE_CRYPTTAB_ENTRY --UDISKS_CRYPTTAB_ENTRY --UDISKS_IS_CRYPTTAB_ENTRY --UDISKS_TYPE_CRYPTTAB_MONITOR --UDISKS_CRYPTTAB_MONITOR --UDISKS_IS_CRYPTTAB_MONITOR -- --udisks_crypttab_entry_get_type --udisks_crypttab_monitor_get_type --
-- --
--udisksutabmonitor --UDisksUtabMonitor --UDisksUtabEntry --udisks_utab_entry_get_source --udisks_utab_entry_get_opts --UDisksUtabMonitor --udisks_utab_monitor_new --udisks_utab_monitor_get_entries -- --UDISKS_TYPE_UTAB_ENTRY --UDISKS_UTAB_ENTRY --UDISKS_IS_UTAB_ENTRY --UDISKS_TYPE_UTAB_MONITOR --UDISKS_UTAB_MONITOR --UDISKS_IS_UTAB_MONITOR -- --udisks_utab_entry_get_type --udisks_utab_monitor_get_type --
-- --
- UDisksPartition - UDisksPartition - UDisksPartitionIface -@@ -1601,64 +1139,6 @@ udisks_partition_table_skeleton_get_type -
- -
--udiskslinuxpartition --UDisksLinuxPartition --udisks_linux_partition_new --udisks_linux_partition_update --udisks_linux_partition_set_type_sync -- --UDISKS_LINUX_PARTITION --UDISKS_IS_LINUX_PARTITION --UDISKS_TYPE_LINUX_PARTITION -- --udisks_linux_partition_get_type --
-- --
--udiskslinuxpartitiontable --UDisksLinuxPartitionTable --udisks_linux_partition_table_new --udisks_linux_partition_table_update -- --UDISKS_LINUX_PARTITION_TABLE --UDISKS_IS_LINUX_PARTITION_TABLE --UDISKS_TYPE_LINUX_PARTITION_TABLE -- --udisks_linux_partition_table_get_type --
-- --
--udiskslinuxmdraidobject --UDisksLinuxMDRaidObject --udisks_linux_mdraid_object_new --udisks_linux_mdraid_object_uevent --udisks_linux_mdraid_object_have_devices --udisks_linux_mdraid_object_get_daemon --udisks_linux_mdraid_object_get_device --udisks_linux_mdraid_object_get_members --udisks_linux_mdraid_object_get_uuid -- --UDISKS_LINUX_MDRAID_OBJECT --UDISKS_IS_LINUX_MDRAID_OBJECT --UDISKS_TYPE_LINUX_MDRAID_OBJECT -- --udisks_linux_mdraid_object_get_type --
-- --
--udiskslinuxmdraid --UDisksLinuxMDRaid --udisks_linux_mdraid_new --udisks_linux_mdraid_update -- --UDISKS_LINUX_MDRAID --UDISKS_IS_LINUX_MDRAID --UDISKS_TYPE_LINUX_MDRAID -- --udisks_linux_mdraid_get_type --
-- --
- UDisksMDRaid - UDisksMDRaid - UDisksMDRaidIface -@@ -1757,43 +1237,4 @@ UDisksMDRaidSkeletonPrivate - udisks_mdraid_get_type - udisks_mdraid_proxy_get_type - udisks_mdraid_skeleton_get_type --
-- --
--UDisksModuleManager --UDisksModuleManager --UDisksModuleInterfaceInfo --UDisksObjectHasInterfaceFunc --UDisksObjectConnectInterfaceFunc --UDisksObjectUpdateInterfaceFunc --UDisksModuleObjectNewFunc --UDisksModuleNewManagerIfaceFunc --UDisksModuleInitFunc --UDisksModuleIfaceSetupFunc --UDisksModuleObjectNewSetupFunc --UDisksModuleNewManagerIfaceSetupFunc --UDisksModuleObject --UDisksModuleObjectIface --udisks_module_manager_new --udisks_module_manager_get_modules_available --udisks_module_manager_load_modules --udisks_module_manager_get_module_state_pointer --udisks_module_manager_set_module_state_pointer --udisks_module_manager_get_block_object_iface_infos --udisks_module_manager_get_drive_object_iface_infos --udisks_module_manager_get_module_object_new_funcs --udisks_module_manager_get_new_manager_iface_funcs --udisks_module_object_process_uevent --udisks_module_object_housekeeping -- --UDISKS_IS_MODULE_MANAGER --UDISKS_IS_MODULE_OBJECT --UDISKS_MODULE_MANAGER --UDISKS_MODULE_OBJECT --UDISKS_MODULE_OBJECT_GET_IFACE --UDISKS_TYPE_MODULE_MANAGER --UDISKS_TYPE_MODULE_OBJECT -- --udisks_module_manager_get_type --udisks_module_object_get_type -
Property changes on: head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.in.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/libudisks/files/patch-doc_Makefile.am =================================================================== --- head/sysutils/libudisks/files/patch-doc_Makefile.am (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_Makefile.am (nonexistent) @@ -1,213 +0,0 @@ ---- doc/Makefile.am.orig 2019-07-22 16:24:44 UTC -+++ doc/Makefile.am -@@ -21,17 +21,29 @@ UDISKS_TYPES=$(DOC_MODULE).types - UDISKS_SECTIONS=$(DOC_MODULE)-sections.txt - - # The directory containing the source code. Relative to $(srcdir) --DOC_SOURCE_DIR = $(top_srcdir) -+DOC_SOURCE_DIR = $(top_srcdir) $(top_builddir) - - HFILE_GLOB = \ - $(top_srcdir)/udisks/*.h \ -- $(top_srcdir)/src/*.h \ -- $(top_srcdir)/modules/*.h -+ $(top_builddir)/udisks/*.h \ -+ $(NULL) - - CFILE_GLOB = \ - $(top_srcdir)/udisks/*.c \ -+ $(top_builddir)/udisks/*.c \ -+ $(NULL) -+ -+if ENABLE_DAEMON -+HFILE_GLOB += \ -+ $(top_srcdir)/src/*.h \ -+ $(top_srcdir)/modules/*.h \ -+ $(NULL) -+ -+CFILE_GLOB += \ - $(top_srcdir)/src/*.c \ -- $(top_srcdir)/modules/*.c -+ $(top_srcdir)/modules/*.c \ -+ $(NULL) -+endif # ENABLE_DAEMON - - # Headers to ignore - IGNORE_HFILES= \ -@@ -52,8 +64,13 @@ GTKDOC_LIBS = - $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(top_builddir)/udisks/libudisks2.la \ -+ $(NULL) -+ -+if ENABLE_DAEMON -+GTKDOC_LIBS += \ - $(top_builddir)/src/libudisks-daemon.la \ - $(NULL) -+endif # ENABLE_DAEMON - - # Extra options to supply to gtkdoc-mkdb - MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=udisks -@@ -73,7 +90,9 @@ extra_files = - - # ------------------------------------------------------------------------------ - -+if ENABLE_GTK_DOC - all-local: generate-main-sgml-file -+endif - - # New gtk-doc 2.16 for some reason automatically creates a no-op - # "$(DOC_MAIN_SGML_FILE)" make target that overrides our target -@@ -85,61 +104,69 @@ generate-main-sgml-file: $(DOC_MAIN_SGML_FILE).in $(UD - cp $(DOC_MAIN_SGML_FILE).in $(builddir)/$(DOC_MAIN_SGML_FILE) && \ - cp $(UDISKS_SECTIONS).in $(builddir)/$(UDISKS_SECTIONS) && \ - cp $(UDISKS_TYPES).in $(builddir)/$(UDISKS_TYPES) -+if ENABLE_DAEMON -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).daemon.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).daemon.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).daemon.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) -+else -+ $(AM_V_at) $(SED) "/<\!-- DAEMON_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) "/\# DAEMON_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) -+endif # ENABLE_DAEMON - if HAVE_LVM2 -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lvm2.sed $(builddir)/$(DOC_MAIN_SGML_FILE) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).lvm2.sed $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).lvm2.sed $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lvm2.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).lvm2.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).lvm2.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - else -- $(AM_V_at) $(SED) -i "/<\!-- LVM2_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i "/\# LVM2_TYPES/d" $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) "/<\!-- LVM2_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) "/\# LVM2_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - endif # HAVE_LVM2 - if HAVE_LSM -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lsm.sed $(builddir)/$(DOC_MAIN_SGML_FILE) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).lsm.sed $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).lsm.sed $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lsm.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).lsm.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).lsm.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - else -- $(AM_V_at) $(SED) -i "/<\!-- LSM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i "/\# LSM_TYPES/d" $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) "/<\!-- LSM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) "/\# LSM_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - endif # HAVE_LSM - if HAVE_ISCSI -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).iscsi.sed $(builddir)/$(DOC_MAIN_SGML_FILE) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).iscsi.sed $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).iscsi.sed $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).iscsi.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).iscsi.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).iscsi.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - else -- $(AM_V_at) $(SED) -i "/<\!-- ISCSI_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i "/\# ISCSI_TYPES/d" $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) "/<\!-- ISCSI_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) "/\# ISCSI_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - endif # HAVE_ISCSI - if HAVE_BTRFS -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).btrfs.sed $(builddir)/$(DOC_MAIN_SGML_FILE) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).btrfs.sed $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).btrfs.sed $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).btrfs.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).btrfs.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).btrfs.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - else -- $(AM_V_at) $(SED) -i "/<\!-- BTRFS_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i "/\# BTRFS_TYPES/d" $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) "/<\!-- BTRFS_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) "/\# BTRFS_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - endif # HAVE_BTRFS - if HAVE_ZRAM -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).zram.sed $(builddir)/$(DOC_MAIN_SGML_FILE) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).zram.sed $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).zram.sed $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).zram.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).zram.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).zram.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - else -- $(AM_V_at) $(SED) -i "/<\!-- ZRAM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i "/\# ZRAM_TYPES/d" $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) "/<\!-- ZRAM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) "/\# ZRAM_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - endif # HAVE_ZRAM - if HAVE_BCACHE -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).bcache.sed $(builddir)/$(DOC_MAIN_SGML_FILE) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).bcache.sed $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).bcache.sed $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).bcache.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).bcache.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).bcache.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - else -- $(AM_V_at) $(SED) -i "/<\!-- BCACHE_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i "/\# BCACHE_TYPES/d" $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) "/<\!-- BCACHE_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) "/\# BCACHE_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - endif # HAVE_BCACHE - if HAVE_VDO -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).vdo.sed $(builddir)/$(DOC_MAIN_SGML_FILE) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).vdo.sed $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).vdo.sed $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).vdo.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).vdo.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).vdo.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - else -- $(AM_V_at) $(SED) -i "/<\!-- VDO_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) -- $(AM_V_at) $(SED) -i "/\# VDO_TYPES/d" $(builddir)/$(UDISKS_TYPES) -+ $(AM_V_at) $(SED) "/<\!-- VDO_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS) -+ $(AM_V_at) $(SED) "/\# VDO_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES) - endif # HAVE_VDO - - # GTKDOC for LVM2 -@@ -212,12 +239,14 @@ include $(top_srcdir)/gtk-doc.make - EXTRA_DIST += \ - $(DOC_MAIN_SGML_FILE).in.in \ - $(DOC_MAIN_SGML_FILE).in \ -- $(DOC_MAIN_SGML_FILE).bcache.dbus.in \ -- $(DOC_MAIN_SGML_FILE).bcache.generated.in \ -- $(DOC_MAIN_SGML_FILE).bcache.sed \ -+ $(DOC_MAIN_SGML_FILE).bcache.dbus.in \ -+ $(DOC_MAIN_SGML_FILE).bcache.generated.in \ -+ $(DOC_MAIN_SGML_FILE).bcache.sed \ - $(DOC_MAIN_SGML_FILE).btrfs.dbus.in \ - $(DOC_MAIN_SGML_FILE).btrfs.generated.in \ - $(DOC_MAIN_SGML_FILE).btrfs.sed \ -+ $(DOC_MAIN_SGML_FILE).daemon.part.in \ -+ $(DOC_MAIN_SGML_FILE).daemon.sed \ - $(DOC_MAIN_SGML_FILE).iscsi.dbus.in \ - $(DOC_MAIN_SGML_FILE).iscsi.generated.in \ - $(DOC_MAIN_SGML_FILE).iscsi.sed \ -@@ -236,10 +265,12 @@ EXTRA_DIST += - $(DOC_MAIN_SGML_FILE).zram.sed \ - $(UDISKS_TYPES).in.in \ - $(UDISKS_TYPES).in \ -- $(UDISKS_TYPES).bcache.in \ -- $(UDISKS_TYPES).bcache.sed \ -+ $(UDISKS_TYPES).bcache.in \ -+ $(UDISKS_TYPES).bcache.sed \ - $(UDISKS_TYPES).btrfs.in \ - $(UDISKS_TYPES).btrfs.sed \ -+ $(UDISKS_TYPES).daemon.in \ -+ $(UDISKS_TYPES).daemon.sed \ - $(UDISKS_TYPES).iscsi.in \ - $(UDISKS_TYPES).iscsi.sed \ - $(UDISKS_TYPES).lsm.in \ -@@ -252,10 +283,12 @@ EXTRA_DIST += - $(UDISKS_TYPES).zram.sed \ - $(UDISKS_SECTIONS).in.in \ - $(UDISKS_SECTIONS).in \ -- $(UDISKS_SECTIONS).bcache.sections.in \ -- $(UDISKS_SECTIONS).bcache.sed \ -+ $(UDISKS_SECTIONS).bcache.sections.in \ -+ $(UDISKS_SECTIONS).bcache.sed \ - $(UDISKS_SECTIONS).btrfs.sections.in \ - $(UDISKS_SECTIONS).btrfs.sed \ -+ $(UDISKS_SECTIONS).daemon.sections.in \ -+ $(UDISKS_SECTIONS).daemon.sed \ - $(UDISKS_SECTIONS).iscsi.sections.in \ - $(UDISKS_SECTIONS).iscsi.sed \ - $(UDISKS_SECTIONS).lsm.sections.in \ Property changes on: head/sysutils/libudisks/files/patch-doc_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/libudisks/files/patch-doc_man_Makefile.am =================================================================== --- head/sysutils/libudisks/files/patch-doc_man_Makefile.am (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_man_Makefile.am (nonexistent) @@ -1,19 +0,0 @@ ---- doc/man/Makefile.am.orig 2019-07-22 16:24:44 UTC -+++ doc/man/Makefile.am -@@ -6,11 +6,16 @@ man_MANS = - if ENABLE_MAN - man_MANS += \ - udisksctl.1 \ -+ $(NULL) -+ -+if ENABLE_DAEMON -+man_MANS += \ - udisksd.8 \ - udisks.8 \ - umount.udisks2.8 \ - udisks2.conf.5 \ - $(NULL) -+endif # ENABLE_DAEMON - - if HAVE_LSM - man_MANS += udisks2_lsm.conf.5 Property changes on: head/sysutils/libudisks/files/patch-doc_man_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.man.in =================================================================== --- head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.man.in (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.man.in (revision 540342) @@ -1,7 +1,10 @@ ---- doc/udisks2-docs.xml.daemon.man.in.orig 2019-10-03 03:15:30 UTC +--- doc/udisks2-docs.xml.daemon.man.in.orig 2020-05-26 15:07:07 UTC +++ doc/udisks2-docs.xml.daemon.man.in -@@ -0,0 +1,4 @@ +@@ -2,3 +2,7 @@ + + + + + + + Index: head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.part.in =================================================================== --- head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.part.in (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.part.in (revision 540342) @@ -1,58 +1,64 @@ ---- doc/udisks2-docs.xml.daemon.part.in.orig 2019-10-03 03:15:30 UTC +--- doc/udisks2-docs.xml.daemon.part.in.orig 2020-05-26 15:07:07 UTC +++ doc/udisks2-docs.xml.daemon.part.in -@@ -0,0 +1,55 @@ -+ -+ Daemon Implementation Details -+ -+ Core -+ -+ -+ -+ -+ -+ -+ +@@ -9,6 +9,61 @@ + + + + + + State and Configuration + + + + + + + Jobs + + + + + + + Linux-specific types + + + + + + Drives on Linux + + + + + + Linux RAID + + + + + Block devices on Linux + + + + + + + + + + ++ ++ Daemon Implementation Details ++ ++ Core ++ ++ ++ ++ ++ ++ ++ + + + Index: head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.sed =================================================================== --- head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.sed (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.sed (revision 540342) @@ -1,10 +1,13 @@ ---- doc/udisks2-docs.xml.daemon.sed.orig 2019-10-03 03:15:30 UTC +--- doc/udisks2-docs.xml.daemon.sed.orig 2020-05-26 15:07:07 UTC +++ doc/udisks2-docs.xml.daemon.sed -@@ -0,0 +1,7 @@ +@@ -5,3 +5,10 @@ + // { + r udisks2-docs.xml.daemon.part + d } +// { + r udisks2-docs.xml.daemon.man + d } + +// { + r udisks2-docs.xml.daemon.part + d } Index: head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sections.in =================================================================== --- head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sections.in (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sections.in (revision 540342) @@ -1,563 +1,569 @@ ---- doc/udisks2-sections.txt.daemon.sections.in.orig 2019-10-03 03:15:30 UTC +--- doc/udisks2-sections.txt.daemon.sections.in.orig 2020-05-26 15:07:07 UTC +++ doc/udisks2-sections.txt.daemon.sections.in -@@ -0,0 +1,560 @@ -+
-+udisksdaemon -+UDisksDaemon -+UDisksDaemon -+udisks_daemon_new -+udisks_daemon_get_connection -+udisks_daemon_get_object_manager -+udisks_daemon_get_mount_monitor +@@ -6,6 +6,566 @@ udisks_daemon_new + udisks_daemon_get_connection + udisks_daemon_get_object_manager + udisks_daemon_get_mount_monitor +udisks_daemon_get_fstab_monitor +udisks_daemon_get_crypttab_monitor +udisks_daemon_get_linux_provider +udisks_daemon_get_authority +udisks_daemon_get_state +UDisksDaemonWaitFunc +udisks_daemon_wait_for_object_sync +udisks_daemon_get_objects +udisks_daemon_find_object +udisks_daemon_find_block +udisks_daemon_find_block_by_device_file +udisks_daemon_find_block_by_sysfs_path +udisks_daemon_launch_simple_job +udisks_daemon_launch_spawned_job +udisks_daemon_launch_spawned_job_sync +udisks_daemon_launch_threaded_job +udisks_daemon_get_disable_modules +udisks_daemon_get_force_load_modules +udisks_daemon_get_module_manager + +UDISKS_TYPE_DAEMON +UDISKS_DAEMON +UDISKS_IS_DAEMON + +udisks_daemon_get_type +udisks_daemon_marshal_BOOLEAN__BOOLEAN_BOXED +udisks_daemon_marshal_BOOLEAN__BOXED_INT_BOXED_BOXED +
+ +
+udisksbasejob +UDisksBaseJob +UDisksBaseJob +UDisksBaseJobClass +udisks_base_job_get_daemon +udisks_base_job_get_cancellable +udisks_base_job_get_auto_estimate +udisks_base_job_set_auto_estimate +udisks_base_job_add_object +udisks_base_job_remove_object + +UDISKS_TYPE_BASE_JOB +UDISKS_BASE_JOB +UDISKS_IS_BASE_JOB +UDISKS_BASE_JOB_CLASS +UDISKS_BASE_JOB_GET_CLASS +UDISKS_IS_BASE_JOB_CLASS +UDisksBaseJobPrivate + +udisks_base_job_get_type +
+ +
+udisksspawnedjob +UDisksSpawnedJob +UDisksSpawnedJob +udisks_spawned_job_new +udisks_spawned_job_get_command_line +udisks_spawned_job_start + +UDISKS_TYPE_SPAWNED_JOB +UDISKS_SPAWNED_JOB +UDISKS_IS_SPAWNED_JOB + +udisks_spawned_job_get_type +
+ +
+udisksthreadedjob +UDisksThreadedJob +UDisksThreadedJob +UDisksThreadedJobFunc +udisks_threaded_job_new +udisks_threaded_job_start +udisks_threaded_job_run_sync +udisks_threaded_job_get_user_data + +UDISKS_TYPE_THREADED_JOB +UDISKS_THREADED_JOB +UDISKS_IS_THREADED_JOB + +udisks_threaded_job_get_type +
+ +
+udiskssimplejob +UDisksSimpleJob +UDisksSimpleJob +udisks_simple_job_new +udisks_simple_job_complete + +UDISKS_TYPE_SIMPLE_JOB +UDISKS_SIMPLE_JOB +UDISKS_IS_SIMPLE_JOB + +udisks_simple_job_get_type +
+ +
+udiskslinuxdriveobject +UDisksLinuxDriveObject +UDisksLinuxDriveObject +udisks_linux_drive_object_new +udisks_linux_drive_object_uevent +udisks_linux_drive_object_get_daemon +udisks_linux_drive_object_get_block +udisks_linux_drive_object_get_device +udisks_linux_drive_object_get_devices +udisks_linux_drive_object_get_siblings +udisks_linux_drive_object_housekeeping +udisks_linux_drive_object_is_not_in_use + +UDISKS_TYPE_LINUX_DRIVE_OBJECT +UDISKS_LINUX_DRIVE_OBJECT +UDISKS_IS_LINUX_DRIVE_OBJECT + +udisks_linux_drive_object_get_type +udisks_linux_drive_object_should_include_device +
+ +
+udiskslinuxdrive +UDisksLinuxDrive +udisks_linux_drive_new +udisks_linux_drive_update + +UDISKS_LINUX_DRIVE +UDISKS_IS_LINUX_DRIVE +UDISKS_TYPE_LINUX_DRIVE + +udisks_linux_drive_get_type +
+ +
+udiskslinuxdriveata +UDisksLinuxDriveAta +udisks_linux_drive_ata_new +udisks_linux_drive_ata_update +udisks_linux_drive_ata_refresh_smart_sync +udisks_linux_drive_ata_smart_selftest_sync +udisks_linux_drive_ata_apply_configuration +udisks_linux_drive_ata_secure_erase_sync +udisks_linux_drive_ata_get_pm_state +UDISKS_LINUX_DRIVE_ATA_IS_AWAKE + +UDISKS_LINUX_DRIVE_ATA +UDISKS_IS_LINUX_DRIVE_ATA +UDISKS_TYPE_LINUX_DRIVE_ATA + +udisks_linux_drive_ata_get_type +
+ +
+udisksprovider +UDisksProvider +UDisksProvider +UDisksProviderClass +udisks_provider_start +udisks_provider_get_daemon + +UDISKS_TYPE_PROVIDER +UDISKS_PROVIDER +UDISKS_PROVIDER_GET_CLASS +UDISKS_PROVIDER_CLASS +UDISKS_IS_PROVIDER +UDISKS_IS_PROVIDER_CLASS + +udisks_provider_get_type +UDisksProviderPrivate +
+ +
+udiskslinuxprovider +UDisksLinuxProvider +UDisksLinuxProvider +udisks_linux_provider_new +udisks_linux_provider_get_udev_client +udisks_linux_provider_get_coldplug + +UDISKS_TYPE_LINUX_PROVIDER +UDISKS_LINUX_PROVIDER +UDISKS_IS_LINUX_PROVIDER + +udisks_linux_provider_get_type +
+ +
+udisksmountmonitor +UDisksMountMonitor +UDisksMount +UDisksMountType +udisks_mount_get_dev +udisks_mount_get_mount_type +udisks_mount_get_mount_path +udisks_mount_compare +UDisksMountMonitor +udisks_mount_monitor_new +udisks_mount_monitor_get_mounts_for_dev +udisks_mount_monitor_is_dev_in_use + +UDISKS_TYPE_MOUNT +UDISKS_MOUNT +UDISKS_IS_MOUNT +UDISKS_TYPE_MOUNT_MONITOR +UDISKS_MOUNT_MONITOR +UDISKS_IS_MOUNT_MONITOR + +udisks_mount_get_type +udisks_mount_monitor_get_type +
+ +
+udisksstate +UDisksState +UDisksState +udisks_state_new +udisks_state_start_cleanup +udisks_state_stop_cleanup +udisks_state_check +udisks_state_check_sync +udisks_state_get_daemon + +udisks_state_add_mounted_fs +udisks_state_find_mounted_fs + +udisks_state_add_unlocked_crypto_dev +udisks_state_find_unlocked_crypto_dev + +udisks_state_add_loop +udisks_state_has_loop + +udisks_state_add_mdraid +udisks_state_has_mdraid + +UDISKS_TYPE_STATE +UDISKS_STATE +UDISKS_IS_STATE + +udisks_state_get_type +
+ +
+udisksata +UDisksAtaCommandProtocol +UDisksAtaCommandInput +UDisksAtaCommandOutput +udisks_ata_send_command_sync +
+ +
+udiskslinuxdevice +UDisksLinuxDevice +UDisksLinuxDevice +udisks_linux_device_new_sync +udisks_linux_device_reprobe_sync + +UDISKS_TYPE_LINUX_DEVICE +UDISKS_LINUX_DEVICE +UDISKS_IS_LINUX_DEVICE + +udisks_linux_device_get_type +
+ +
+udisksdaemonutil +udisks_decode_udev_string +udisks_safe_append_to_object_path +udisks_daemon_util_block_get_size +udisks_daemon_util_resolve_link +udisks_daemon_util_resolve_links +udisks_daemon_util_check_authorization_sync +udisks_daemon_util_get_caller_uid_sync +udisks_daemon_util_get_caller_pid_sync +udisks_daemon_util_setup_by_user +udisks_daemon_util_dup_object +udisks_daemon_util_escape +udisks_daemon_util_escape_and_quote +UDisksInhibitCookie +udisks_daemon_util_inhibit_system_sync +udisks_daemon_util_uninhibit_system_sync +udisks_daemon_util_hexdump +udisks_daemon_util_hexdump_debug +udisks_daemon_util_file_set_contents +udisks_daemon_util_on_user_seat +udisks_daemon_util_get_free_mdraid_device +udisks_ata_identify_get_word +
+ +
+udiskslinuxblockobject +UDisksLinuxBlockObject +UDisksLinuxBlockObject +udisks_linux_block_object_new +udisks_linux_block_object_uevent +udisks_linux_block_object_get_daemon +udisks_linux_block_object_get_device +udisks_linux_block_object_trigger_uevent +udisks_linux_block_object_reread_partition_table + +UDISKS_TYPE_LINUX_BLOCK_OBJECT +UDISKS_LINUX_BLOCK_OBJECT +UDISKS_IS_LINUX_BLOCK_OBJECT + +udisks_linux_block_object_get_type +
+ +
+udiskslinuxblock +UDisksLinuxBlock +udisks_linux_block_new +udisks_linux_block_update + +UDISKS_LINUX_BLOCK +UDISKS_IS_LINUX_BLOCK +UDISKS_TYPE_LINUX_BLOCK + +udisks_linux_block_get_type +
+ +
+udiskslinuxfilesystem +UDisksLinuxFilesystem +udisks_linux_filesystem_new +udisks_linux_filesystem_update + +UDISKS_LINUX_FILESYSTEM +UDISKS_IS_LINUX_FILESYSTEM +UDISKS_TYPE_LINUX_FILESYSTEM + +udisks_linux_filesystem_get_type +
+ +
+udiskslinuxencrypted +UDisksLinuxEncrypted +udisks_linux_encrypted_new +udisks_linux_encrypted_update + +UDISKS_LINUX_ENCRYPTED +UDISKS_IS_LINUX_ENCRYPTED +UDISKS_TYPE_LINUX_ENCRYPTED + +udisks_linux_encrypted_get_type +
+ +
+udiskslinuxswapspace +UDisksLinuxSwapspace +udisks_linux_swapspace_new +udisks_linux_swapspace_update + +UDISKS_LINUX_SWAPSPACE +UDISKS_IS_LINUX_SWAPSPACE +UDISKS_TYPE_LINUX_SWAPSPACE + +udisks_linux_swapspace_get_type +
+ +
+udiskslinuxloop +UDisksLinuxLoop +udisks_linux_loop_new +udisks_linux_loop_update + +UDISKS_LINUX_LOOP +UDISKS_IS_LINUX_LOOP +UDISKS_TYPE_LINUX_LOOP + +udisks_linux_loop_get_type +
+ +
+udiskslinuxmanager +UDisksLinuxManager +UDisksLinuxManager +udisks_linux_manager_new +udisks_linux_manager_get_daemon + +UDISKS_TYPE_LINUX_MANAGER +UDISKS_LINUX_MANAGER +UDISKS_IS_LINUX_MANAGER + +udisks_linux_manager_get_type +
+ +
+udisksfstabmonitor +UDisksFstabMonitor +UDisksFstabEntry +udisks_fstab_entry_get_fsname +udisks_fstab_entry_get_dir +udisks_fstab_entry_get_fstype +udisks_fstab_entry_get_opts +udisks_fstab_entry_get_freq +udisks_fstab_entry_get_passno +udisks_fstab_entry_compare +UDisksFstabMonitor +udisks_fstab_monitor_new +udisks_fstab_monitor_get_entries + +UDISKS_TYPE_FSTAB_ENTRY +UDISKS_FSTAB_ENTRY +UDISKS_IS_FSTAB_ENTRY +UDISKS_TYPE_FSTAB_MONITOR +UDISKS_FSTAB_MONITOR +UDISKS_IS_FSTAB_MONITOR + +udisks_fstab_entry_get_type +udisks_fstab_monitor_get_type +
+ +
+udiskscrypttabmonitor +UDisksCrypttabMonitor +UDisksCrypttabEntry +udisks_crypttab_entry_get_name +udisks_crypttab_entry_get_device +udisks_crypttab_entry_get_passphrase_path +udisks_crypttab_entry_get_options +udisks_crypttab_entry_compare +UDisksCrypttabMonitor +udisks_crypttab_monitor_new +udisks_crypttab_monitor_get_entries + +UDISKS_TYPE_CRYPTTAB_ENTRY +UDISKS_CRYPTTAB_ENTRY +UDISKS_IS_CRYPTTAB_ENTRY +UDISKS_TYPE_CRYPTTAB_MONITOR +UDISKS_CRYPTTAB_MONITOR +UDISKS_IS_CRYPTTAB_MONITOR + +udisks_crypttab_entry_get_type +udisks_crypttab_monitor_get_type +
+ +
+udisksutabmonitor +UDisksUtabMonitor +UDisksUtabEntry +udisks_utab_entry_get_source +udisks_utab_entry_get_opts +UDisksUtabMonitor +udisks_utab_monitor_new +udisks_utab_monitor_get_entries + +UDISKS_TYPE_UTAB_ENTRY +UDISKS_UTAB_ENTRY +UDISKS_IS_UTAB_ENTRY +UDISKS_TYPE_UTAB_MONITOR +UDISKS_UTAB_MONITOR +UDISKS_IS_UTAB_MONITOR + +udisks_utab_entry_get_type +udisks_utab_monitor_get_type +
+ +
+udiskslinuxpartition +UDisksLinuxPartition +udisks_linux_partition_new +udisks_linux_partition_update +udisks_linux_partition_set_type_sync + +UDISKS_LINUX_PARTITION +UDISKS_IS_LINUX_PARTITION +UDISKS_TYPE_LINUX_PARTITION + +udisks_linux_partition_get_type +
+ +
+udiskslinuxpartitiontable +UDisksLinuxPartitionTable +udisks_linux_partition_table_new +udisks_linux_partition_table_update + +UDISKS_LINUX_PARTITION_TABLE +UDISKS_IS_LINUX_PARTITION_TABLE +UDISKS_TYPE_LINUX_PARTITION_TABLE + +udisks_linux_partition_table_get_type +
+ +
+udiskslinuxmdraidobject +UDisksLinuxMDRaidObject +udisks_linux_mdraid_object_new +udisks_linux_mdraid_object_uevent +udisks_linux_mdraid_object_have_devices +udisks_linux_mdraid_object_get_daemon +udisks_linux_mdraid_object_get_device +udisks_linux_mdraid_object_get_members +udisks_linux_mdraid_object_get_uuid + +UDISKS_LINUX_MDRAID_OBJECT +UDISKS_IS_LINUX_MDRAID_OBJECT +UDISKS_TYPE_LINUX_MDRAID_OBJECT + +udisks_linux_mdraid_object_get_type +
+ +
+udiskslinuxmdraid +UDisksLinuxMDRaid +udisks_linux_mdraid_new +udisks_linux_mdraid_update + +UDISKS_LINUX_MDRAID +UDISKS_IS_LINUX_MDRAID +UDISKS_TYPE_LINUX_MDRAID + +udisks_linux_mdraid_get_type +
+ +
+UDisksModuleManager +UDisksModuleManager +UDisksModuleInterfaceInfo +UDisksObjectHasInterfaceFunc +UDisksObjectConnectInterfaceFunc +UDisksObjectUpdateInterfaceFunc +UDisksModuleObjectNewFunc +UDisksModuleNewManagerIfaceFunc +UDisksModuleInitFunc +UDisksModuleIfaceSetupFunc +UDisksModuleObjectNewSetupFunc +UDisksModuleNewManagerIfaceSetupFunc +UDisksModuleObject +UDisksModuleObjectIface +udisks_module_manager_new +udisks_module_manager_get_modules_available +udisks_module_manager_load_modules +udisks_module_manager_get_module_state_pointer +udisks_module_manager_set_module_state_pointer +udisks_module_manager_get_block_object_iface_infos +udisks_module_manager_get_drive_object_iface_infos +udisks_module_manager_get_module_object_new_funcs +udisks_module_manager_get_new_manager_iface_funcs +udisks_module_object_process_uevent +udisks_module_object_housekeeping + +UDISKS_IS_MODULE_MANAGER +UDISKS_IS_MODULE_OBJECT +UDISKS_MODULE_MANAGER +UDISKS_MODULE_OBJECT +UDISKS_MODULE_OBJECT_GET_IFACE +UDISKS_TYPE_MODULE_MANAGER +UDISKS_TYPE_MODULE_OBJECT + +udisks_module_manager_get_type +udisks_module_object_get_type +
++
++udisksdaemon ++UDisksDaemon ++UDisksDaemon ++udisks_daemon_new ++udisks_daemon_get_connection ++udisks_daemon_get_object_manager ++udisks_daemon_get_mount_monitor + udisks_daemon_get_crypttab_monitor + udisks_daemon_get_linux_provider + udisks_daemon_get_authority Index: head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sed =================================================================== --- head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sed (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sed (revision 540342) @@ -1,6 +1,9 @@ ---- doc/udisks2-sections.txt.daemon.sed.orig 2019-10-03 03:15:30 UTC +--- doc/udisks2-sections.txt.daemon.sed.orig 2020-05-26 15:07:07 UTC +++ doc/udisks2-sections.txt.daemon.sed -@@ -0,0 +1,3 @@ +@@ -1,3 +1,6 @@ + // { + r udisks2-sections.txt.daemon.sections + d } +// { + r udisks2-sections.txt.daemon.sections + d } Index: head/sysutils/libudisks/files/patch-doc_udisks2.types.daemon.in =================================================================== --- head/sysutils/libudisks/files/patch-doc_udisks2.types.daemon.in (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_udisks2.types.daemon.in (revision 540342) @@ -1,32 +1,38 @@ ---- doc/udisks2.types.daemon.in.orig 2019-10-03 03:15:30 UTC +--- doc/udisks2.types.daemon.in.orig 2020-05-26 15:07:07 UTC +++ doc/udisks2.types.daemon.in -@@ -0,0 +1,29 @@ +@@ -22,6 +22,35 @@ udisks_linux_loop_get_type + udisks_linux_manager_get_type + udisks_state_get_type + udisks_fstab_entry_get_type ++udisks_fstab_monitor_get_type ++udisks_crypttab_entry_get_type ++udisks_crypttab_monitor_get_type ++udisks_linux_mdraid_object_get_type ++udisks_linux_mdraid_get_type +udisks_daemon_get_type +udisks_linux_device_get_type +udisks_linux_block_object_get_type +udisks_linux_block_get_type +udisks_linux_drive_object_get_type +udisks_linux_drive_get_type +udisks_linux_drive_ata_get_type +udisks_base_job_get_type +udisks_spawned_job_get_type +udisks_threaded_job_get_type +udisks_simple_job_get_type +udisks_mount_get_type +udisks_mount_monitor_get_type +udisks_provider_get_type +udisks_linux_provider_get_type +udisks_linux_filesystem_get_type +udisks_linux_partition_get_type +udisks_linux_partition_table_get_type +udisks_linux_encrypted_get_type +udisks_linux_swapspace_get_type +udisks_linux_loop_get_type +udisks_linux_manager_get_type +udisks_state_get_type +udisks_fstab_entry_get_type -+udisks_fstab_monitor_get_type -+udisks_crypttab_entry_get_type -+udisks_crypttab_monitor_get_type -+udisks_linux_mdraid_object_get_type -+udisks_linux_mdraid_get_type + udisks_crypttab_entry_get_type + udisks_crypttab_monitor_get_type + udisks_linux_mdraid_object_get_type Index: head/sysutils/libudisks/files/patch-doc_udisks2.types.daemon.sed =================================================================== --- head/sysutils/libudisks/files/patch-doc_udisks2.types.daemon.sed (revision 540341) +++ head/sysutils/libudisks/files/patch-doc_udisks2.types.daemon.sed (revision 540342) @@ -1,6 +1,9 @@ ---- doc/udisks2.types.daemon.sed.orig 2019-10-03 03:15:30 UTC +--- doc/udisks2.types.daemon.sed.orig 2020-05-26 15:07:07 UTC +++ doc/udisks2.types.daemon.sed -@@ -0,0 +1,3 @@ +@@ -1,3 +1,6 @@ + /\# DAEMON_TYPES/ { + r udisks2.types.daemon + d } +/\# DAEMON_TYPES/ { + r udisks2.types.daemon + d } Index: head/sysutils/libudisks/files/patch-udisks_Makefile.am =================================================================== --- head/sysutils/libudisks/files/patch-udisks_Makefile.am (revision 540341) +++ head/sysutils/libudisks/files/patch-udisks_Makefile.am (revision 540342) @@ -1,52 +1,15 @@ ---- udisks/Makefile.am.orig 2019-07-22 16:24:44 UTC +--- udisks/Makefile.am.orig 2020-05-26 15:07:07 UTC +++ udisks/Makefile.am -@@ -4,9 +4,11 @@ SUBDIRS = modules.conf.d - - NULL = - -+if ENABLE_DAEMON - moduleconfdir = $(sysconfdir)/udisks2/ - - moduleconf_DATA = udisks2.conf -+endif - - AM_CPPFLAGS = \ - -I$(top_builddir) -I$(top_srcdir) \ -@@ -39,13 +41,13 @@ udisksenumtypes.h: udisksenums.h udisksenumtypes.h.tem - ( top_builddir=`cd $(top_builddir) && pwd`; \ - cd $(srcdir) && glib-mkenums --template udisksenumtypes.h.template udisksenums.h ) | \ - sed 's,U_TYPE_DISKS,UDISKS_TYPE,' | sed 's,u_disks,udisks,' > \ -- udisksenumtypes.h.tmp && mv udisksenumtypes.h.tmp udisksenumtypes.h -+ udisksenumtypes.h.tmp && mv -f udisksenumtypes.h.tmp udisksenumtypes.h - - udisksenumtypes.c: udisksenums.h udisksenumtypes.c.template - ( top_builddir=`cd $(top_builddir) && pwd`; \ - cd $(srcdir) && glib-mkenums --template udisksenumtypes.c.template udisksenums.h ) | \ - sed 's,U_TYPE_DISKS,UDISKS_TYPE,' | sed 's,u_disks,udisks,' > \ -- udisksenumtypes.c.tmp && mv udisksenumtypes.c.tmp udisksenumtypes.c -+ udisksenumtypes.c.tmp && mv -f udisksenumtypes.c.tmp udisksenumtypes.c - - enum_built_sources = \ - udisksenumtypes.h udisksenumtypes.c \ -@@ -56,7 +58,7 @@ dbus_built_sources = \ - $(NULL) - - udisksversion.h: $(top_srcdir)/udisks/udisksversion.h.in -- sed -e 's/@MAJOR_VERSION@/$(UDISKS_MAJOR_VERSION)/' -e 's/@MINOR_VERSION@/$(UDISKS_MINOR_VERSION)/' -e 's/@MICRO_VERSION@/$(UDISKS_MICRO_VERSION)/' $(top_srcdir)/udisks/udisksversion.h.in > udisksversion.h.tmp && mv udisksversion.h.tmp udisksversion.h -+ sed -e 's/@MAJOR_VERSION@/$(UDISKS_MAJOR_VERSION)/' -e 's/@MINOR_VERSION@/$(UDISKS_MINOR_VERSION)/' -e 's/@MICRO_VERSION@/$(UDISKS_MICRO_VERSION)/' $(top_srcdir)/udisks/udisksversion.h.in > udisksversion.h.tmp && mv -f udisksversion.h.tmp udisksversion.h - - BUILT_SOURCES = \ - $(enum_built_sources) \ -@@ -115,10 +117,10 @@ if HAVE_INTROSPECTION +@@ -154,10 +154,10 @@ if HAVE_INTROSPECTION INTROSPECTION_GIRS = UDisks-2.0.gir -girdir = $(INTROSPECTION_GIRDIR) +girdir = $(datadir)/gir-1.0 gir_DATA = UDisks-2.0.gir -typelibsdir = $(INTROSPECTION_TYPELIBDIR) +typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = UDisks-2.0.typelib UDisks_2_0_gir_SCANNERFLAGS = \ Index: head/sysutils/libudisks/pkg-plist =================================================================== --- head/sysutils/libudisks/pkg-plist (revision 540341) +++ head/sysutils/libudisks/pkg-plist (revision 540342) @@ -1,149 +1,150 @@ %%UDISKSCTL%%bin/udisksctl include/udisks2/udisks/udisks-generated.h include/udisks2/udisks/udisks.h include/udisks2/udisks/udisksclient.h include/udisks2/udisks/udisksenums.h include/udisks2/udisks/udisksenumtypes.h include/udisks2/udisks/udiskserror.h include/udisks2/udisks/udisksobjectinfo.h include/udisks2/udisks/udiskstypes.h include/udisks2/udisks/udisksversion.h lib/girepository-1.0/UDisks-2.0.typelib lib/libudisks2.a lib/libudisks2.so lib/libudisks2.so.0 lib/libudisks2.so.0.0.0 libdata/pkgconfig/udisks2.pc %%UDISKSCTL%%man/man1/udisksctl.1.gz %%UDISKSCTL%%share/bash-completion/completions/udisksctl share/gir-1.0/UDisks-2.0.gir %%DOCS%%share/gtk-doc/html/udisks2/UDisksBlock.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksClient.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksDrive.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksDriveAta.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksEncrypted.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksFilesystem.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksJob.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksLoop.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksMDRaid.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksManager.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksObject.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksObjectInfo.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksObjectManagerClient.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksPartition.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksPartitionTable.html %%DOCS%%share/gtk-doc/html/udisks2/UDisksSwapspace.html %%DOCS%%share/gtk-doc/html/udisks2/annotation-glossary.html -%%DOCS%%share/gtk-doc/html/udisks2/api-index-2.8.4.html +%%DOCS%%share/gtk-doc/html/udisks2/api-index-2.9.0.html %%DOCS%%share/gtk-doc/html/udisks2/api-index-deprecated.html %%DOCS%%share/gtk-doc/html/udisks2/api-index.html -%%DOCS%%share/gtk-doc/html/udisks2/ch02.html +%%DOCS%%share/gtk-doc/html/udisks2/ch03.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Block.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Drive.Ata.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Drive.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Encrypted.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Filesystem.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Job.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Loop.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.MDRaid.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Manager.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Partition.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.PartitionTable.html %%DOCS%%share/gtk-doc/html/udisks2/gdbus-org.freedesktop.UDisks2.Swapspace.html %%DOCS%%share/gtk-doc/html/udisks2/gio-hierarchy.html %%DOCS%%share/gtk-doc/html/udisks2/home.png %%DOCS%%share/gtk-doc/html/udisks2/index.html %%DOCS%%share/gtk-doc/html/udisks2/left-insensitive.png %%DOCS%%share/gtk-doc/html/udisks2/left.png +%%DOCS%%share/gtk-doc/html/udisks2/mount_options.html %%DOCS%%share/gtk-doc/html/udisks2/overview.html %%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-block-devices.html %%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-drives.html %%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-jobs.html %%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-manager-well-known-object.html %%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-md-raid.html %%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-overview.html %%DOCS%%share/gtk-doc/html/udisks2/ref-dbus-udisks2-well-known-object.html %%DOCS%%share/gtk-doc/html/udisks2/ref-dbus.html %%DOCS%%share/gtk-doc/html/udisks2/ref-iscsi-session.html %%DOCS%%share/gtk-doc/html/udisks2/ref-library-generated.html %%DOCS%%share/gtk-doc/html/udisks2/ref-library.html %%DOCS%%share/gtk-doc/html/udisks2/right-insensitive.png %%DOCS%%share/gtk-doc/html/udisks2/right.png %%DOCS%%share/gtk-doc/html/udisks2/style.css %%DOCS%%share/gtk-doc/html/udisks2/udisks-polkit-actions.html %%DOCS%%share/gtk-doc/html/udisks2/udisks-std-options.html %%DOCS%%share/gtk-doc/html/udisks2/udisks2-UDisksError.html %%DOCS%%share/gtk-doc/html/udisks2/udisks2.devhelp2 %%DOCS%%share/gtk-doc/html/udisks2/udisksctl.1.html %%DOCS%%share/gtk-doc/html/udisks2/up-insensitive.png %%DOCS%%share/gtk-doc/html/udisks2/up.png %%NLS%%share/locale/af/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ar/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/as/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/az/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/bg/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/bn_IN/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ca/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/cs/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/cy/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/da/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/de/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/el/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/eo/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/es/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/et/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/eu/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/fa/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/fi/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/fo/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/fr/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/fur/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ga/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/gl/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/gu/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/he/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/hi/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/hr/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/hu/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ia/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/id/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/it/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ja/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ka/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/kk/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/kn/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ko/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/lt/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/lv/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ml/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/mr/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ms/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/nb/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/nl/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/nn/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/oc/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/or/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/pa/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/pl/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/pt/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ro/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ru/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/sk/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/sl/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/sq/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/sr/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/sv/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/ta/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/te/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/th/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/tr/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/uk/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/vi/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/wa/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/udisks2.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/udisks2.mo