- Update to 0.9.5

5 files changed, 15 insertions, 38 deletions

diff --git a/net/smbldap-tools/Makefile b/net/smbldap-tools/Makefile
index 550289325fb0..f291b02c8f8d 100644
--- a/net/smbldap-tools/Makefile
+++ b/net/smbldap-tools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	smbldap-tools
-PORTVERSION=	0.9.4
-PORTREVISION=	3
+PORTVERSION=	0.9.5
 CATEGORIES=	net
 MASTER_SITES=	http://download.gna.org/smbldap-tools/packages/ \
 		http://download.gna.org/smbldap-tools/packages/old-Idealx-release/
diff --git a/net/smbldap-tools/distinfo b/net/smbldap-tools/distinfo
index 76ca17d5bc41..2c5a918e1b87 100644
--- a/net/smbldap-tools/distinfo
+++ b/net/smbldap-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (smbldap-tools-0.9.4.tgz) = 5c9a71336fcb1af06c5766ab88e50a03
-SHA256 (smbldap-tools-0.9.4.tgz) = 44f17ae905fcf81819571161d6ebfcc0beb99e1714b47b843db5cbe0c1e2bac6
-SIZE (smbldap-tools-0.9.4.tgz) = 279433
+MD5 (smbldap-tools-0.9.5.tgz) = 2a9a84c657af35b9c9734a5b1bc5fe8f
+SHA256 (smbldap-tools-0.9.5.tgz) = 9c69c8245af90e1c2e3d53283ad2188b1b27e88bf86516c3b8f37ae7ac1e0e33
+SIZE (smbldap-tools-0.9.5.tgz) = 303131
diff --git a/net/smbldap-tools/files/patch-smbldap-passwd b/net/smbldap-tools/files/patch-smbldap-passwd
deleted file mode 100644
index 3d78e5875ec6..000000000000
--- a/net/smbldap-tools/files/patch-smbldap-passwd
+++ /dev/null
@@ -1,11 +0,0 @@
---- smbldap-passwd.orig	2007-09-20 12:14:16.000000000 +0200
-+++ smbldap-passwd	2007-09-20 12:15:59.000000000 +0200
-@@ -266,7 +266,7 @@
- if ( $update_unix_passwd ) {
-     my $shadowLastChange=int(time()/86400);
-     my $modify;
--    if ($< != 0) {
-+    if (($< != 0) || (!defined $config{defaultMaxPasswordAge})) {
- 	$modify = $ldap_master->modify ( "$dn",
- 					    changes => [
- 							replace => [userPassword => "$hash_password"],
diff --git a/net/smbldap-tools/files/patch-smbldap-useradd b/net/smbldap-tools/files/patch-smbldap-useradd
index c300541a87b2..4b875340cfdd 100644
--- a/net/smbldap-tools/files/patch-smbldap-useradd
+++ b/net/smbldap-tools/files/patch-smbldap-useradd
@@ -1,11 +1,11 @@
---- smbldap-useradd.orig	2007-09-17 18:05:48.000000000 +0700
-+++ smbldap-useradd	2008-02-07 17:48:23.000000000 +0600
-@@ -373,7 +373,7 @@
-     unless ( $userName =~ /\$$/ ) {
- 	if ( !(-e $userHomeDirectory) ) {
- 	    system "mkdir $userHomeDirectory 2>/dev/null";
--	    system "cp -a $config{skeletonDir}/.[a-z,A-Z]* $config{skeletonDir}/* $userHomeDirectory 2>/dev/null";
-+	    system "cp -pRP $config{skeletonDir}/.[a-z,A-Z]* $config{skeletonDir}/* $userHomeDirectory 2>/dev/null";
- 	    system "chown -R $userName:$userGidNumber $userHomeDirectory 2>/dev/null";
- 	    if (defined $config{userHomeDirectoryMode}) {
- 		system "chmod $config{userHomeDirectoryMode} $userHomeDirectory 2>/dev/null"; 
+--- smbldap-useradd.orig	2008-04-22 10:13:29.000000000 +0200
++++ smbldap-useradd	2008-05-06 11:58:30.000000000 +0200
+@@ -461,7 +461,7 @@
+         if ( !( -d $userHomeDirectory ) ) {
+             if ( $config{skeletonDir} ne "" ) {
+                 system
+-                  "cp -r $config{skeletonDir} $userHomeDirectory 2>/dev/null";
++                  "cp -pRP $config{skeletonDir} $userHomeDirectory 2>/dev/null";
+             }
+             else {
+                 system "mkdir $userHomeDirectory 2>/dev/null";
diff --git a/net/smbldap-tools/files/patch-smbldap-usermod b/net/smbldap-tools/files/patch-smbldap-usermod
deleted file mode 100644
index 20d41077ed44..000000000000
--- a/net/smbldap-tools/files/patch-smbldap-usermod
+++ /dev/null
@@ -1,11 +0,0 @@
---- smbldap-usermod.orig	2007-10-06 09:50:45.000000000 +0200
-+++ smbldap-usermod	2007-10-06 09:51:09.000000000 +0200
-@@ -466,7 +466,7 @@
- 
- if (defined($tmp = $Options{'e'})) {
-     if ($samba == 1) {
--	my $kickoffTime=`date --date='$tmp' +%s`;
-+	my $kickoffTime=`date -j -f "%F %T" '$tmp' +%s`;
- 	chomp($kickoffTime);
- 	push(@mods, 'sambakickoffTime' => $kickoffTime);
-     } else {