git: 3c5f4b3c2ab2 - main - net/samba416: Sanitize MANPREFIX
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 22 Jan 2024 15:51:10 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3c5f4b3c2ab2d0a39cd5227ab9ffa57934290d93
commit 3c5f4b3c2ab2d0a39cd5227ab9ffa57934290d93
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-22 14:50:29 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-22 15:50:45 +0000
net/samba416: Sanitize MANPREFIX
Approved by: portmgr (blanket)
---
net/samba416/Makefile | 20 ++--
net/samba416/pkg-plist | 228 ++++++++++++++++++++---------------------
net/samba416/pkg-plist.cluster | 26 ++---
net/samba416/pkg-plist.python | 4 +-
4 files changed, 139 insertions(+), 139 deletions(-)
diff --git a/net/samba416/Makefile b/net/samba416/Makefile
index 577312f95222..79b06f99eeb1 100644
--- a/net/samba416/Makefile
+++ b/net/samba416/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ${SAMBA4_BASENAME}416
PORTVERSION= ${SAMBA4_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -73,7 +73,7 @@ SAMBA4_CONFIG= smb4.conf
SAMBA4_MODULES_CLASS= auth bind9 gensec gpext idmap ldb nss_info \
pdb perfcount process_model service vfs
-CONFIGURE_ARGS= --mandir="${MANPREFIX}/man" \
+CONFIGURE_ARGS= --mandir="${PREFIX}/share/man" \
--sysconfdir="${SAMBA4_CONFDIR}" \
--includedir="${SAMBA4_INCLUDEDIR}" \
--datadir="${DATADIR}" \
@@ -308,12 +308,12 @@ CONFIGURE_ARGS+= \
FRUIT_PREVENTS= ZEROCONF_NONE
FRUIT_PREVENTS_MSG= MacOSX support requires Zeroconf(AVAHI or MDNSRESPONDER)
FRUIT_VARS= SAMBA4_MODULES+=vfs_fruit
-FRUIT_PLIST_FILES= man/man8/vfs_fruit.8.gz
+FRUIT_PLIST_FILES= share/man/man8/vfs_fruit.8.gz
GLUSTERFS_CONFIGURE_ENABLE= glusterfs
GLUSTERFS_LIB_DEPENDS= libglusterfs.so:net/glusterfs
GLUSTERFS_VARS= SAMBA4_MODULES+=vfs_glusterfs
-GLUSTERFS_PLIST_FILES= man/man8/vfs_glusterfs.8.gz
+GLUSTERFS_PLIST_FILES= share/man/man8/vfs_glusterfs.8.gz
ZEROCONF_NONE_MAKE_ENV= ZEROCONF=none
##############################################################################
@@ -539,7 +539,7 @@ PLIST_FILES+= ${SAMBA4_LIBDIR}/private/libldb-mdb-int-samba4.so \
.if ${PORT_OPTIONS:MGSSAPI_MIT}
PLIST_FILES+= ${SAMBA4_MODULEDIR}/krb5/winbind_krb5_localauth.so \
- man/man8/winbind_krb5_localauth.8.gz
+ share/man/man8/winbind_krb5_localauth.8.gz
. if ${PORT_OPTIONS:MAD_DC}
PLIST_FILES+= ${SAMBA4_LIBDIR}/krb5/plugins/kdb/samba.so
. endif
@@ -651,21 +651,21 @@ post-install-rm-junk:
post-install-fix-manpages:
.for f in vfs_aio_linux.8 vfs_btrfs.8 vfs_ceph.8 vfs_gpfs.8
- ${RM} ${STAGEDIR}${PREFIX}/man/man8/${f}
+ ${RM} ${STAGEDIR}${PREFIX}/share/man/man8/${f}
.endfor
.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
. for f in ldbadd.1 ldbdel.1 ldbedit.1 ldbmodify.1 ldbrename.1 ldbsearch.1
- ${MV} ${STAGEDIR}${PREFIX}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1/samba-${f}
+ ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/${f} ${STAGEDIR}${PREFIX}/share/man/man1/samba-${f}
. endfor
.endif
.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
. for f in tdbbackup.8 tdbdump.8 tdbrestore.8 tdbtool.8
- ${MV} ${STAGEDIR}${PREFIX}/man/man8/${f} ${STAGEDIR}${PREFIX}/man/man8/samba-${f}
+ ${MV} ${STAGEDIR}${PREFIX}/share/man/man8/${f} ${STAGEDIR}${PREFIX}/share/man/man8/samba-${f}
. endfor
.endif
post-install: post-install-rm-junk post-install-fix-manpages
- ${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
+ ${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/share/man/man5/smb4.conf.5.gz
# Run post-install script
.for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR}
${INSTALL} -d -m 0755 "${STAGEDIR}${dir}"
@@ -684,7 +684,7 @@ post-install: post-install-rm-junk post-install-fix-manpages
post-install-FRUIT-off:
${RM} ${STAGEDIR}${SAMBA4_MODULEDIR}/vfs/fruit.so
- ${RM} ${STAGEDIR}${PREFIX}/man/man8/vfs_fruit.8
+ ${RM} ${STAGEDIR}${PREFIX}/share/man/man8/vfs_fruit.8
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/net/samba416/pkg-plist b/net/samba416/pkg-plist
index da06524eff14..4c1481e7888a 100644
--- a/net/samba416/pkg-plist
+++ b/net/samba416/pkg-plist
@@ -303,109 +303,109 @@ libexec/samba/samba-dcerpcd
@comment Setup files
%%SPOTLIGHT%%%%DATADIR%%/samba/mdssvc/elasticsearch_mappings.json
@comment Man pages
-man/man1/dbwrap_tool.1.gz
-man/man1/gentest.1.gz
-man/man1/locktest.1.gz
-man/man1/log2pcap.1.gz
-man/man1/masktest.1.gz
-man/man1/mdsearch.1.gz
-man/man1/mvxattr.1.gz
-man/man1/ndrdump.1.gz
-man/man1/nmblookup.1.gz
-man/man1/ntlm_auth.1.gz
-man/man1/oLschema2ldif.1.gz
-man/man1/profiles.1.gz
-man/man1/regdiff.1.gz
-man/man1/regpatch.1.gz
-man/man1/regshell.1.gz
-man/man1/regtree.1.gz
-man/man1/rpcclient.1.gz
-man/man1/sharesec.1.gz
-man/man1/smbcacls.1.gz
-man/man1/smbclient.1.gz
-man/man1/smbcontrol.1.gz
-man/man1/smbcquotas.1.gz
-man/man1/smbget.1.gz
-man/man1/smbstatus.1.gz
-man/man1/smbtar.1.gz
-man/man1/smbtree.1.gz
-man/man1/testparm.1.gz
-man/man1/wbinfo.1.gz
-man/man5/lmhosts.5.gz
-man/man5/pam_winbind.conf.5.gz
-man/man5/smb.conf.5.gz
-man/man5/smb4.conf.5.gz
-man/man5/smbgetrc.5.gz
-man/man5/smbpasswd.5.gz
-man/man7/libsmbclient.7.gz
-man/man7/samba.7.gz
-man/man7/traffic_learner.7.gz
-man/man7/traffic_replay.7.gz
-man/man8/cifsdd.8.gz
-man/man8/eventlogadm.8.gz
-man/man8/idmap_ad.8.gz
-man/man8/idmap_autorid.8.gz
-man/man8/idmap_hash.8.gz
-man/man8/idmap_ldap.8.gz
-man/man8/idmap_nss.8.gz
-man/man8/idmap_rfc2307.8.gz
-man/man8/idmap_rid.8.gz
-man/man8/idmap_script.8.gz
-man/man8/idmap_tdb.8.gz
-man/man8/idmap_tdb2.8.gz
-man/man8/net.8.gz
-man/man8/nmbd.8.gz
-man/man8/pam_winbind.8.gz
-man/man8/pdbedit.8.gz
-man/man8/samba_downgrade_db.8.gz
-man/man8/samba-bgqd.8.gz
-man/man8/samba-dcerpcd.8.gz
-man/man8/samba-regedit.8.gz
-man/man8/samba-tool.8.gz
-man/man8/samba.8.gz
-man/man8/smbd.8.gz
-man/man8/smbpasswd.8.gz
-man/man8/smbspool.8.gz
-%%CUPS%%man/man8/smbspool_krb5_wrapper.8.gz
-man/man8/vfs_acl_tdb.8.gz
-man/man8/vfs_acl_xattr.8.gz
-man/man8/vfs_aio_fork.8.gz
-man/man8/vfs_aio_pthread.8.gz
-man/man8/vfs_audit.8.gz
-man/man8/vfs_cacheprime.8.gz
-man/man8/vfs_cap.8.gz
-man/man8/vfs_catia.8.gz
-man/man8/vfs_commit.8.gz
-man/man8/vfs_crossrename.8.gz
-man/man8/vfs_default_quota.8.gz
-man/man8/vfs_dirsort.8.gz
-man/man8/vfs_expand_msdfs.8.gz
-man/man8/vfs_extd_audit.8.gz
-man/man8/vfs_fake_perms.8.gz
-man/man8/vfs_freebsd.8.gz
-man/man8/vfs_full_audit.8.gz
-man/man8/vfs_linux_xfs_sgid.8.gz
-man/man8/vfs_media_harmony.8.gz
-man/man8/vfs_offline.8.gz
-man/man8/vfs_preopen.8.gz
-man/man8/vfs_readahead.8.gz
-man/man8/vfs_readonly.8.gz
-man/man8/vfs_recycle.8.gz
-man/man8/vfs_shadow_copy.8.gz
-man/man8/vfs_shadow_copy2.8.gz
-man/man8/vfs_shell_snap.8.gz
-man/man8/vfs_streams_depot.8.gz
-man/man8/vfs_streams_xattr.8.gz
-man/man8/vfs_syncops.8.gz
-man/man8/vfs_time_audit.8.gz
-man/man8/vfs_unityed_media.8.gz
-man/man8/vfs_virusfilter.8.gz
-man/man8/vfs_widelinks.8.gz
-man/man8/vfs_worm.8.gz
-man/man8/vfs_xattr_tdb.8.gz
-man/man8/vfs_zfsacl.8.gz
-man/man8/winbind_krb5_locator.8.gz
-man/man8/winbindd.8.gz
+share/man/man1/dbwrap_tool.1.gz
+share/man/man1/gentest.1.gz
+share/man/man1/locktest.1.gz
+share/man/man1/log2pcap.1.gz
+share/man/man1/masktest.1.gz
+share/man/man1/mdsearch.1.gz
+share/man/man1/mvxattr.1.gz
+share/man/man1/ndrdump.1.gz
+share/man/man1/nmblookup.1.gz
+share/man/man1/ntlm_auth.1.gz
+share/man/man1/oLschema2ldif.1.gz
+share/man/man1/profiles.1.gz
+share/man/man1/regdiff.1.gz
+share/man/man1/regpatch.1.gz
+share/man/man1/regshell.1.gz
+share/man/man1/regtree.1.gz
+share/man/man1/rpcclient.1.gz
+share/man/man1/sharesec.1.gz
+share/man/man1/smbcacls.1.gz
+share/man/man1/smbclient.1.gz
+share/man/man1/smbcontrol.1.gz
+share/man/man1/smbcquotas.1.gz
+share/man/man1/smbget.1.gz
+share/man/man1/smbstatus.1.gz
+share/man/man1/smbtar.1.gz
+share/man/man1/smbtree.1.gz
+share/man/man1/testparm.1.gz
+share/man/man1/wbinfo.1.gz
+share/man/man5/lmhosts.5.gz
+share/man/man5/pam_winbind.conf.5.gz
+share/man/man5/smb.conf.5.gz
+share/man/man5/smb4.conf.5.gz
+share/man/man5/smbgetrc.5.gz
+share/man/man5/smbpasswd.5.gz
+share/man/man7/libsmbclient.7.gz
+share/man/man7/samba.7.gz
+share/man/man7/traffic_learner.7.gz
+share/man/man7/traffic_replay.7.gz
+share/man/man8/cifsdd.8.gz
+share/man/man8/eventlogadm.8.gz
+share/man/man8/idmap_ad.8.gz
+share/man/man8/idmap_autorid.8.gz
+share/man/man8/idmap_hash.8.gz
+share/man/man8/idmap_ldap.8.gz
+share/man/man8/idmap_nss.8.gz
+share/man/man8/idmap_rfc2307.8.gz
+share/man/man8/idmap_rid.8.gz
+share/man/man8/idmap_script.8.gz
+share/man/man8/idmap_tdb.8.gz
+share/man/man8/idmap_tdb2.8.gz
+share/man/man8/net.8.gz
+share/man/man8/nmbd.8.gz
+share/man/man8/pam_winbind.8.gz
+share/man/man8/pdbedit.8.gz
+share/man/man8/samba_downgrade_db.8.gz
+share/man/man8/samba-bgqd.8.gz
+share/man/man8/samba-dcerpcd.8.gz
+share/man/man8/samba-regedit.8.gz
+share/man/man8/samba-tool.8.gz
+share/man/man8/samba.8.gz
+share/man/man8/smbd.8.gz
+share/man/man8/smbpasswd.8.gz
+share/man/man8/smbspool.8.gz
+%%CUPS%%share/man/man8/smbspool_krb5_wrapper.8.gz
+share/man/man8/vfs_acl_tdb.8.gz
+share/man/man8/vfs_acl_xattr.8.gz
+share/man/man8/vfs_aio_fork.8.gz
+share/man/man8/vfs_aio_pthread.8.gz
+share/man/man8/vfs_audit.8.gz
+share/man/man8/vfs_cacheprime.8.gz
+share/man/man8/vfs_cap.8.gz
+share/man/man8/vfs_catia.8.gz
+share/man/man8/vfs_commit.8.gz
+share/man/man8/vfs_crossrename.8.gz
+share/man/man8/vfs_default_quota.8.gz
+share/man/man8/vfs_dirsort.8.gz
+share/man/man8/vfs_expand_msdfs.8.gz
+share/man/man8/vfs_extd_audit.8.gz
+share/man/man8/vfs_fake_perms.8.gz
+share/man/man8/vfs_freebsd.8.gz
+share/man/man8/vfs_full_audit.8.gz
+share/man/man8/vfs_linux_xfs_sgid.8.gz
+share/man/man8/vfs_media_harmony.8.gz
+share/man/man8/vfs_offline.8.gz
+share/man/man8/vfs_preopen.8.gz
+share/man/man8/vfs_readahead.8.gz
+share/man/man8/vfs_readonly.8.gz
+share/man/man8/vfs_recycle.8.gz
+share/man/man8/vfs_shadow_copy.8.gz
+share/man/man8/vfs_shadow_copy2.8.gz
+share/man/man8/vfs_shell_snap.8.gz
+share/man/man8/vfs_streams_depot.8.gz
+share/man/man8/vfs_streams_xattr.8.gz
+share/man/man8/vfs_syncops.8.gz
+share/man/man8/vfs_time_audit.8.gz
+share/man/man8/vfs_unityed_media.8.gz
+share/man/man8/vfs_virusfilter.8.gz
+share/man/man8/vfs_widelinks.8.gz
+share/man/man8/vfs_worm.8.gz
+share/man/man8/vfs_xattr_tdb.8.gz
+share/man/man8/vfs_zfsacl.8.gz
+share/man/man8/winbind_krb5_locator.8.gz
+share/man/man8/winbindd.8.gz
@dir %%SAMBA4_RUNDIR%%
@dir %%SAMBA4_LOGDIR%%
@dir %%SAMBA4_LOCKDIR%%
@@ -439,20 +439,20 @@ man/man8/winbindd.8.gz
%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/server_sort.so
%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/skel.so
%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/tdb.so
-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbadd.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbdel.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbedit.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbmodify.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbrename.1.gz
-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbsearch.1.gz
-%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbbackup.8.gz
-%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbdump.8.gz
-%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbrestore.8.gz
-%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbtool.8.gz
+%%SAMBA4_BUNDLED_LDB%%share/man/man1/samba-ldbadd.1.gz
+%%SAMBA4_BUNDLED_LDB%%share/man/man1/samba-ldbdel.1.gz
+%%SAMBA4_BUNDLED_LDB%%share/man/man1/samba-ldbedit.1.gz
+%%SAMBA4_BUNDLED_LDB%%share/man/man1/samba-ldbmodify.1.gz
+%%SAMBA4_BUNDLED_LDB%%share/man/man1/samba-ldbrename.1.gz
+%%SAMBA4_BUNDLED_LDB%%share/man/man1/samba-ldbsearch.1.gz
+%%SAMBA4_BUNDLED_TDB%%share/man/man8/samba-tdbbackup.8.gz
+%%SAMBA4_BUNDLED_TDB%%share/man/man8/samba-tdbdump.8.gz
+%%SAMBA4_BUNDLED_TDB%%share/man/man8/samba-tdbrestore.8.gz
+%%SAMBA4_BUNDLED_TDB%%share/man/man8/samba-tdbtool.8.gz
%%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT_SUFFIX%%.so
%%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%SAMBA4_LIBDIR%%/private/libpytalloc-util%%PYTHON_EXT_SUFFIX%%-samba4.so
%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_LIBDIR%%/private/libtalloc-samba4.so
-%%SAMBA4_BUNDLED_TALLOC%%man/man3/talloc.3.gz
+%%SAMBA4_BUNDLED_TALLOC%%share/man/man3/talloc.3.gz
%%SAMBA4_BUNDLED_TDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_tdb_text.py
%%SAMBA4_BUNDLED_TDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so
%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbbackup
diff --git a/net/samba416/pkg-plist.cluster b/net/samba416/pkg-plist.cluster
index 4c3d331b6a62..a7aff89718ca 100644
--- a/net/samba416/pkg-plist.cluster
+++ b/net/samba416/pkg-plist.cluster
@@ -37,19 +37,19 @@ libexec/ctdb/ctdb-event
libexec/ctdb/ctdb-eventd
libexec/ctdb/ctdb-path
libexec/ctdb/smnotify
-man/man1/ctdb_diagnostics.1.gz
-man/man1/ctdb.1.gz
-man/man1/ctdbd_wrapper.1.gz
-man/man1/ctdbd.1.gz
-man/man1/ltdbtool.1.gz
-man/man1/onnode.1.gz
-man/man1/ping_pong.1.gz
-man/man5/ctdb-script.options.5.gz
-man/man5/ctdb.conf.5.gz
-man/man5/ctdb.sysconfig.5.gz
-man/man7/ctdb-statistics.7.gz
-man/man7/ctdb-tunables.7.gz
-man/man7/ctdb.7.gz
+share/man/man1/ctdb_diagnostics.1.gz
+share/man/man1/ctdb.1.gz
+share/man/man1/ctdbd_wrapper.1.gz
+share/man/man1/ctdbd.1.gz
+share/man/man1/ltdbtool.1.gz
+share/man/man1/onnode.1.gz
+share/man/man1/ping_pong.1.gz
+share/man/man5/ctdb-script.options.5.gz
+share/man/man5/ctdb.conf.5.gz
+share/man/man5/ctdb.sysconfig.5.gz
+share/man/man7/ctdb-statistics.7.gz
+share/man/man7/ctdb-tunables.7.gz
+share/man/man7/ctdb.7.gz
sbin/ctdbd
sbin/ctdbd_wrapper
share/ctdb/events/legacy/00.ctdb.script
diff --git a/net/samba416/pkg-plist.python b/net/samba416/pkg-plist.python
index 7d86c1cb2e48..62695c48303a 100644
--- a/net/samba416/pkg-plist.python
+++ b/net/samba416/pkg-plist.python
@@ -1,7 +1,7 @@
bin/smbtorture
sbin/samba-gpupdate
-man/man1/smbtorture.1.gz
-man/man8/samba-gpupdate.8.gz
+share/man/man1/smbtorture.1.gz
+share/man/man8/samba-gpupdate.8.gz
include/samba4/policy.h
lib/samba4/libsamba-policy%%PYTHON_EXT_SUFFIX%%.so
lib/samba4/libsamba-policy%%PYTHON_EXT_SUFFIX%%.so.0