aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2012-02-17 21:46:47 +0800
committermm <mm@FreeBSD.org>2012-02-17 21:46:47 +0800
commitb3b89852db15afa40e7eab5aead8d24272a8e760 (patch)
tree7557dc6edbc3a7aa1413554ad1a39a49297ef3eb
parent0ffbbdcfacb851131cdd40dcb13b3b3004a54aca (diff)
downloadfreebsd-ports-gnome-b3b89852db15afa40e7eab5aead8d24272a8e760.tar.gz
freebsd-ports-gnome-b3b89852db15afa40e7eab5aead8d24272a8e760.tar.zst
freebsd-ports-gnome-b3b89852db15afa40e7eab5aead8d24272a8e760.zip
Add patch from vendor SVN.
PR: ports/161967, ports/165177 Submitted by: Andrey Simonenko <simon at comsys.ntu-kpi.kiev.ua>
-rw-r--r--net/smbldap-tools/Makefile1
-rw-r--r--net/smbldap-tools/files/patch-svn-123_12535
2 files changed, 36 insertions, 0 deletions
diff --git a/net/smbldap-tools/Makefile b/net/smbldap-tools/Makefile
index f1b6bbc9dbe4..9efb9c587c14 100644
--- a/net/smbldap-tools/Makefile
+++ b/net/smbldap-tools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= smbldap-tools
PORTVERSION= 0.9.7
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://download.gna.org/smbldap-tools/sources/${PORTVERSION}/
diff --git a/net/smbldap-tools/files/patch-svn-123_125 b/net/smbldap-tools/files/patch-svn-123_125
new file mode 100644
index 000000000000..6c0dea1ebb89
--- /dev/null
+++ b/net/smbldap-tools/files/patch-svn-123_125
@@ -0,0 +1,35 @@
+Index: smbldap-useradd.pl
+===================================================================
+--- smbldap-useradd.pl (revision 123)
++++ smbldap-useradd.pl (revision 125)
+@@ -514,6 +514,9 @@
+ $modify->code && die "failed to add entry: ", $modify->error;
+ }
+
++# Reset adds
++@adds = ();
++
+ # Add Samba user infos
+ if ( defined( $Options{'a'} ) ) {
+ if ( !$config{with_smbpasswd} ) {
+@@ -598,8 +601,6 @@
+ $tmp = defined( $Options{'F'} ) ? $Options{'F'} : $config{userProfile};
+ my $valprofilepath = &subst_user( $tmp, $userName );
+
+- my @adds = ();
+-
+ if ($valhomedrive) {
+ push( @adds, 'sambaHomeDrive' => $valhomedrive );
+ }
+Index: smbldap_tools.pl
+===================================================================
+--- smbldap_tools.pl (revision 123)
++++ smbldap_tools.pl (revision 125)
+@@ -106,6 +106,7 @@
+ list_union
+ list_minus
+ account_by_sid
++ user_by_uid
+ user_next_uid
+ user_next_rid
+ group_next_uid