Index: branches/2014Q4/net/smbldap-tools/Makefile =================================================================== --- branches/2014Q4/net/smbldap-tools/Makefile (revision 370622) +++ branches/2014Q4/net/smbldap-tools/Makefile (revision 370623) @@ -1,72 +1,75 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= smbldap-tools PORTVERSION= 0.9.10 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://download.gna.org/smbldap-tools/sources/${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Samba-LDAP management and support tools LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \ p5-Crypt-SmbHash>=0:${PORTSDIR}/security/p5-Crypt-SmbHash \ p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \ p5-Unicode-MapUTF8>=0:${PORTSDIR}/converters/p5-Unicode-MapUTF8 RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/a//} USES= gmake perl5 GNU_CONFIGURE= yes ALL_TARGET= build + +NO_ARCH= yes PORTDOCS= * OPTIONS_DEFINE= MIGRATION_SCRIPTS PDF_DOC DOCS MIGRATION_SCRIPTS_DESC= Install migration scripts PDF_DOC_DESC= Install PDF documentation OPTIONS_SUB= yes CONFIGURE_ARGS+= --with-samba-sysconfdir=${LOCALBASE}/etc \ --with-samba-bindir=${LOCALBASE}/bin \ --with-perl=${PERL} \ --with-perl-libdir=sitelib .include post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/smbldap-config.pl post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/smbldap-tools .for i in smbldap.conf smbldap_bind.conf ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${PREFIX}/etc/smbldap-tools/$i.sample .endfor .if ${PORT_OPTIONS:MMIGRATION_SCRIPTS} . for i in smbldap-migrate-pwdump-accounts smbldap-migrate-pwdump-groups \ smbldap-migrate-unix-accounts smbldap-migrate-unix-groups @${SED} -e 's|/usr/bin/perl|${PERL}|g' \ ${WRKSRC}/doc/migration_scripts/$i > ${STAGEDIR}${PREFIX}/sbin/$i . endfor .endif .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_SCRIPT} ${WRKSRC}/smbldap-config.cmd ${STAGEDIR}${DOCSDIR}/smbldap-config ${INSTALL_SCRIPT} ${WRKSRC}/smbldap-upgrade-0.9.6.cmd ${STAGEDIR}${DOCSDIR}/smbldap-upgrade-0.9.6 .for f in CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor ${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.html ${STAGEDIR}${DOCSDIR}/smbldap-tools.html .if ${PORT_OPTIONS:MPDF_DOC} ${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.pdf ${STAGEDIR}${DOCSDIR}/smbldap-tools.pdf .endif .endif .include Index: branches/2014Q4/net/smbldap-tools/files/patch-smbldap-config.pl =================================================================== --- branches/2014Q4/net/smbldap-tools/files/patch-smbldap-config.pl (revision 370622) +++ branches/2014Q4/net/smbldap-tools/files/patch-smbldap-config.pl (revision 370623) @@ -1,44 +1,55 @@ ---- smbldap-config.pl.orig 2011-10-13 11:26:12.939953317 +0200 -+++ smbldap-config.pl 2011-10-13 11:27:09.173960781 +0200 +--- smbldap-config.pl.orig 2012-03-05 09:59:44.000000000 +0100 ++++ smbldap-config.pl 2014-10-05 19:32:18.349166265 +0200 @@ -48,7 +48,7 @@ print "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n"; # we first check if Samba is up and running -my $test_smb=`pidof smbd`; +my $test_smb=`pgrep -x smbd`; chomp($test_smb); die "\nSamba needs to be started first !\n" if ($test_smb eq "" || not defined $test_smb); @@ -290,7 +290,7 @@ my $default_computer_gidnumber=read_entry(". default computer gidNumber","","515",0); -my $userLoginShell=read_entry(". default login shell","","/bin/bash",0); +my $userLoginShell=read_entry(". default login shell","","/bin/sh",0); my $skeletonDir=read_entry(". default skeleton directory","","/etc/skel",0); @@ -441,7 +441,7 @@ # Login defs # Default Login Shell -# Ex: userLoginShell=\"/bin/bash\" +# Ex: userLoginShell=\"/bin/sh\" userLoginShell=\"$userLoginShell\" # Home directory @@ -511,12 +511,12 @@ # Allows not to use smbpasswd (if with_smbpasswd=\"0\" in smbldap.conf) but # prefer Crypt::SmbHash library with_smbpasswd=\"0\" -smbpasswd=\"/usr/bin/smbpasswd\" +smbpasswd=\"%%LOCALBASE%%/bin/smbpasswd\" # Allows not to use slappasswd (if with_slappasswd=\"0\" in smbldap.conf) # but prefer Crypt:: libraries with_slappasswd=\"0\" -slappasswd=\"/usr/sbin/slappasswd\" +slappasswd=\"%%LOCALBASE%%/sbin/slappasswd\" # comment out the following line to get rid of the default banner # no_banner=\"1\" +@@ -557,3 +557,10 @@ + $mode=0600; + chmod $mode,"$smbldap_bind_conf","$smbldap_bind_conf.old"; + ++ ++############################################################ ++ ++=head1 NAME ++ ++=cut ++ Index: branches/2014Q4/net/smbldap-tools/pkg-plist =================================================================== --- branches/2014Q4/net/smbldap-tools/pkg-plist (revision 370622) +++ branches/2014Q4/net/smbldap-tools/pkg-plist (revision 370623) @@ -1,22 +1,21 @@ sbin/smbldap-config sbin/smbldap-groupadd sbin/smbldap-groupdel sbin/smbldap-grouplist sbin/smbldap-groupmod sbin/smbldap-groupshow %%MIGRATION_SCRIPTS%%sbin/smbldap-migrate-pwdump-groups %%MIGRATION_SCRIPTS%%sbin/smbldap-migrate-unix-accounts %%MIGRATION_SCRIPTS%%sbin/smbldap-migrate-unix-groups %%MIGRATION_SCRIPTS%%sbin/smbldap-migrate-pwdump-accounts sbin/smbldap-passwd sbin/smbldap-populate sbin/smbldap-useradd sbin/smbldap-userdel sbin/smbldap-userinfo sbin/smbldap-userlist sbin/smbldap-usermod sbin/smbldap-usershow @sample %%ETCDIR%%/smbldap.conf.sample @sample %%ETCDIR%%/smbldap_bind.conf.sample %%SITE_PERL%%/smbldap_tools.pm -@dirrmtry %%ETCDIR%% Index: branches/2014Q4 =================================================================== --- branches/2014Q4 (revision 370622) +++ branches/2014Q4 (revision 370623) Property changes on: branches/2014Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r370098