Bug 281415 - net/samba419: smb.conf.5 still refers to samba416
Summary: net/samba419: smb.conf.5 still refers to samba416
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Michael Osipov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-09-10 12:51 UTC by Mateusz Piotrowski
Modified: 2025-03-12 09:04 UTC (History)
3 users (show)

See Also:
bugzilla: maintainer-feedback? (samba)


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Mateusz Piotrowski freebsd_committer freebsd_triage 2024-09-10 12:51:27 UTC
net/samba419/files/man/smb.conf.5 contains paths referring to "samba416". We should update those.

BTW, is there a need to vendor those Samba manual pages in the ports tree?
Comment 1 Michael Osipov freebsd_committer freebsd_triage 2025-02-18 17:46:40 UTC
Looking at the Makefile MANDOC is by default off so I guess that by default manpages from the dist file is used. I have diffed smb.conf.5 from files/ and the one installed, it already starts with:
> --- files/man/smb.conf.5    2024-07-22 12:24:26.000000000 +0200
> +++ /tmp/man    2025-02-18 18:42:45.616471000 +0100
> @@ -1,13 +1,13 @@
>  '\" t
>  .\"     Title: smb.conf
>  .\"    Author: [see the "AUTHOR" section]
> -.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
> -.\"      Date: 08/09/2022
> +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
> +.\"      Date: 10/17/2024
>  .\"    Manual: File Formats and Conventions
> -.\"    Source: Samba 4.16.4
> +.\"    Source: Samba 4.19.9

As far as I can see the manpages were precompiled and stored to avoid pulling in docbook into the build.

But there are so many changes that I'd prefer to either have the manpages fresh with docbook or no manpages at all, but not half outdated.
Comment 2 Michael Osipov freebsd_committer freebsd_triage 2025-03-08 21:33:53 UTC
Working in a greater patch to make manpages right...
Comment 3 Michael Osipov freebsd_committer freebsd_triage 2025-03-09 17:30:47 UTC
https://reviews.freebsd.org/D49299
Comment 4 commit-hook freebsd_committer freebsd_triage 2025-03-12 09:04:00 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6cbfa0518c353ea2fe937c6cdea92326922d34c3

