Skip to content

Commit 4397804

Browse files
author
thor
committed
net/samba4: handle dbus dependency explicitly on Linux
This manifests as the snapper vfs files appearing depending on dbus being present or not on Linux, causing PLIST mismatch. This option actually disables this if desired. The default is still on, as dbus is to be expected on modern Linux installs anyway.
1 parent cb7a730 commit 4397804

4 files changed

Lines changed: 22 additions & 7 deletions

File tree

net/samba4/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# $NetBSD: Makefile,v 1.123 2021/05/24 19:53:36 wiz Exp $
1+
# $NetBSD: Makefile,v 1.124 2021/05/30 20:02:31 thor Exp $
22

33
DISTNAME= samba-4.14.4
4-
PKGREVISION= 1
4+
PKGREVISION= 2
55
CATEGORIES= net
66
MASTER_SITES= https://download.samba.org/pub/samba/stable/
77

net/samba4/PLIST

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.36 2021/04/14 19:11:20 adam Exp $
1+
@comment $NetBSD: PLIST,v 1.37 2021/05/30 20:02:31 thor Exp $
22
bin/cifsdd
33
bin/dbwrap_tool
44
bin/dumpmscat
@@ -799,6 +799,7 @@ lib/samba/vfs/recycle.${SOEXT}
799799
lib/samba/vfs/shadow_copy.${SOEXT}
800800
lib/samba/vfs/shadow_copy2.${SOEXT}
801801
lib/samba/vfs/shell_snap.${SOEXT}
802+
${PLIST.snapper}lib/samba/vfs/snapper.${SOEXT}
802803
lib/samba/vfs/streams_depot.${SOEXT}
803804
lib/samba/vfs/streams_xattr.${SOEXT}
804805
lib/samba/vfs/syncops.${SOEXT}
@@ -898,6 +899,7 @@ man/man8/vfs_recycle.8
898899
man/man8/vfs_shadow_copy.8
899900
man/man8/vfs_shadow_copy2.8
900901
man/man8/vfs_shell_snap.8
902+
${PLIST.snapper}man/man8/vfs_snapper.8
901903
man/man8/vfs_streams_depot.8
902904
man/man8/vfs_streams_xattr.8
903905
man/man8/vfs_syncops.8

net/samba4/PLIST.Linux

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
@comment $NetBSD: PLIST.Linux,v 1.4 2021/01/18 09:24:32 nia Exp $
1+
@comment $NetBSD: PLIST.Linux,v 1.5 2021/05/30 20:02:31 thor Exp $
22
lib/libnss_winbind.so.2
33
lib/libnss_wins.so
44
lib/libnss_wins.so.2
55
lib/samba/vfs/btrfs.so
66
lib/samba/vfs/fileid.so
77
lib/samba/vfs/glusterfs_fuse.so
88
lib/samba/vfs/gpfs.so
9-
lib/samba/vfs/snapper.so
109
man/man8/vfs_btrfs.8
1110
man/man8/vfs_fileid.8
1211
man/man8/vfs_glusterfs_fuse.8
1312
man/man8/vfs_gpfs.8
14-
man/man8/vfs_snapper.8

net/samba4/options.mk

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: options.mk,v 1.12 2020/11/12 06:37:18 adam Exp $
1+
# $NetBSD: options.mk,v 1.13 2021/05/30 20:02:31 thor Exp $
22

33
PKG_OPTIONS_VAR= PKG_OPTIONS.samba4
44
PKG_SUPPORTED_OPTIONS= ads avahi fam ldap pam winbind # cups # cups option is broken for me.
@@ -15,6 +15,11 @@ PKG_SUPPORTED_OPTIONS+= acl
1515
PKG_SUGGESTED_OPTIONS+= ads
1616
.endif
1717

18+
.if ${OPSYS} == "Linux"
19+
PKG_SUPPORTED_OPTIONS+= snapper
20+
PKG_SUGGESTED_OPTIONS+= snapper
21+
.endif
22+
1823
.include "../../mk/bsd.options.mk"
1924

2025
PLIST_VARS+= ads cups fam ldap pam winbind
@@ -108,3 +113,13 @@ CONFIGURE_ARGS+= --enable-avahi
108113
.else
109114
CONFIGURE_ARGS+= --disable-avahi
110115
.endif
116+
117+
.if ${OPSYS} == "Linux"
118+
PLIST_VARS+= snapper
119+
. if !empty(PKG_OPTIONS:Msnapper)
120+
.include "../../sysutils/dbus/buildlink3.mk"
121+
PLIST.snapper= yes
122+
. else
123+
CONFIGURE_ARGS+= --with-shared-modules='!vfs_snapper'
124+
. endif
125+
.endif

0 commit comments

Comments
 (0)