 @@ -1,43 +1,44 @@
-# $NetBSD: Makefile,v 1.3 2010/01/27 20:05:28 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/12/25 08:08:06 taca Exp $
-DISTNAME=	smbldap-tools-0.9.5
+DISTNAME=	smbldap-tools-${VERS}
 CATEGORIES=	sysutils net databases
-MASTER_SITES=	http://download.gna.org/smbldap-tools/packages/
+MASTER_SITES=	http://download.gna.org/smbldap-tools/sources/${VERS}/
 EXTRACT_SUFX=	.tgz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://gna.org/projects/smbldap-tools/
 COMMENT=	Set of ldap administration scripts for samba
 PKG_DESTDIR_SUPPORT=	user-destdir
-DEPENDS+=	samba>=3.0.22:../../net/samba
+VERS=		0.9.6
 #DEPENDS+=	samba>=3.0.22:../../net/samba33
 DEPENDS+=	p5-perl-ldap>=0.33:../../databases/p5-perl-ldap
 DEPENDS+=	p5-Crypt-SmbHash>=0.12:../../security/p5-Crypt-SmbHash
 DEPENDS+=	p5-Digest-SHA1>=2.11:../../security/p5-Digest-SHA1
 DEPENDS+=	p5-Unicode-MapUTF8-[0-9]*:../../converters/p5-Unicode-MapUTF8
 NO_BUILD=	yes
 USE_TOOLS+=	perl:run
-WRKSRC=		${WRKDIR}/smbldap-tools-0.9.5
+WRKSRC=		${WRKDIR}/smbldap-tools-${VERS}
 SMBLDAP_CONF=	smbldap.conf smbldap_bind.conf
 SMBLDAP_DOCS=	doc/smbldap-tools.html doc/smbldap-tools.pdf
 SMBLDAP_EG=	doc/slapd.conf doc/smb.conf
 SMBLDAP_LIBS=	smbldap_tools.pm
 SMBLDAP_PASSWD=	smbldap-passwd
-SMBLDAP_TOOLS=	smbldap-groupadd smbldap-groupdel smbldap-groupmod \
+SMBLDAP_TOOLS=	smbldap-groupadd smbldap-groupdel smbldap-grouplist \
-		smbldap-groupshow  \
+		smbldap-groupmod smbldap-groupshow  \
 		smbldap-useradd smbldap-userdel smbldap-userinfo \
 		smbldap-usermod smbldap-usershow
 SMBLDAP_UTILS=	configure.pl smbldap-populate \
 		doc/migration_scripts/smbldap-migrate-pwdump-accounts \
 		doc/migration_scripts/smbldap-migrate-pwdump-groups \
 		doc/migration_scripts/smbldap-migrate-unix-accounts \
 		doc/migration_scripts/smbldap-migrate-unix-groups
 REPLACE_PERL=	${SMBLDAP_LIBS} ${SMBLDAP_PASSWD} ${SMBLDAP_TOOLS} \
 		${SMBLDAP_UTILS}
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-install

 @@ -1,24 +1,25 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/12/25 08:08:06 taca Exp $
 bin/smbldap-passwd
 ${PERL5_SUB_INSTALLVENDORLIB}/smbldap_tools.pm
 sbin/smbldap-groupadd
 sbin/smbldap-groupdel
 sbin/smbldap-grouplist
 sbin/smbldap-groupmod
 sbin/smbldap-groupshow
 sbin/smbldap-useradd
 sbin/smbldap-userdel
 sbin/smbldap-userinfo
 sbin/smbldap-usermod
 sbin/smbldap-usershow
 sbin/smbldap-tools/configure.pl
 sbin/smbldap-tools/smbldap-populate
 sbin/smbldap-tools/smbldap-migrate-pwdump-accounts
 sbin/smbldap-tools/smbldap-migrate-pwdump-groups
 sbin/smbldap-tools/smbldap-migrate-unix-accounts
 sbin/smbldap-tools/smbldap-migrate-unix-groups
 sbin/smbldap-tools/smbldap-populate
 sbin/smbldap-useradd
 sbin/smbldap-userdel
 sbin/smbldap-userinfo
 sbin/smbldap-usermod
 sbin/smbldap-usershow
 share/doc/smbldap-tools/smbldap-tools.html
 share/doc/smbldap-tools/smbldap-tools.pdf
 share/examples/smbldap-tools/slapd.conf
 share/examples/smbldap-tools/smb.conf
 share/examples/smbldap-tools/smbldap.conf
 share/examples/smbldap-tools/smbldap_bind.conf

 @@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/06/16 16:04:25 taca Exp $