commit 6cbfa0518c353ea2fe937c6cdea92326922d34c3
Author:     Michael Osipov <michaelo@FreeBSD.org>
AuthorDate: 2025-03-08 17:29:24 +0000
Commit:     Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2025-03-12 09:02:37 +0000

    net/samba4{19,20}: Rework manpages handling

    * Rename option MANDOC to MANPAGES to match with other ports and
      Mk/bsd.options.desc.mk.
    * Remove outdated, incorrect, precompiled manpages from ${FILESDIR}/files/man.
    * Properly disable manpages generation since XSLTPROC was set to true(1) WAF
      always assumed xsltproc(1) to work and if any automatic dependency pulled in
      textproc/docbook-xsl, manpages were generated even if explicitly disabled.

    PR:             281415
    Approved by:    jrm (mentor), mikael, 0mp
    Differential Revision:  https://reviews.freebsd.org/D49299

 UPDATING                                           |     7 +
 net/samba419/Makefile                              |    76 +-
 .../files/man/ctdb-script.options.5 (gone)         |   558 -
 net/samba419/files/man/ctdb-statistics.7 (gone)    |   550 -
 net/samba419/files/man/ctdb-tunables.7 (gone)      |   406 -
 net/samba419/files/man/ctdb.1 (gone)               |  1526 --
 net/samba419/files/man/ctdb.7 (gone)               |   783 --
 net/samba419/files/man/ctdb.conf.5 (gone)          |   359 -
 net/samba419/files/man/ctdb.sysconfig.5 (gone)     |   139 -
 net/samba419/files/man/ctdb_diagnostics.1 (gone)   |    79 -
 net/samba419/files/man/ctdbd.1 (gone)              |    83 -
 net/samba419/files/man/ctdbd_wrapper.1 (gone)      |    63 -
 net/samba419/files/man/dbwrap_tool.1 (gone)        |   329 -
 net/samba419/files/man/gentest.1 (gone)            |   133 -
 net/samba419/files/man/ldb.3 (gone)                |   427 -
 net/samba419/files/man/ldbadd.1 (gone)             |    78 -
 net/samba419/files/man/ldbdel.1 (gone)             |    80 -
 net/samba419/files/man/ldbedit.1 (gone)            |   111 -
 net/samba419/files/man/ldbmodify.1 (gone)          |    73 -
 net/samba419/files/man/ldbrename.1 (gone)          |    81 -
 net/samba419/files/man/ldbsearch.1 (gone)          |    91 -
 net/samba419/files/man/libsmbclient.7 (gone)       |    94 -
 net/samba419/files/man/lmhosts.5 (gone)            |   123 -
 net/samba419/files/man/locktest.1 (gone)           |   137 -
 net/samba419/files/man/log2pcap.1 (gone)           |   124 -
 net/samba419/files/man/ltdbtool.1 (gone)           |   256 -
 net/samba419/files/man/masktest.1 (gone)           |   113 -
 net/samba419/files/man/mdfind.1 (gone)             |   166 -
 net/samba419/files/man/mdsearch.1 (gone)           |   357 -
 net/samba419/files/man/mvxattr.1 (gone)            |    84 -
 net/samba419/files/man/ndrdump.1 (gone)            |    84 -
 net/samba419/files/man/nmblookup.1 (gone)          |   341 -
 net/samba419/files/man/nmblookup4.1 (gone)         |   157 -
 net/samba419/files/man/ntlm_auth.1 (gone)          |   458 -
 net/samba419/files/man/ntlm_auth4.1 (gone)         |   233 -
 net/samba419/files/man/oLschema2ldif.1 (gone)      |    74 -
 net/samba419/files/man/onnode.1 (gone)             |   218 -
 net/samba419/files/man/pam_winbind.conf.5 (gone)   |   161 -
 net/samba419/files/man/ping_pong.1 (gone)          |   122 -
 net/samba419/files/man/profiles.1 (gone)           |   136 -
 net/samba419/files/man/regdiff.1 (gone)            |    87 -
 net/samba419/files/man/regpatch.1 (gone)           |    81 -
 net/samba419/files/man/regshell.1 (gone)           |   177 -
 net/samba419/files/man/regtree.1 (gone)            |    89 -
 net/samba419/files/man/rpcclient.1 (gone)          |  1961 ---
 net/samba419/files/man/samba-gpupdate.8 (gone)     |   122 -
 net/samba419/files/man/samba.7 (gone)              |   254 -
 net/samba419/files/man/sharesec.1 (gone)           |   364 -
 net/samba419/files/man/smb.conf.5 (gone)           | 13994 -------------------
 net/samba419/files/man/smbcacls.1 (gone)           |  1044 --
 net/samba419/files/man/smbclient.1 (gone)          |  1253 --
 net/samba419/files/man/smbcontrol.1 (gone)         |   343 -
 net/samba419/files/man/smbcquotas.1 (gone)         |   440 -
 net/samba419/files/man/smbget.1 (gone)             |   197 -
 net/samba419/files/man/smbgetrc.5 (gone)           |   100 -
 net/samba419/files/man/smbpasswd.5 (gone)          |   175 -
 net/samba419/files/man/smbstatus.1 (gone)          |   186 -
 net/samba419/files/man/smbtar.1 (gone)             |   163 -
 net/samba419/files/man/smbtorture.1 (gone)         |   362 -
 net/samba419/files/man/smbtree.1 (gone)            |   252 -
 net/samba419/files/man/talloc.3 (gone)             |   683 -
 net/samba419/files/man/tdbbackup.8 (gone)          |   129 -
 net/samba419/files/man/tdbdump.8 (gone)            |    72 -
 net/samba419/files/man/tdbrestore.8 (gone)         |    54 -
 net/samba419/files/man/tdbtool.8 (gone)            |   170 -
 net/samba419/files/man/testparm.1 (gone)           |   194 -
 net/samba419/files/man/traffic_learner.7 (gone)    |   128 -
 net/samba419/files/man/traffic_replay.7 (gone)     |   380 -
 net/samba419/files/man/vfs_freebsd.8 (gone)        |   204 -
 net/samba419/files/man/wbinfo.1 (gone)             |   490 -
 net/samba419/pkg-plist                             |   228 +-
 net/samba419/pkg-plist.cluster                     |    24 +-
 net/samba419/pkg-plist.python                      |     4 +-
 net/samba420/Makefile                              |    76 +-
 .../files/man/ctdb-script.options.5 (gone)         |   558 -
 net/samba420/files/man/ctdb-statistics.7 (gone)    |   550 -
 net/samba420/files/man/ctdb-tunables.7 (gone)      |   406 -
 net/samba420/files/man/ctdb.1 (gone)               |  1526 --
 net/samba420/files/man/ctdb.7 (gone)               |   783 --
 net/samba420/files/man/ctdb.conf.5 (gone)          |   359 -
 net/samba420/files/man/ctdb.sysconfig.5 (gone)     |   139 -
 net/samba420/files/man/ctdb_diagnostics.1 (gone)   |    79 -
 net/samba420/files/man/ctdbd.1 (gone)              |    83 -
 net/samba420/files/man/ctdbd_wrapper.1 (gone)      |    63 -
 net/samba420/files/man/dbwrap_tool.1 (gone)        |   329 -
 net/samba420/files/man/gentest.1 (gone)            |   133 -
 net/samba420/files/man/ldb.3 (gone)                |   427 -
 net/samba420/files/man/ldbadd.1 (gone)             |    78 -
 net/samba420/files/man/ldbdel.1 (gone)             |    80 -
 net/samba420/files/man/ldbedit.1 (gone)            |   111 -
 net/samba420/files/man/ldbmodify.1 (gone)          |    73 -
 net/samba420/files/man/ldbrename.1 (gone)          |    81 -
 net/samba420/files/man/ldbsearch.1 (gone)          |    91 -
 net/samba420/files/man/libsmbclient.7 (gone)       |    94 -
 net/samba420/files/man/lmhosts.5 (gone)            |   123 -
 net/samba420/files/man/locktest.1 (gone)           |   137 -
 net/samba420/files/man/log2pcap.1 (gone)           |   124 -
 net/samba420/files/man/ltdbtool.1 (gone)           |   256 -
 net/samba420/files/man/masktest.1 (gone)           |   113 -
 net/samba420/files/man/mdfind.1 (gone)             |   166 -
 net/samba420/files/man/mdsearch.1 (gone)           |   357 -
 net/samba420/files/man/mvxattr.1 (gone)            |    84 -
 net/samba420/files/man/ndrdump.1 (gone)            |    84 -
 net/samba420/files/man/nmblookup.1 (gone)          |   341 -
 net/samba420/files/man/nmblookup4.1 (gone)         |   157 -
 net/samba420/files/man/ntlm_auth.1 (gone)          |   458 -
 net/samba420/files/man/ntlm_auth4.1 (gone)         |   233 -
 net/samba420/files/man/oLschema2ldif.1 (gone)      |    74 -
 net/samba420/files/man/onnode.1 (gone)             |   218 -
 net/samba420/files/man/pam_winbind.conf.5 (gone)   |   161 -
 net/samba420/files/man/ping_pong.1 (gone)          |   122 -
 net/samba420/files/man/profiles.1 (gone)           |   136 -
 net/samba420/files/man/regdiff.1 (gone)            |    87 -
 net/samba420/files/man/regpatch.1 (gone)           |    81 -
 net/samba420/files/man/regshell.1 (gone)           |   177 -
 net/samba420/files/man/regtree.1 (gone)            |    89 -
 net/samba420/files/man/rpcclient.1 (gone)          |  1961 ---
 net/samba420/files/man/samba-gpupdate.8 (gone)     |   122 -
 net/samba420/files/man/samba.7 (gone)              |   254 -
 net/samba420/files/man/sharesec.1 (gone)           |   364 -
 net/samba420/files/man/smb.conf.5 (gone)           | 13994 -------------------
 net/samba420/files/man/smbcacls.1 (gone)           |  1044 --
 net/samba420/files/man/smbclient.1 (gone)          |  1253 --
 net/samba420/files/man/smbcontrol.1 (gone)         |   343 -
 net/samba420/files/man/smbcquotas.1 (gone)         |   440 -
 net/samba420/files/man/smbget.1 (gone)             |   197 -
 net/samba420/files/man/smbgetrc.5 (gone)           |   100 -
 net/samba420/files/man/smbpasswd.5 (gone)          |   175 -
 net/samba420/files/man/smbstatus.1 (gone)          |   186 -
 net/samba420/files/man/smbtar.1 (gone)             |   163 -
 net/samba420/files/man/smbtorture.1 (gone)         |   362 -
 net/samba420/files/man/smbtree.1 (gone)            |   252 -
 net/samba420/files/man/talloc.3 (gone)             |   683 -
 net/samba420/files/man/tdbbackup.8 (gone)          |   129 -
 net/samba420/files/man/tdbdump.8 (gone)            |    72 -
 net/samba420/files/man/tdbrestore.8 (gone)         |    54 -
 net/samba420/files/man/tdbtool.8 (gone)            |   170 -
 net/samba420/files/man/testparm.1 (gone)           |   194 -
 net/samba420/files/man/traffic_learner.7 (gone)    |   128 -
 net/samba420/files/man/traffic_replay.7 (gone)     |   380 -
 net/samba420/files/man/vfs_freebsd.8 (gone)        |   204 -
 net/samba420/files/man/wbinfo.1 (gone)             |   490 -
 net/samba420/pkg-plist                             |   228 +-
 net/samba420/pkg-plist.cluster                     |    24 +-
 net/samba420/pkg-plist.python                      |     4 +-
 145 files changed, 313 insertions(+), 67428 deletions(-)