Tue Aug 15 18:21:21 2023 UTC ()
Pullup ticket #6782 - requested by taca
net/samba4: security fix

Revisions pulled up:
- net/samba4/Makefile                                           1.166-1.167
- net/samba4/distinfo                                           1.94-1.95

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Wed Jul 19 15:33:28 UTC 2023

   Modified Files:
   	pkgsrc/net/samba4: Makefile distinfo

   Log Message:
   samba: update to 4.18.4.

   Changes since 4.18.3
   --------------------

   o  Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
     * BUG 15404: Backport --pidl-developer fixes.

   o  Samuel Cabrero <scabrero@samba.org>
     * BUG 14030: Named crashes on DLZ zone update.

   o  Bjæ—¦rn Jacke <bj@sernet.de>
     * BUG 2312: smbcacls and smbcquotas do not check // before the server.

   o  Volker Lendecke <vl@samba.org>
     * BUG 15382: cli_list loops 100% CPU against pre-lanman2 servers.
     * BUG 15391: smbclient leaks fds with showacls.
     * BUG 15402: smbd returns NOT_FOUND when creating files on a r/o filesystem.

   o  Stefan Metzmacher <metze@samba.org>
     * BUG 15355: NSS_WRAPPER_HOSTNAME doesn't match NSS_WRAPPER_HOSTS entry and
       causes test timeouts.

   o  Noel Power <noel.power@suse.com>
     * BUG 15384: net ads lookup (with unspecified realm) fails.

   o  Christof Schmitt <cs@samba.org>
     * BUG 15381: Register Samba processes with GPFS.

   o  Andreas Schneider <asn@samba.org>
     * BUG 15390: Python tarfile extraction needs change to avoid a warning
       (CVE-2007-4559 mitigation).
     * BUG 15398: The winbind child segfaults when listing users with `winbind
       scan trusted domains = yes`.

   o  Jones Syue <jonessyue@qnap.com>
     * BUG 15383: Remove comments about deprecated 'write cache size'.
     * BUG 15403: smbget memory leak if failed to download files recursively.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Jul 20 01:28:34 UTC 2023

   Modified Files:
   	pkgsrc/net/samba4: Makefile distinfo

   Log Message:
   net/samba4: update to 4.18.5

                     ==============================
                     Release Notes for Samba 4.18.5
                             July 19, 2023
                     ==============================

   This is a security release in order to address the following defects:

   o CVE-2022-2127:  When winbind is used for NTLM authentication, a maliciously
                    crafted request can trigger an out-of-bounds read in winbind
                    and possibly crash it.
                    https://www.samba.org/samba/security/CVE-2022-2127.html

   o CVE-2023-3347:  SMB2 packet signing is not enforced if an admin configured
                    "server signing = required" or for SMB2 connections to Domain
                    Controllers where SMB2 packet signing is mandatory.
                    https://www.samba.org/samba/security/CVE-2023-3347.html

   o CVE-2023-34966: An infinite loop bug in Samba's mdssvc RPC service for
                    Spotlight can be triggered by an unauthenticated attacker by
                    issuing a malformed RPC request.
                    https://www.samba.org/samba/security/CVE-2023-34966.html

   o CVE-2023-34967: Missing type validation in Samba's mdssvc RPC service for
                    Spotlight can be used by an unauthenticated attacker to
                    trigger a process crash in a shared RPC mdssvc worker process.
                    https://www.samba.org/samba/security/CVE-2023-34967.html

   o CVE-2023-34968: As part of the Spotlight protocol Samba discloses the server-
                    side absolute path of shares and files and directories in
                    search results.
                    https://www.samba.org/samba/security/CVE-2023-34968.html

   Changes since 4.18.4
   --------------------

   o  Ralph Boehme <slow@samba.org>
     * BUG 15072: CVE-2022-2127.
     * BUG 15340: CVE-2023-34966.
     * BUG 15341: CVE-2023-34967.
     * BUG 15388: CVE-2023-34968.
     * BUG 15397: CVE-2023-3347.

   o  Volker Lendecke <vl@samba.org>
     * BUG 15072: CVE-2022-2127.

   o  Stefan Metzmacher <metze@samba.org>
     * BUG 15418: Secure channel faulty since Windows 10/11 update 07/2023.


(bsiegert)
diff -r1.165 -r1.165.2.1 pkgsrc/net/samba4/Makefile
diff -r1.93 -r1.93.2.1 pkgsrc/net/samba4/distinfo
cvs diff -r1.165 -r1.165.2.1 pkgsrc/net/samba4/Makefile (switch to unified diff)