+$NetBSD: distinfo,v 1.2 2010/12/25 08:08:06 taca Exp $
-SHA1 (smbldap-tools-0.9.5.tgz) = 05534385b6f7d031d0721d64f339bf8d166a68f5
+SHA1 (smbldap-tools-0.9.6.tar.gz) = c5220c63c57c191f9342076784dad1ef595129ba
-RMD160 (smbldap-tools-0.9.5.tgz) = 055d7dc059d19ad153412c449d1448858c1fe42c
+RMD160 (smbldap-tools-0.9.6.tar.gz) = f9a497a29736673226a9c872c50893c31a0db513
-Size (smbldap-tools-0.9.5.tgz) = 303131 bytes
+Size (smbldap-tools-0.9.6.tar.gz) = 304912 bytes
-SHA1 (patch-aa) = f49e131afbead61baafef55bc5d8a5dd700bbf7d
+SHA1 (patch-aa) = f4cb3a5666c780c476c3a53e5b9b2ecdebe42153
 SHA1 (patch-ab) = f785d67107435cc94ed202de84249aa4f95dd7fd
 SHA1 (patch-ac) = db681d57c9eb1b6195e77bd7d58431f3bb773421
 SHA1 (patch-ad) = ec00520ae444ed7842e6139bf592b855e0de491f
 SHA1 (patch-ae) = b9909ba4c29aa894c133d21fdd73183b51fbc0de
 SHA1 (patch-af) = 3eedae8c4fa29736231ffa0a6885a3f416f58d04
 SHA1 (patch-ag) = f8b0f27ab3938f82b22df01c126f75d196157099
-SHA1 (patch-ah) = cd2e2b15061e0f1c0c2d0cf9aedf9d90a106342a
+SHA1 (patch-ah) = 625ad9441987a6fdd844b9595ef62f4297922f75
 SHA1 (patch-ai) = ed9f750eeb5985846df3fa6652cc8796f1d7736b

 @@ -1,92 +1,95 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/06/16 16:04:25 taca Exp $
+$NetBSD: patch-aa,v 1.2 2010/12/25 08:08:06 taca Exp $
---- configure.pl.orig	2008-04-22 17:13:29.000000000 +0900
+- Fix paths for pkgsrc.
 - Check samba is running.
 --- configure.pl.orig	2010-11-15 14:45:49.000000000 +0000
 +++ configure.pl
