Tue Jun 27 13:37:16 2017 UTC ()
Substitute SYSCONFDIR assumed by the embedded Heimdal code properly.
Fixes calls to e.g. krb5.keytab that were hardcoded to /etc. PKGREVISION++


(fhajny)
diff -r1.32 -r1.33 pkgsrc/net/samba4/Makefile
diff -r1.13 -r1.14 pkgsrc/net/samba4/distinfo
diff -r0 -r1.1 pkgsrc/net/samba4/patches/patch-source4_heimdal__build_roken.h
cvs diff -r1.32 -r1.33 pkgsrc/net/samba4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba4/Makefile 2017/06/01 13:30:26 1.32
+++ pkgsrc/net/samba4/Makefile 2017/06/27 13:37:16 1.33
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.32 2017/06/01 13:30:26 jlam Exp $ 1# $NetBSD: Makefile,v 1.33 2017/06/27 13:37:16 fhajny Exp $
2 2
3DISTNAME= samba-${VERSION} 3DISTNAME= samba-${VERSION}
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= http://download.samba.org/pub/samba/stable/ 6MASTER_SITES= http://download.samba.org/pub/samba/stable/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.samba.org/ 9HOMEPAGE= http://www.samba.org/
9COMMENT= SMB/CIFS protocol server suite 10COMMENT= SMB/CIFS protocol server suite
10LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
11 12
12DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 13DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
13 14
14VERSION= 4.6.4 15VERSION= 4.6.4
15CONFLICTS+= ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]* 16CONFLICTS+= ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]*
16 17
@@ -136,35 +137,30 @@ FILES_SUBST+= MKTEMP=${MKTEMP:Q} @@ -136,35 +137,30 @@ FILES_SUBST+= MKTEMP=${MKTEMP:Q}
136FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} 137FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
137 138
138INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 139INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
139 140
140DOCDIR= share/doc/${PKGBASE} 141DOCDIR= share/doc/${PKGBASE}
141EGDIR= share/examples/${PKGBASE} 142EGDIR= share/examples/${PKGBASE}
142CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SMB_CONFIG}/smb.conf 143CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SMB_CONFIG}/smb.conf
143OWN_DIRS_PERMS= ${SMB_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 144OWN_DIRS_PERMS= ${SMB_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
144RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} 145RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
145 146
146SUBST_CLASSES+= paths 147SUBST_CLASSES+= paths
147SUBST_MESSAGE.paths= Fixing paths. 148SUBST_MESSAGE.paths= Fixing paths.
148SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh scripts/findsmb.in 149SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh scripts/findsmb.in
149SUBST_FILES.paths+= source3/script/findsmb.in 150SUBST_FILES.paths+= source3/script/findsmb.in source4/heimdal_build/roken.h
150SUBST_STAGE.paths= post-patch 151SUBST_STAGE.paths= post-patch
151SUBST_SED.paths+= -e 's,@AWK@,${AWK},g' 
152SUBST_SED.paths+= -e 's,@CAT@,${CAT},g' 
153SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g' 
154SUBST_SED.paths+= -e 's,@RM@,${RM},g' 
155SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g' 
156SUBST_SED.paths+= -e 's,@SH@,${SH},g' 
157SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g' 152SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g'
 153SUBST_VARS.paths= AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE
158 154
159SUBST_CLASSES+= logpath 155SUBST_CLASSES+= logpath
160SUBST_MESSAGE.logpath= Fixing log path. 156SUBST_MESSAGE.logpath= Fixing log path.
161SUBST_FILES.logpath= examples/smb.conf.default 157SUBST_FILES.logpath= examples/smb.conf.default
162SUBST_STAGE.logpath= pre-configure 158SUBST_STAGE.logpath= pre-configure
163SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g' 159SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g'
164 160
165.if ${INIT_SYSTEM} == "rc.d" 161.if ${INIT_SYSTEM} == "rc.d"
166MESSAGE_SRC= ${PKGDIR}/MESSAGE.rcd 162MESSAGE_SRC= ${PKGDIR}/MESSAGE.rcd
167.endif 163.endif
168 164
169post-extract: 165post-extract:
170 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR} 166 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
cvs diff -r1.13 -r1.14 pkgsrc/net/samba4/distinfo (expand / switch to unified diff)