--- pkgsrc/net/samba4/Makefile 2023/06/16 21:40:12 1.165
+++ pkgsrc/net/samba4/Makefile 2023/08/15 18:21:21 1.165.2.1
@@ -1,226 +1,226 @@ @@ -1,226 +1,226 @@
1# $NetBSD: Makefile,v 1.165 2023/06/16 21:40:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.165.2.1 2023/08/15 18:21:21 bsiegert Exp $
2 2
3DISTNAME= samba-4.18.3 3DISTNAME= samba-4.18.5
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= https://download.samba.org/pub/samba/stable/ 5MASTER_SITES= https://download.samba.org/pub/samba/stable/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://www.samba.org/ 8HOMEPAGE= https://www.samba.org/
9COMMENT= SMB/CIFS protocol server suite 9COMMENT= SMB/CIFS protocol server suite
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12CONFLICTS+= ja-samba-[0-9]* winbind-[0-9]* 12CONFLICTS+= ja-samba-[0-9]* winbind-[0-9]*
13 13
14PYTHON_VERSIONS_INCOMPATIBLE= 27 14PYTHON_VERSIONS_INCOMPATIBLE= 27
15 15
16GCC_REQD+= 4.4 16GCC_REQD+= 4.4
17TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 17TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
18TOOL_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml 18TOOL_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
19TOOL_DEPENDS+= docbook-xsl>=1.79.2:../../textproc/docbook-xsl 19TOOL_DEPENDS+= docbook-xsl>=1.79.2:../../textproc/docbook-xsl
20DEPENDS+= p5-JSON>=4.05:../../converters/p5-JSON 20DEPENDS+= p5-JSON>=4.05:../../converters/p5-JSON
21DEPENDS+= p5-Parse-Yapp>=1.05:../../devel/p5-Parse-Yapp 21DEPENDS+= p5-Parse-Yapp>=1.05:../../devel/p5-Parse-Yapp
22DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns 22DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
23DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 23DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
24DEPENDS+= ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601 24DEPENDS+= ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601
25DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown 25DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
26 26
27BUILD_DEFS+= VARBASE 27BUILD_DEFS+= VARBASE
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
31SMB_LIB?= ${PREFIX}/lib 31SMB_LIB?= ${PREFIX}/lib
32 32
33PKG_SYSCONFSUBDIR= samba 33PKG_SYSCONFSUBDIR= samba
34SMB_SHAREDSTATE?= ${PREFIX}/com 34SMB_SHAREDSTATE?= ${PREFIX}/com
35SMB_LOCALSTATE?= ${VARBASE} 35SMB_LOCALSTATE?= ${VARBASE}
36SMB_INFO?= ${PREFIX}/info 36SMB_INFO?= ${PREFIX}/info
37SMB_MAN?= ${PREFIX}/${PKGMANDIR} 37SMB_MAN?= ${PREFIX}/${PKGMANDIR}
38SMB_STATE?= ${VARBASE}/db/samba4 38SMB_STATE?= ${VARBASE}/db/samba4
39SMB_PRIVATE?= ${SMB_STATE}/private 39SMB_PRIVATE?= ${SMB_STATE}/private
40SMB_PID?= ${VARBASE}/run 40SMB_PID?= ${VARBASE}/run
41SMB_CACHE?= ${VARBASE}/run 41SMB_CACHE?= ${VARBASE}/run
42SMB_LOCK?= ${VARBASE}/run 42SMB_LOCK?= ${VARBASE}/run
43SMB_LOGFILEBASE?= ${VARBASE}/log 43SMB_LOGFILEBASE?= ${VARBASE}/log
44SMB_SOCKETS?= ${VARBASE}/run 44SMB_SOCKETS?= ${VARBASE}/run
45SMB_MODULES?= ${SMB_LIB}/samba 45SMB_MODULES?= ${SMB_LIB}/samba
46SMB_PRIVATELIB?= ${SMB_LIB}/samba/private 46SMB_PRIVATELIB?= ${SMB_LIB}/samba/private
47SMB_PRIVSOCKETS?= ${VARBASE}/run 47SMB_PRIVSOCKETS?= ${VARBASE}/run
48SMB_CONFIG?= ${PKG_SYSCONFDIR} 48SMB_CONFIG?= ${PKG_SYSCONFDIR}
49SMB_DATAROOT?= ${PREFIX}/share/samba 49SMB_DATAROOT?= ${PREFIX}/share/samba
50SMB_LOCALE?= ${PREFIX}/share/locale 50SMB_LOCALE?= ${PREFIX}/share/locale
51SMB_DOC?= ${PREFIX}/share/doc/samba 51SMB_DOC?= ${PREFIX}/share/doc/samba
52SMB_PAMMODULES?= ${SMB_LIB}/samba/security 52SMB_PAMMODULES?= ${SMB_LIB}/samba/security
53 53
54FILES_SUBST+= SMB_CONFIG=${SMB_CONFIG} 54FILES_SUBST+= SMB_CONFIG=${SMB_CONFIG}
55FILES_SUBST+= SMB_PID=${SMB_PID} 55FILES_SUBST+= SMB_PID=${SMB_PID}
56 56
57# mktemp is useful for the replacement adduser script, but don't require 57# mktemp is useful for the replacement adduser script, but don't require
58# a full dependency since it's not actually needed by samba. 58# a full dependency since it's not actually needed by samba.
59USE_TOOLS+= gmake mktemp perl:run pkg-config flex bison 59USE_TOOLS+= gmake mktemp perl:run pkg-config flex bison
60 60
61.if ${OPSYS} == "NetBSD" 61.if ${OPSYS} == "NetBSD"
62USE_GNU_ICONV= yes # FIXME: something doesn't work on NetBSD 62USE_GNU_ICONV= yes # FIXME: something doesn't work on NetBSD
63BROKEN_GETTEXT_DETECTION= yes 63BROKEN_GETTEXT_DETECTION= yes
64.endif 64.endif
65 65
66# Debugging 66# Debugging
67#CONFIGURE_ARGS+= -vvv 67#CONFIGURE_ARGS+= -vvv
68#CONFIGURE_ARGS+= --enable-developer 68#CONFIGURE_ARGS+= --enable-developer
69#CONFIGURE_ARGS+= --fatal-errors 69#CONFIGURE_ARGS+= --fatal-errors
70 70
71HAS_CONFIGURE= yes 71HAS_CONFIGURE= yes
72CONFIGURE_SCRIPT= ${WRKSRC}/configure 72CONFIGURE_SCRIPT= ${WRKSRC}/configure
73CONFIGURE_ARGS+= --prefix=${PREFIX} 73CONFIGURE_ARGS+= --prefix=${PREFIX}
74CONFIGURE_ARGS+= --infodir=${SMB_INFO} 74CONFIGURE_ARGS+= --infodir=${SMB_INFO}
75CONFIGURE_ARGS+= --mandir=${SMB_MAN} 75CONFIGURE_ARGS+= --mandir=${SMB_MAN}
76CONFIGURE_ARGS+= --datarootdir=${SMB_DATAROOT} 76CONFIGURE_ARGS+= --datarootdir=${SMB_DATAROOT}
77CONFIGURE_ARGS+= --libdir=${SAMBA_LIB} 77CONFIGURE_ARGS+= --libdir=${SAMBA_LIB}
78CONFIGURE_ARGS+= --localedir=${SMB_LOCALE} 78CONFIGURE_ARGS+= --localedir=${SMB_LOCALE}
79CONFIGURE_ARGS+= --docdir=${SMB_DOC} 79CONFIGURE_ARGS+= --docdir=${SMB_DOC}
80CONFIGURE_ARGS+= --with-statedir=${SMB_STATE} 80CONFIGURE_ARGS+= --with-statedir=${SMB_STATE}
81CONFIGURE_ARGS+= --with-privatedir=${SMB_PRIVATE} 81CONFIGURE_ARGS+= --with-privatedir=${SMB_PRIVATE}
82CONFIGURE_ARGS+= --with-piddir=${SMB_PID} 82CONFIGURE_ARGS+= --with-piddir=${SMB_PID}
83CONFIGURE_ARGS+= --with-cachedir=${SMB_CACHE} 83CONFIGURE_ARGS+= --with-cachedir=${SMB_CACHE}
84CONFIGURE_ARGS+= --with-lockdir=${SMB_LOCK} 84CONFIGURE_ARGS+= --with-lockdir=${SMB_LOCK}
85CONFIGURE_ARGS+= --with-logfilebase=${SMB_LOGFILEBASE} 85CONFIGURE_ARGS+= --with-logfilebase=${SMB_LOGFILEBASE}
86CONFIGURE_ARGS+= --with-sockets-dir=${SMB_SOCKETS} 86CONFIGURE_ARGS+= --with-sockets-dir=${SMB_SOCKETS}
87CONFIGURE_ARGS+= --with-modulesdir=${SMB_MODULES} 87CONFIGURE_ARGS+= --with-modulesdir=${SMB_MODULES}
88CONFIGURE_ARGS+= --with-privatelibdir=${SMB_PRIVATELIB} 88CONFIGURE_ARGS+= --with-privatelibdir=${SMB_PRIVATELIB}
89CONFIGURE_ARGS+= --with-privileged-socket-dir=${SMB_PRIVSOCKETS} 89CONFIGURE_ARGS+= --with-privileged-socket-dir=${SMB_PRIVSOCKETS}
90CONFIGURE_ARGS+= --with-configdir=${SMB_CONFIG} 90CONFIGURE_ARGS+= --with-configdir=${SMB_CONFIG}
91CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} 91CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
92CONFIGURE_ARGS+= --abi-check-disable 92CONFIGURE_ARGS+= --abi-check-disable
93CONFIGURE_ARGS+= --disable-symbol-versions 93CONFIGURE_ARGS+= --disable-symbol-versions
94.if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && ${MAKE_JOBS_SAFE:U:tl} == no) 94.if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && ${MAKE_JOBS_SAFE:U:tl} == no)
95CONFIGURE_ARGS+= --jobs=${MAKE_JOBS} 95CONFIGURE_ARGS+= --jobs=${MAKE_JOBS}
96.else 96.else
97CONFIGURE_ARGS+= --jobs=1 97CONFIGURE_ARGS+= --jobs=1
98.endif 98.endif
99CONFIGURE_ARGS+= --without-gpgme 99CONFIGURE_ARGS+= --without-gpgme
100 100
101# Depends on ncurses, explicitly disable for now. 101# Depends on ncurses, explicitly disable for now.
102CONFIGURE_ARGS+= --without-regedit 102CONFIGURE_ARGS+= --without-regedit
103 103
104PY_PATCHPLIST= yes 104PY_PATCHPLIST= yes
105MAKE_FLAGS+= WAF_BINARY=${PYTHONBIN}\ ${WRKSRC}/buildtools/bin/waf 105MAKE_FLAGS+= WAF_BINARY=${PYTHONBIN}\ ${WRKSRC}/buildtools/bin/waf
106 106
107# for winbind option build. 107# for winbind option build.
108.if "${OPSYS}" != "Darwin" && "${OPSYS}" != "SunOS" 108.if "${OPSYS}" != "Darwin" && "${OPSYS}" != "SunOS"
109LDFLAGS+= -Wl,--allow-shlib-undefined 109LDFLAGS+= -Wl,--allow-shlib-undefined
110.endif 110.endif
111LDFLAGS+= ${BUILDLINK_LDADD.gettext} 111LDFLAGS+= ${BUILDLINK_LDADD.gettext}
112LDFLAGS+= ${COMPILER_RPATH_FLAG}${SMB_PRIVATELIB} 112LDFLAGS+= ${COMPILER_RPATH_FLAG}${SMB_PRIVATELIB}
113 113
114CFLAGS.SunOS+= -DHAVE_SOLARIS_GETGRENT_R 114CFLAGS.SunOS+= -DHAVE_SOLARIS_GETGRENT_R
115# workaround https://bugzilla.samba.org/show_bug.cgi?id=12502 for now 115# workaround https://bugzilla.samba.org/show_bug.cgi?id=12502 for now
116CFLAGS.SunOS+= -DMSG_NOSIGNAL=0 116CFLAGS.SunOS+= -DMSG_NOSIGNAL=0
117LDFLAGS.SunOS+= -lsocket -lsendfile 117LDFLAGS.SunOS+= -lsocket -lsendfile
118 118
119CFLAGS.FreeBSD+= -DENODATA=ENOATTR 119CFLAGS.FreeBSD+= -DENODATA=ENOATTR
120 120
121.include "options.mk" 121.include "options.mk"
122 122
123.if ${SHLIB_TYPE} == "dylib" 123.if ${SHLIB_TYPE} == "dylib"
124PLIST_SUBST+= SOEXT=dylib 124PLIST_SUBST+= SOEXT=dylib
125.else 125.else
126PLIST_SUBST+= SOEXT=so 126PLIST_SUBST+= SOEXT=so
127.endif 127.endif
128 128
129.if !defined(PWD_MKDB) 129.if !defined(PWD_MKDB)
130PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \ 130PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \
131 ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }' 131 ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'
132MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q} 132MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q}
133.endif 133.endif
134FILES_SUBST+= MKTEMP=${MKTEMP:Q} 134FILES_SUBST+= MKTEMP=${MKTEMP:Q}
135FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} 135FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
136 136
137INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 137INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
138 138
139DOCDIR= share/doc/${PKGBASE} 139DOCDIR= share/doc/${PKGBASE}
140EGDIR= share/examples/${PKGBASE} 140EGDIR= share/examples/${PKGBASE}
141CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SMB_CONFIG}/smb.conf 141CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SMB_CONFIG}/smb.conf
142OWN_DIRS_PERMS= ${SMB_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 142OWN_DIRS_PERMS= ${SMB_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
143RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} 143RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
144 144
145SUBST_CLASSES+= docbook 145SUBST_CLASSES+= docbook
146SUBST_MESSAGE.docbook= Fixing docbook URLs. 146SUBST_MESSAGE.docbook= Fixing docbook URLs.
147SUBST_FILES.docbook+= buildtools/wafsamba/wafsamba.py 147SUBST_FILES.docbook+= buildtools/wafsamba/wafsamba.py
148SUBST_FILES.docbook+= ctdb/doc/*.xml 148SUBST_FILES.docbook+= ctdb/doc/*.xml
149SUBST_FILES.docbook+= docs-xml/build/DTD/samba-doc 149SUBST_FILES.docbook+= docs-xml/build/DTD/samba-doc
150SUBST_FILES.docbook+= docs-xml/xslt/*.xsl 150SUBST_FILES.docbook+= docs-xml/xslt/*.xsl
151SUBST_FILES.docbook+= lib/ldb/docs/builddocs.sh 151SUBST_FILES.docbook+= lib/ldb/docs/builddocs.sh
152SUBST_FILES.docbook+= librpc/tools/*.xml 152SUBST_FILES.docbook+= librpc/tools/*.xml
153SUBST_FILES.docbook+= */*/man/*.xml 153SUBST_FILES.docbook+= */*/man/*.xml
154SUBST_FILES.docbook+= */*/*/man/*.xml 154SUBST_FILES.docbook+= */*/*/man/*.xml
155SUBST_STAGE.docbook= pre-configure 155SUBST_STAGE.docbook= pre-configure
156SUBST_SED.docbook= -e 's,http://www.oasis-open.org/docbook/xml,${PREFIX}/share/xml/docbook,g' 156SUBST_SED.docbook= -e 's,http://www.oasis-open.org/docbook/xml,${PREFIX}/share/xml/docbook,g'
157SUBST_SED.docbook+= -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g' 157SUBST_SED.docbook+= -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
158 158
159SUBST_CLASSES+= paths 159SUBST_CLASSES+= paths
160SUBST_MESSAGE.paths= Fixing paths. 160SUBST_MESSAGE.paths= Fixing paths.
161SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh 161SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
162SUBST_FILES.paths+= third_party/heimdal_build/roken.h 162SUBST_FILES.paths+= third_party/heimdal_build/roken.h
163SUBST_STAGE.paths= pre-configure 163SUBST_STAGE.paths= pre-configure
164SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g' 164SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g'
165SUBST_VARS.paths= AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE 165SUBST_VARS.paths= AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE
166 166
167SUBST_CLASSES+= logpath 167SUBST_CLASSES+= logpath
168SUBST_MESSAGE.logpath= Fixing log path. 168SUBST_MESSAGE.logpath= Fixing log path.
169SUBST_FILES.logpath= examples/smb.conf.default 169SUBST_FILES.logpath= examples/smb.conf.default
170SUBST_STAGE.logpath= pre-configure 170SUBST_STAGE.logpath= pre-configure
171SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g' 171SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g'
172 172
173SMF_INSTANCES= smbd nmbd 173SMF_INSTANCES= smbd nmbd
174 174
175CTF_FILES_SKIP+= lib/libdcerpc-samr.so.* # empty 175CTF_FILES_SKIP+= lib/libdcerpc-samr.so.* # empty
176 176
177post-extract: 177post-extract:
178 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR} 178 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
179 179
180post-install: 180post-install:
181 ${RUN} cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \ 181 ${RUN} cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \
182 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \ 182 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \
183 done 183 done
184 ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \ 184 ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \
185 ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh 185 ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh
186 ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \ 186 ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \
187 ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh 187 ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh
188 ${INSTALL_DATA} ${WRKSRC}/examples/LDAP/samba.schema \ 188 ${INSTALL_DATA} ${WRKSRC}/examples/LDAP/samba.schema \
189 ${DESTDIR}${PREFIX}/${EGDIR} 189 ${DESTDIR}${PREFIX}/${EGDIR}
190 ${INSTALL_DATA} ${WRKSRC}/examples/smb.conf.default \ 190 ${INSTALL_DATA} ${WRKSRC}/examples/smb.conf.default \
191 ${DESTDIR}${PREFIX}/${EGDIR} 191 ${DESTDIR}${PREFIX}/${EGDIR}
192 192
193REPLACE_PERL+= librpc/tables.pl 193REPLACE_PERL+= librpc/tables.pl
194REPLACE_PERL+= pidl/pidl 194REPLACE_PERL+= pidl/pidl
195REPLACE_PERL+= pidl/tests/*.pl 195REPLACE_PERL+= pidl/tests/*.pl
196REPLACE_PERL+= script/*.pl 196REPLACE_PERL+= script/*.pl
197REPLACE_PERL+= source3/script/*.pl 197REPLACE_PERL+= source3/script/*.pl
198REPLACE_PERL+= source4/script/*.pl 198REPLACE_PERL+= source4/script/*.pl
199REPLACE_PERL+= source4/scripting/bin/nsupdate-gss 199REPLACE_PERL+= source4/scripting/bin/nsupdate-gss
200REPLACE_PERL+= third_party/nss_wrapper/nss_wrapper.pl 200REPLACE_PERL+= third_party/nss_wrapper/nss_wrapper.pl
201REPLACE_PYTHON+= buildtools/bin/waf 201REPLACE_PYTHON+= buildtools/bin/waf
202REPLACE_PYTHON+= source4/setup/wscript_build 202REPLACE_PYTHON+= source4/setup/wscript_build
203REPLACE_PYTHON+= source4/scripting/bin/* 203REPLACE_PYTHON+= source4/scripting/bin/*
204 204
205.if "${OPSYS}" == "Linux" 205.if "${OPSYS}" == "Linux"
206.include "../../devel/libuuid/buildlink3.mk" 206.include "../../devel/libuuid/buildlink3.mk"
207.endif 207.endif
208.include "../../archivers/libarchive/buildlink3.mk" 208.include "../../archivers/libarchive/buildlink3.mk"
209.include "../../converters/libiconv/buildlink3.mk" 209.include "../../converters/libiconv/buildlink3.mk"
210BUILDLINK_API_DEPENDS.ldb+= ldb>=2.7.2<2.8 210BUILDLINK_API_DEPENDS.ldb+= ldb>=2.7.2<2.8
211.include "../../databases/ldb/buildlink3.mk" 211.include "../../databases/ldb/buildlink3.mk"
212.include "../../databases/lmdb/buildlink3.mk" 212.include "../../databases/lmdb/buildlink3.mk"
213.include "../../devel/cmocka/buildlink3.mk" 213.include "../../devel/cmocka/buildlink3.mk"
214.include "../../devel/gettext-lib/buildlink3.mk" 214.include "../../devel/gettext-lib/buildlink3.mk"
215.include "../../devel/popt/buildlink3.mk" 215.include "../../devel/popt/buildlink3.mk"
216.include "../../devel/readline/buildlink3.mk" 216.include "../../devel/readline/buildlink3.mk"
217BUILDLINK_API_DEPENDS.talloc+= talloc>=2.3.4 217BUILDLINK_API_DEPENDS.talloc+= talloc>=2.3.4
218.include "../../devel/talloc/buildlink3.mk" 218.include "../../devel/talloc/buildlink3.mk"
219.include "../../devel/tevent/buildlink3.mk" 219.include "../../devel/tevent/buildlink3.mk"
220.include "../../devel/zlib/buildlink3.mk" 220.include "../../devel/zlib/buildlink3.mk"
221.include "../../lang/python/application.mk" 221.include "../../lang/python/application.mk"
222.include "../../lang/python/extension.mk" 222.include "../../lang/python/extension.mk"
223.include "../../security/gnutls/buildlink3.mk" 223.include "../../security/gnutls/buildlink3.mk"
224.include "../../security/libgcrypt/buildlink3.mk" 224.include "../../security/libgcrypt/buildlink3.mk"
225.include "../../textproc/jansson/buildlink3.mk" 225.include "../../textproc/jansson/buildlink3.mk"
226.include "../../mk/bsd.pkg.mk" 226.include "../../mk/bsd.pkg.mk"
cvs diff -r1.93 -r1.93.2.1 pkgsrc/net/samba4/distinfo (switch to unified diff)

--- pkgsrc/net/samba4/distinfo 2023/06/16 21:40:12 1.93
+++ pkgsrc/net/samba4/distinfo 2023/08/15 18:21:21 1.93.2.1
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1$NetBSD: distinfo,v 1.93 2023/06/16 21:40:12 wiz Exp $ 1$NetBSD: distinfo,v 1.93.2.1 2023/08/15 18:21:21 bsiegert Exp $
2 2
3BLAKE2s (samba-4.18.3.tar.gz) = 5cbceef6c02cbedfc24d0e74e09473a716873d1394375163a4def7a4014b78af 3BLAKE2s (samba-4.18.5.tar.gz) = e7b9c7cf8adbe2c42e21d416aff8a18e7c11bcf458cc16d45747b104ed478edb
4SHA512 (samba-4.18.3.tar.gz) = b0980291ca124641bd03ba51d4b4e2e492facb3939f8edf491133be83a82beed66f68f00442cb02c211a9e76eb6ba08387136e30eb7df756c3c90c76034689c4 4SHA512 (samba-4.18.5.tar.gz) = c12b7cd7aba0941bf178c89604f926347bee4f5bb6ea651930cc93bcd8a2cfa983b1f10a0ccb55f99c5b34b9f158d1059d06d7f39f7bc261c7dd0d8c89c5a6f5
5Size (samba-4.18.3.tar.gz) = 41294739 bytes 5Size (samba-4.18.5.tar.gz) = 41315373 bytes
6SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926 6SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
7SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d 7SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
8SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7 8SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7
9SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2 9SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
10SHA1 (patch-buildtools_wafsamba_wscript) = 0ca4c3a9d2e07f9165784e495f6f6b2b21db2758 10SHA1 (patch-buildtools_wafsamba_wscript) = 0ca4c3a9d2e07f9165784e495f6f6b2b21db2758
11SHA1 (patch-dynconfig_wscript) = 1858e5fcca913f21aa3e7868d9760b9c40c9f5c4 11SHA1 (patch-dynconfig_wscript) = 1858e5fcca913f21aa3e7868d9760b9c40c9f5c4
12SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18 12SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18
13SHA1 (patch-lib_pthreadpool_pthreadpool.c) = 4b0c3d49d578b5ab12f5bad1ebeb50efb43e756c 13SHA1 (patch-lib_pthreadpool_pthreadpool.c) = 4b0c3d49d578b5ab12f5bad1ebeb50efb43e756c
14SHA1 (patch-lib_replace_system_passwd.h) = 652be067b2560310ce3a4bbf37c24cb2fa8eb82d 14SHA1 (patch-lib_replace_system_passwd.h) = 652be067b2560310ce3a4bbf37c24cb2fa8eb82d
15SHA1 (patch-lib_replace_wscript) = f75dff520034ed976c15134c950eebf78598a60b 15SHA1 (patch-lib_replace_wscript) = f75dff520034ed976c15134c950eebf78598a60b
16SHA1 (patch-lib_tdb_common_mutex.c) = 74162bf9dfd440fc0b9782982e83776c9671a983 16SHA1 (patch-lib_tdb_common_mutex.c) = 74162bf9dfd440fc0b9782982e83776c9671a983
17SHA1 (patch-lib_tevent_tevent.c) = 109e7a516dc291372e982b9f21c6ce8c0e5d3ca4 17SHA1 (patch-lib_tevent_tevent.c) = 109e7a516dc291372e982b9f21c6ce8c0e5d3ca4
18SHA1 (patch-lib_tevent_tevent__threads.c) = e5e82db82cff4d550451cd9290b3a351b25d4de4 18SHA1 (patch-lib_tevent_tevent__threads.c) = e5e82db82cff4d550451cd9290b3a351b25d4de4
19SHA1 (patch-lib_tevent_wscript) = fbbe2024096b57d651d90064f53489a974db9d7a 19SHA1 (patch-lib_tevent_wscript) = fbbe2024096b57d651d90064f53489a974db9d7a
20SHA1 (patch-lib_tsocket_tsocket__bsd.c) = 0ac414e02ee3a326d3dd34515bfffce6e8da5e46 20SHA1 (patch-lib_tsocket_tsocket__bsd.c) = 0ac414e02ee3a326d3dd34515bfffce6e8da5e46
21SHA1 (patch-lib_util_charset_charset__macosxfs.c) = 9772fc52fff48aec2a7e279223f73bb791217c26 21SHA1 (patch-lib_util_charset_charset__macosxfs.c) = 9772fc52fff48aec2a7e279223f73bb791217c26
22SHA1 (patch-lib_util_smb__threads.h) = 817591a2b69f31ac29497a2006fe21f0b4b0aaea 22SHA1 (patch-lib_util_smb__threads.h) = 817591a2b69f31ac29497a2006fe21f0b4b0aaea
23SHA1 (patch-lib_util_tfork.c) = a9acb5561c5bba76450c48904a22019c8b14cbec 23SHA1 (patch-lib_util_tfork.c) = a9acb5561c5bba76450c48904a22019c8b14cbec
24SHA1 (patch-lib_util_time.h) = 5048614e301cf6922ff7fa6693fa58bfe17ff10e 24SHA1 (patch-lib_util_time.h) = 5048614e301cf6922ff7fa6693fa58bfe17ff10e
25SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89 25SHA1 (patch-libcli_dns_wscript__build) = 4103a144aa1bb4662fd7a62270941f1a3d01fe89
26SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = c546f00184b0d22b6c150e210962cdfc6fc12df2 26SHA1 (patch-nsswitch_stress-nss-libwbclient.c) = c546f00184b0d22b6c150e210962cdfc6fc12df2
27SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 2773ec9269d1fe0d7ce7ed220f6a7122d187fabe 27SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 2773ec9269d1fe0d7ce7ed220f6a7122d187fabe
28SHA1 (patch-nsswitch_wscript__build) = 5be3e07f8a34ae3e2f68126eb6f05f8b65f5be2f 28SHA1 (patch-nsswitch_wscript__build) = 5be3e07f8a34ae3e2f68126eb6f05f8b65f5be2f
29SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f 29SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f
30SHA1 (patch-source3_modules_vfs__solarisacl.c) = 1a56006393d08d9977c60e75fddfcf501e2233f7 30SHA1 (patch-source3_modules_vfs__solarisacl.c) = 1a56006393d08d9977c60e75fddfcf501e2233f7
31SHA1 (patch-source3_modules_vfs__solarisacl.h) = 11f8664641a14fd83d78b1a7e10056a77b7b634f 31SHA1 (patch-source3_modules_vfs__solarisacl.h) = 11f8664641a14fd83d78b1a7e10056a77b7b634f
32SHA1 (patch-source3_printing_samba-bgqd.c) = e9b83c35fbb24c702650d745b82fe6c9efbcdf76 32SHA1 (patch-source3_printing_samba-bgqd.c) = e9b83c35fbb24c702650d745b82fe6c9efbcdf76
33SHA1 (patch-source3_smbd_quotas.c) = 7f959964fac3ee435c57a115c8f5b6407e57b777 33SHA1 (patch-source3_smbd_quotas.c) = 7f959964fac3ee435c57a115c8f5b6407e57b777
34SHA1 (patch-source3_smbd_smb1__process.c) = ff59b9b4f4bdfff2761613ff84fbd669899ea540 34SHA1 (patch-source3_smbd_smb1__process.c) = ff59b9b4f4bdfff2761613ff84fbd669899ea540
35SHA1 (patch-source3_utils_net__offlinejoin.c) = 773a4686d5e2a7eaebf9430529708e8318d45c77 35SHA1 (patch-source3_utils_net__offlinejoin.c) = 773a4686d5e2a7eaebf9430529708e8318d45c77
36SHA1 (patch-source4_auth_gensec_wscript__build) = 01f3cdf787833e05f2e0b49ff0af7c8bbad2c161 36SHA1 (patch-source4_auth_gensec_wscript__build) = 01f3cdf787833e05f2e0b49ff0af7c8bbad2c161
37SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898 37SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898
38SHA1 (patch-source4_scripting_wscript__build) = 816d44f48b6cbc6d999995e00eaea1d2dc477159 38SHA1 (patch-source4_scripting_wscript__build) = 816d44f48b6cbc6d999995e00eaea1d2dc477159
39SHA1 (patch-third__party_heimdal__build_roken.h) = 59d5523676fe8c0315e969247f26b4ea2f900402 39SHA1 (patch-third__party_heimdal__build_roken.h) = 59d5523676fe8c0315e969247f26b4ea2f900402
40SHA1 (patch-third__party_heimdal_include_heim__threads.h) = 5ad13530cf9688e46f9ad487bb0fddab668c8276 40SHA1 (patch-third__party_heimdal_include_heim__threads.h) = 5ad13530cf9688e46f9ad487bb0fddab668c8276
41SHA1 (patch-third__party_heimdal_lib_hcrypto_evp.c) = db1be175f7328d7aa9551ba2e641be15e348c84a 41SHA1 (patch-third__party_heimdal_lib_hcrypto_evp.c) = db1be175f7328d7aa9551ba2e641be15e348c84a
42SHA1 (patch-third__party_heimdal_lib_roken_getauxval.h) = 23c9cf574d9f042c9f6dd1b0377c91045e755b5b 42SHA1 (patch-third__party_heimdal_lib_roken_getauxval.h) = 23c9cf574d9f042c9f6dd1b0377c91045e755b5b