-@@ -31,6 +31,7 @@
+@@ -30,6 +30,7 @@
  use strict;
  use File::Basename;
 +use FileHandle;
  # we need to be root to configure the scripts
  if ($< != 0) {
-@@ -49,16 +50,19 @@ Before starting, check
+@@ -48,16 +49,19 @@ Before starting, check
  print "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\n";
  # we first check if Samba is up and running
 -my $test_smb=`pidof smbd`;
 -chomp($test_smb);
 +my $test_smb;
 +$test_smb = read_pidfile('@SAMBA_PIDDIR@/smbd.pid');
 +if (not defined $test_smb) {
 +    $test_smb =`pidof smbd`;
 +    chomp($test_smb);
 +}
++
  die "\nSamba need to be started first !\n" if ($test_smb eq "" || not defined $test_smb);
  print "Looking for configuration files...\n\n";
  my $smb_conf="";
 -if (-e "/etc/samba/smb.conf") {
 -  $smb_conf="/etc/samba/smb.conf";
 -} elsif (-e "/usr/local/samba/lib/smb.conf") {
 -  $smb_conf="/usr/local/samba/lib/smb.conf";
 +if (-e "@PREFIX@/etc/samba/smb.conf") {
 +  $smb_conf="@PREFIX@/etc/samba/smb.conf";
+ }
  print "Samba Configuration File Path [$smb_conf] > ";
  chomp(my $config_smb=<STDIN>);
-@@ -66,14 +70,7 @@ if ($config_smb ne "") {
+@@ -65,14 +69,7 @@ if ($config_smb ne "") {
    $smb_conf=$config_smb;
+ }
 -my $conf_dir;
 -if (-d "/etc/opt/IDEALX/smbldap-tools") {
 -	$conf_dir="/etc/opt/IDEALX/smbldap-tools/";
 -} elsif (-d "/etc/smbldap-tools") {
 -	$conf_dir="/etc/smbldap-tools/";
 -} else {
 -	$conf_dir="/etc/opt/IDEALX/smbldap-tools/";
 -}
 +my $conf_dir = '@PKG_SYSCONFDIR@';
  print "\nThe default directory in which the smbldap configuration files are stored is shown.\n";
  print "If you need to change this, enter the full directory path, then press enter to continue.\n";
-@@ -304,7 +301,7 @@ my $default_user_gidnumber=read_entry(".
+@@ -303,7 +300,7 @@ my $default_user_gidnumber=read_entry(".
  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/csh",0);
  my $skeletonDir=read_entry(". default skeleton directory","","/etc/skel",0);
-@@ -528,12 +525,12 @@ mailDomain=\"$mailDomain\"
+@@ -527,12 +524,12 @@ mailDomain=\"$mailDomain\"
- # Allows not to use smbpasswd (if with_smbpasswd == 0 in smbldap_conf.pm) but
+ # 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=\"@PREFIX@/bin/smbpasswd\"
- # Allows not to use slappasswd (if with_slappasswd == 0 in smbldap_conf.pm)
+ # Allows not to use slappasswd (if with_slappasswd="0" in smbldap.conf)
  # but prefer Crypt:: libraries
  with_slappasswd=\"0\"
 -slappasswd=\"/usr/sbin/slappasswd\"
 +slappasswd=\"@PREFIX@/sbin/slappasswd\"
  # comment out the following line to get rid of the default banner
  # no_banner=\"1\"
-@@ -574,5 +571,15 @@ print "  $smbldap_bind_conf done.\n";
+@@ -573,5 +570,15 @@ print "  $smbldap_bind_conf done.\n";
  $mode=0600;
  chmod $mode,"$smbldap_bind_conf","$smbldap_bind_conf.old";
+-
+-
 +sub read_pidfile {
 +    my($file) = @_;
 +    my($fh, $line);
++
 +    $fh = new FileHandle $file;
 +    if (defined $fh) {
 +	$line = $fh->getline;
 +	chomp($line);

 @@ -1,96 +1,98 @@
-$NetBSD: patch-ah,v 1.1.1.1 2008/06/16 16:04:25 taca Exp $
+$NetBSD: patch-ah,v 1.2 2010/12/25 08:08:06 taca Exp $
---- smbldap.conf.orig	2008-04-22 17:13:29.000000000 +0900
+- Fix paths for pkgsrc.
 --- smbldap.conf.orig	2010-11-15 14:45:49.000000000 +0000
 +++ smbldap.conf
-@@ -58,7 +58,7 @@ sambaDomain="DOMSMB"
+@@ -57,7 +57,7 @@ sambaDomain="DOMSMB"
  # Slave LDAP server
  # Ex: slaveLDAP=127.0.0.1
  # If not defined, parameter is set to "127.0.0.1"
 -slaveLDAP="ldap.iallanis.info"
 +slaveLDAP="ldap.example.info"
  # Slave LDAP port
  # If not defined, parameter is set to "389"
-@@ -67,7 +67,7 @@ slavePort="389"
+@@ -66,7 +66,7 @@ slavePort="389"
  # Master LDAP server: needed for write operations
  # Ex: masterLDAP=127.0.0.1
  # If not defined, parameter is set to "127.0.0.1"
 -masterLDAP="ldap.iallanis.info"
 +masterLDAP="ldap.example.info"
  # Master LDAP port
  # If not defined, parameter is set to "389"
-@@ -92,19 +92,19 @@ verify="require"
+@@ -91,19 +91,19 @@ verify="require"
  # CA certificate
  # see "man Net::LDAP" in start_tls section for more details
 -cafile="/etc/smbldap-tools/ca.pem"
 +cafile="@PKG_SYSCONFDIR@/ca.pem"
  # certificate to use to connect to the ldap server
  # see "man Net::LDAP" in start_tls section for more details
 -clientcert="/etc/smbldap-tools/smbldap-tools.iallanis.info.pem"
 +clientcert="@PKG_SYSCONFDIR@/smbldap-tools.example.info.pem"
  # key certificate to use to connect to the ldap server
  # see "man Net::LDAP" in start_tls section for more details
 -clientkey="/etc/smbldap-tools/smbldap-tools.iallanis.info.key"
 +clientkey="@PKG_SYSCONFDIR@/smbldap-tools.example.info.key"
  # LDAP Suffix
  # Ex: suffix=dc=IDEALX,dc=ORG
 -suffix="dc=iallanis,dc=info"
 +suffix="dc=example,dc=info"
  # Where are stored Users
  # Ex: usersdn="ou=Users,dc=IDEALX,dc=ORG"
-@@ -121,6 +121,14 @@ computersdn="ou=Computers,${suffix}"
+@@ -120,6 +120,14 @@ computersdn="ou=Computers,${suffix}"
  # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn
  groupsdn="ou=Groups,${suffix}"
 +# Groups objectclasses, as a space-separated list
 +# Ex: groupsclasses="top posixGroup"
 +groupsclasses="posixGroup groupOfNames"
++
 +# Groups default member (rfc2307bis prohibit empty groups)
 +# Ex: groupsdefaultmember="cn=default,${suffix}"
 +groupsdefaultmember="cn=default,ou=roles,${suffix}"
++
  # Where are stored Idmap entries (used if samba is a domain member server)
  # Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
  # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn
-@@ -151,8 +159,8 @@ crypt_salt_format="%s"
+@@ -150,8 +158,8 @@ crypt_salt_format="%s"
  # Login defs
  # Default Login Shell
 -# Ex: userLoginShell="/bin/bash"
 -userLoginShell="/bin/bash"
 +# Ex: userLoginShell="/bin/csh"
 +userLoginShell="/bin/csh"
  # Home directory
  # Ex: userHome="/home/%U"
-@@ -210,7 +218,7 @@ userScript="logon.bat"
+@@ -209,7 +217,7 @@ userScript="logon.bat"
  # Domain appended to the users "mail"-attribute
  # when smbldap-useradd -M is used
  # Ex: mailDomain="idealx.com"
 -mailDomain="iallanis.info"
 +mailDomain="example.info"
  ##############################################################################
+ #
-@@ -221,12 +229,12 @@ mailDomain="iallanis.info"
+@@ -220,12 +228,12 @@ mailDomain="iallanis.info"
- # Allows not to use smbpasswd (if with_smbpasswd == 0 in smbldap_conf.pm) but
+ # 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="@PREFIX@/bin/smbpasswd"
- # Allows not to use slappasswd (if with_slappasswd == 0 in smbldap_conf.pm)
+ # Allows not to use slappasswd (if with_slappasswd="0" in smbldap.conf)
  # but prefer Crypt:: libraries
  with_slappasswd="0"
 -slappasswd="/usr/sbin/slappasswd"
 +slappasswd="@PREFIX@/sbin/slappasswd"
  # comment out the following line to get rid of the default banner
  # no_banner="1"