--- pkgsrc/net/samba4/distinfo 2017/05/24 15:51:32 1.13
+++ pkgsrc/net/samba4/distinfo 2017/06/27 13:37:16 1.14
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.13 2017/05/24 15:51:32 he Exp $ 1$NetBSD: distinfo,v 1.14 2017/06/27 13:37:16 fhajny Exp $
2 2
3SHA1 (samba-4.6.4.tar.gz) = eabfbb4d4ed17e25feb1aec81187011fca0f5f8a 3SHA1 (samba-4.6.4.tar.gz) = eabfbb4d4ed17e25feb1aec81187011fca0f5f8a
4RMD160 (samba-4.6.4.tar.gz) = 91b77289adb41b1570e82411795fd8e7bb9a7543 4RMD160 (samba-4.6.4.tar.gz) = 91b77289adb41b1570e82411795fd8e7bb9a7543
5SHA512 (samba-4.6.4.tar.gz) = c20e6ad35b701816c35959fd242470dd899fb1b0bf02277ebdc87624dc1059199854b8d759374ab8b23f4842aa01347389a34319635091ade5afb5a94810eac1 5SHA512 (samba-4.6.4.tar.gz) = c20e6ad35b701816c35959fd242470dd899fb1b0bf02277ebdc87624dc1059199854b8d759374ab8b23f4842aa01347389a34319635091ade5afb5a94810eac1
6Size (samba-4.6.4.tar.gz) = 21108045 bytes 6Size (samba-4.6.4.tar.gz) = 21108045 bytes
7SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5 7SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5
8SHA1 (patch-lib_nss__wrapper_nss__wrapper.c) = c692fa33ec17ed4f1dc1e40c1fadf7846d976824 8SHA1 (patch-lib_nss__wrapper_nss__wrapper.c) = c692fa33ec17ed4f1dc1e40c1fadf7846d976824
9SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18 9SHA1 (patch-lib_param_loadparm.h) = 0216b69d33d1e17260a446e11bee764116c52b18
10SHA1 (patch-lib_replace_wscript) = b6a042c2c13c0be78d7b64c0ce2efdaf4bbb1f3b 10SHA1 (patch-lib_replace_wscript) = b6a042c2c13c0be78d7b64c0ce2efdaf4bbb1f3b
11SHA1 (patch-lib_tevent_wscript) = 9617b9e40d2ffc8d6297390a20ba9bd44147d669 11SHA1 (patch-lib_tevent_wscript) = 9617b9e40d2ffc8d6297390a20ba9bd44147d669
12SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb 12SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
13SHA1 (patch-source3_script_tests_test__smbclient__s3.sh) = 4b4be0691322afc70769602069c8a1bbd81ab639 13SHA1 (patch-source3_script_tests_test__smbclient__s3.sh) = 4b4be0691322afc70769602069c8a1bbd81ab639
 14SHA1 (patch-source4_heimdal__build_roken.h) = ee535f8e7cc46a3487d95bc859438c476a88fe60
14SHA1 (patch-source4_scripting_wsript_build) = 6053076427835ac4fe97d93b2ff67d2caccc71f4 15SHA1 (patch-source4_scripting_wsript_build) = 6053076427835ac4fe97d93b2ff67d2caccc71f4
15SHA1 (patch-testprogs_blackbox_dbcheck-oldrelease.sh) = 0bd2067b77a1db93e3cb5d80964a7be2b06802ff 16SHA1 (patch-testprogs_blackbox_dbcheck-oldrelease.sh) = 0bd2067b77a1db93e3cb5d80964a7be2b06802ff
File Added: pkgsrc/net/samba4/patches/Attic/patch-source4_heimdal__build_roken.h
$NetBSD: patch-source4_heimdal__build_roken.h,v 1.1 2017/06/27 13:37:16 fhajny Exp $

Substitute SYSCONFDIR in embedded Heimdal too.

--- source4/heimdal_build/roken.h.orig	2017-01-11 07:55:15.000000000 +0000
+++ source4/heimdal_build/roken.h
@@ -10,7 +10,7 @@
 #define HEIM_WEAK_CRYPTO 1
 
 /* path to sysconf - should we force this to samba LIBDIR ? */
-#define SYSCONFDIR "/etc"
+#define SYSCONFDIR "@PKG_SYSCONFBASE@"
 
 #define rk_PATH_DELIM '/'