[smbldap-tools] Update to 0.9.9
Paul Howarth
pghmcfc at fedoraproject.org
Wed Aug 8 08:38:25 UTC 2012
commit 38c3c43418ca81bb395eda161ea2c281e328e08c
Author: Paul Howarth <paul at city-fan.org>
Date: Wed Aug 8 09:37:26 2012 +0100
Update to 0.9.9
- New upstream release 0.9.9
- smbldap-userlist, smbldap-grouplist: specify Net::LDAP search attributes
as an array ref, not a string
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681350)
- smbldap-useradd: fix smbldap-passwd name
- smbldap_tools.pm: $config{masterLDAP} and $config{slaveLDAP} can take a
LDAP URI
- smbldap_tools.pm: non-root user cannot run smbldap-passwd,
smbldap-userinfo, smbldap-userlist and smbldap-grouplist with SSL-enabled
LDAP server (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647860)
- Update config patch to reflect use of URIs for LDAP servers
- Drop upstreamed samba net location patch
smbldap-tools-0.9.8-samba-net-path.patch | 13 ----------
...onfig.patch => smbldap-tools-0.9.9-config.patch | 25 ++++---------------
smbldap-tools.spec | 24 ++++++++++++++----
sources | 2 +-
4 files changed, 25 insertions(+), 39 deletions(-)
---
diff --git a/smbldap-tools-0.9.6-config.patch b/smbldap-tools-0.9.9-config.patch
similarity index 70%
rename from smbldap-tools-0.9.6-config.patch
rename to smbldap-tools-0.9.9-config.patch
index 54ae547..595c3df 100644
--- a/smbldap-tools-0.9.6-config.patch
+++ b/smbldap-tools-0.9.9-config.patch
@@ -1,6 +1,5 @@
-diff -up smbldap-tools-0.9.6/smbldap.conf.orig smbldap-tools-0.9.6/smbldap.conf
---- smbldap-tools-0.9.6/smbldap.conf.orig 2011-03-07 13:11:01.360239462 +0000
-+++ smbldap-tools-0.9.6/smbldap.conf 2011-03-07 13:12:49.050071016 +0000
+--- smbldap.conf
++++ smbldap.conf
@@ -33,12 +33,12 @@
# Put your own SID. To obtain this number do: "net getlocalsid".
@@ -16,15 +15,7 @@ diff -up smbldap-tools-0.9.6/smbldap.conf.orig smbldap-tools-0.9.6/smbldap.conf
##############################################################################
#
-@@ -70,7 +70,6 @@ masterLDAP="ldap.example.com"
-
- # Master LDAP port
- # If not defined, parameter is set to "389"
--#masterPort="389"
- masterPort="389"
-
- # Use TLS for LDAP
-@@ -91,15 +90,15 @@ verify="require"
+@@ -76,15 +76,15 @@ verify="require"
# CA certificate
# see "man Net::LDAP" in start_tls section for more details
@@ -43,7 +34,7 @@ diff -up smbldap-tools-0.9.6/smbldap.conf.orig smbldap-tools-0.9.6/smbldap.conf
# LDAP Suffix
# Ex: suffix=dc=IDEALX,dc=ORG
-@@ -108,7 +107,7 @@ suffix="dc=example,dc=com"
+@@ -93,7 +93,7 @@ suffix="dc=example,dc=com"
# Where are stored Users
# Ex: usersdn="ou=Users,dc=IDEALX,dc=ORG"
# Warning: if 'suffix' is not set here, you must set the full dn for usersdn
@@ -52,7 +43,7 @@ diff -up smbldap-tools-0.9.6/smbldap.conf.orig smbldap-tools-0.9.6/smbldap.conf
# Where are stored Computers
# Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG"
-@@ -118,10 +117,10 @@ computersdn="ou=Computers,${suffix}"
+@@ -103,7 +103,7 @@ computersdn="ou=Computers,${suffix}"
# Where are stored Groups
# Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG"
# Warning: if 'suffix' is not set here, you must set the full dn for groupsdn
@@ -60,8 +51,4 @@ diff -up smbldap-tools-0.9.6/smbldap.conf.orig smbldap-tools-0.9.6/smbldap.conf
+groupsdn="ou=Group,${suffix}"
# Where are stored Idmap entries (used if samba is a domain member server)
--# Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG"
-+# Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG"
- # Warning: if 'suffix' is not set here, you must set the full dn for idmapdn
- idmapdn="ou=Idmap,${suffix}"
-
+ # Ex: idmapdn="ou=Idmap,dc=IDEALX,dc=ORG"
diff --git a/smbldap-tools.spec b/smbldap-tools.spec
index 418b727..8c9a6a4 100644
--- a/smbldap-tools.spec
+++ b/smbldap-tools.spec
@@ -1,13 +1,12 @@
Summary: User and group administration tools for Samba/OpenLDAP
Name: smbldap-tools
-Version: 0.9.8
-Release: 3%{?dist}
+Version: 0.9.9
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://gna.org/projects/smbldap-tools/
Source0: http://download.gna.org/smbldap-tools/sources/%{version}/smbldap-tools-%{version}.tar.gz
-Patch10: smbldap-tools-0.9.6-config.patch
-Patch11: smbldap-tools-0.9.8-samba-net-path.patch
+Patch10: smbldap-tools-0.9.9-config.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildRequires: openssl
@@ -25,8 +24,7 @@ groups and passwords.
%setup -q
# Fedora integration
-%patch10 -p1
-%patch11
+%patch10
# Figure out where ssl stuff goes
%define use_pki %(if [ -f /etc/pki/tls/certs/ca-bundle.crt ]; then echo 1; else echo 0; fi)
@@ -98,6 +96,20 @@ rm -rf %{buildroot}
%{_mandir}/man8/smbldap-usershow.8*
%changelog
+* Wed Aug 8 2012 Paul Howarth <paul at city-fan.org> - 0.9.9-1
+- Update to 0.9.9
+ - smbldap-userlist, smbldap-grouplist: specify Net::LDAP search attributes
+ as an array ref, not a string
+ (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681350)
+ - smbldap-useradd: fix smbldap-passwd name
+ - smbldap_tools.pm: $config{masterLDAP} and $config{slaveLDAP} can take a
+ LDAP URI
+ - smbldap_tools.pm: non-root user cannot run smbldap-passwd,
+ smbldap-userinfo, smbldap-userlist and smbldap-grouplist with SSL-enabled
+ LDAP server (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647860)
+- Update config patch to reflect use of URIs for LDAP servers
+- Drop upstreamed samba net location patch
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 1eb9348..4b8b854 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b110aeeaa8afafa40d61ceed4d4f6a7 smbldap-tools-0.9.8.tar.gz
+5084011003239a60ebe209c5fb570397 smbldap-tools-0.9.9.tar.gz
More information about the scm-commits
mailing list