diff --git a/samba4.be0 b/samba4.be0 index b3f688192..8440f83f1 100755 --- a/samba4.be0 +++ b/samba4.be0 @@ -1,39 +1,40 @@ #!/usr/bin/env beesh -# BEE_VERSION samba4-4.6.5-2 +# BEE_VERSION samba4-4.6.5-3 -SRCURL[0]="http://www.samba.org/samba/ftp/stable/samba-${PKGVERSION}.tar.gz" +SRCURL[0]="https://www.samba.org/samba/ftp/stable/samba-${PKGVERSION}.tar.gz" -EXCLUDE="^/var" +# mariux patch to allow -with-config-file= +PATCHURL[0]="/src/mariux/download/samba4-add-config-file-configure-option.patch" PREFIX=/usr/local/samba4 -LOCALSTATEDIR=/var/samba4 -SYSCONFDIR=${PREFIX}/etc +VARPATH=/var/samba4/localhost BEE_BUILDTYPE= # build_in_sourcedir mee_configure() { - -# ./configure \ + # see also https://github.com/samba-team/samba/blob/master/dynconfig/wscript python ./buildtools/bin/waf configure \ --prefix=${PREFIX} \ - --sysconfdir=${SYSCONFDIR} \ --with-configdir=/etc/samba4 \ - --localstatedir=state \ - --with-lockdir=locks \ - --with-statedir=state \ - --with-privatedir=private \ - --with-logfilebase=log \ - --with-cachedir=cache \ - --with-piddir=. \ + --with-config-file=/etc/samba4/smb.conf-localhost \ + --localstatedir=${VARPATH}/state \ + --with-lockdir=${VARPATH}/locks \ + --with-statedir=${VARPATH}/state \ + --with-privatedir=${VARPATH}/private \ + --with-logfilebase=${VARPATH}/log \ + --with-cachedir=${VARPATH}/cache \ + --with-piddir=${VARPATH} \ + --with-sockets-dir=${VARPATH}/run \ + --with-privileged-socket-dir=${VARPATH}/run-priv \ --with-pammodulesdir=/lib/security \ --without-ad-dc \ --without-winbind \ --without-systemd + } mee_build() { # use 'make showflags' to get defaults... and add rpath GRMPF!! - make ${BEE_MAKEFLAGS} LDFLAGS='-pie -Wl,-z,relro -Wl,--as-needed -L./bin -Wl,-rpath,${LIBDIR}' } @@ -41,25 +42,13 @@ mee_install() { make install DESTDIR=${D} mkdir -p ${D}${PREFIX} - # ln -s ${LOCALSTATEDIR} ${D}${PREFIX}/var mkdir -p ${D}${SYSCONFDIR} - mkdir -p ${D}/lib - mkdir -p ${D}/usr/lib - + # enable resolve/map windows domain usernames mv -v ${D}${LIBDIR}/libnss_win{s,bind}.so* ${D}/lib ln -v -sf ../../lib/libnss_winbind.so.2 ${D}${LIBDIR}/libnss_winbind.so ln -v -sf ../../lib/libnss_wins.so.2 ${D}${LIBDIR}/libnss_wins.so - # clean up variable folders - # in our case we run smbd in /var/samba4/${NAME} - rmdir -v ${D}/cache - rmdir -v ${D}/locks - rmdir -v ${D}/log - rmdir -v ${D}/private - rm -rv ${D}/state - # for donald.. echo "PATH=${BINDIR}:${SBINDIR}:\${PATH}" >>${D}${PREFIX}/profile - }