diff options
| author | fhajny <fhajny@pkgsrc.org> | 2017-06-27 13:37:16 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2017-06-27 13:37:16 +0000 |
| commit | 026a619ebab24ff895ca027d4340d08fe9c18b22 (patch) | |
| tree | 0afc30ed387bfe0752ba682d3b65d8f3d0decb77 /net | |
| parent | c00471afc73d04aa76e322bff144cb321b9f572c (diff) | |
| download | pkgsrc-026a619ebab24ff895ca027d4340d08fe9c18b22.tar.gz | |
Substitute SYSCONFDIR assumed by the embedded Heimdal code properly.
Fixes calls to e.g. krb5.keytab that were hardcoded to /etc. PKGREVISION++
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba4/Makefile | 12 | ||||
| -rw-r--r-- | net/samba4/distinfo | 3 | ||||
| -rw-r--r-- | net/samba4/patches/patch-source4_heimdal__build_roken.h | 15 |
3 files changed, 21 insertions, 9 deletions
diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 9e08d1a63e7..2d768ce8d2e 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2017/06/01 13:30:26 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2017/06/27 13:37:16 fhajny Exp $ DISTNAME= samba-${VERSION} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://download.samba.org/pub/samba/stable/ @@ -146,15 +147,10 @@ RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing paths. SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh scripts/findsmb.in -SUBST_FILES.paths+= source3/script/findsmb.in +SUBST_FILES.paths+= source3/script/findsmb.in source4/heimdal_build/roken.h SUBST_STAGE.paths= post-patch -SUBST_SED.paths+= -e 's,@AWK@,${AWK},g' -SUBST_SED.paths+= -e 's,@CAT@,${CAT},g' -SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g' -SUBST_SED.paths+= -e 's,@RM@,${RM},g' -SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g' -SUBST_SED.paths+= -e 's,@SH@,${SH},g' SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g' +SUBST_VARS.paths= AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE SUBST_CLASSES+= logpath SUBST_MESSAGE.logpath= Fixing log path. diff --git a/net/samba4/distinfo b/net/samba4/distinfo index 0e43063a012..96e8d8a3e7c 100644 --- a/net/samba4/distinfo +++ b/net/samba4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2017/05/24 15:51:32 he Exp $ +$NetBSD: distinfo,v 1.14 2017/06/27 13:37:16 fhajny Exp $ SHA1 (samba-4.6.4.tar.gz) = eabfbb4d4ed17e25feb1aec81187011fca0f5f8a RMD160 (samba-4.6.4.tar.gz) = 91b77289adb41b1570e82411795fd8e7bb9a7543 @@ -11,5 +11,6 @@ SHA1 (patch-lib_replace_wscript) = b6a042c2c13c0be78d7b64c0ce2efdaf4bbb1f3b SHA1 (patch-lib_tevent_wscript) = 9617b9e40d2ffc8d6297390a20ba9bd44147d669 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb SHA1 (patch-source3_script_tests_test__smbclient__s3.sh) = 4b4be0691322afc70769602069c8a1bbd81ab639 +SHA1 (patch-source4_heimdal__build_roken.h) = ee535f8e7cc46a3487d95bc859438c476a88fe60 SHA1 (patch-source4_scripting_wsript_build) = 6053076427835ac4fe97d93b2ff67d2caccc71f4 SHA1 (patch-testprogs_blackbox_dbcheck-oldrelease.sh) = 0bd2067b77a1db93e3cb5d80964a7be2b06802ff diff --git a/net/samba4/patches/patch-source4_heimdal__build_roken.h b/net/samba4/patches/patch-source4_heimdal__build_roken.h new file mode 100644 index 00000000000..2478ad532e0 --- /dev/null +++ b/net/samba4/patches/patch-source4_heimdal__build_roken.h @@ -0,0 +1,15 @@ +$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 '/' + |