From a97f8d8ef3a0930f8af9f20d65e214a401f8cdf3 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: May 23 2008 13:04:24 +0000 Subject: - update to 0.9.5 - update config patch - assume the user's locale uses UTF-8 rather than ISO-8859-1 (#441833) - set ownership of home directory created by smbldap-useradd -m using UID number rather than username so that delays in LDAP replication don't affect the operation (#447758) --- diff --git a/.cvsignore b/.cvsignore index e40a6d7..44db9f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -smbldap-tools-0.9.4.tgz +smbldap-tools-0.9.5.tgz diff --git a/smbldap-tools-0.9.4-config.patch b/smbldap-tools-0.9.4-config.patch deleted file mode 100644 index c3f9c1d..0000000 --- a/smbldap-tools-0.9.4-config.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- smbldap.conf 2007-09-26 11:49:23.000000000 +0100 -+++ smbldap.conf 2007-09-26 12:11:44.000000000 +0100 -@@ -34,12 +34,12 @@ - - # Put your own SID. To obtain this number do: "net getlocalsid". - # If not defined, parameter is taking from "net getlocalsid" return --SID="S-1-5-21-2252255531-4061614174-2474224977" -+#SID="S-1-5-21-2252255531-4061614174-2474224977" - - # Domain name the Samba server is in charged. - # If not defined, parameter is taking from smb.conf configuration file - # Ex: sambaDomain="IDEALX-NT" --sambaDomain="DOMSMB" -+#sambaDomain="DOMSMB" - - ############################################################################## - # -@@ -85,15 +85,15 @@ - - # CA certificate - # see "man Net::LDAP" in start_tls section for more details --cafile="/etc/smbldap-tools/ca.pem" -+cafile="/etc/pki/tls/certs/ldapserverca.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.pem" -+clientcert="/etc/pki/tls/certs/ldapclient.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.key" -+clientkey="/etc/pki/tls/certs/ldapclientkey.pem" - - # LDAP Suffix - # Ex: suffix=dc=IDEALX,dc=ORG -@@ -102,7 +102,7 @@ - # 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 --usersdn="ou=Users,${suffix}" -+usersdn="ou=People,${suffix}" - - # Where are stored Computers - # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG" -@@ -112,10 +112,10 @@ - # 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 --groupsdn="ou=Groups,${suffix}" -+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}" - diff --git a/smbldap-tools-0.9.5-chown.patch b/smbldap-tools-0.9.5-chown.patch new file mode 100644 index 0000000..a4db977 --- /dev/null +++ b/smbldap-tools-0.9.5-chown.patch @@ -0,0 +1,11 @@ +--- smbldap-tools-0.9.5/smbldap-useradd 2008-04-22 09:13:29.000000000 +0100 ++++ smbldap-tools-0.9.5/smbldap-useradd 2008-05-23 11:26:00.000000000 +0100 +@@ -467,7 +467,7 @@ + system "mkdir $userHomeDirectory 2>/dev/null"; + } + system +-"chown -R $userName:$userGidNumber $userHomeDirectory 2>/dev/null"; ++"chown -R $userUidNumber:$userGidNumber $userHomeDirectory 2>/dev/null"; + if ( defined $config{userHomeDirectoryMode} ) { + system + "chmod $config{userHomeDirectoryMode} $userHomeDirectory 2>/dev/null"; diff --git a/smbldap-tools-0.9.5-config.patch b/smbldap-tools-0.9.5-config.patch new file mode 100644 index 0000000..2583756 --- /dev/null +++ b/smbldap-tools-0.9.5-config.patch @@ -0,0 +1,66 @@ +--- smbldap-tools-0.9.5/smbldap.conf 2008-04-22 09:13:29.000000000 +0100 ++++ smbldap-tools-0.9.5/smbldap.conf 2008-04-23 17:00:18.000000000 +0100 +@@ -34,12 +34,12 @@ + + # Put your own SID. To obtain this number do: "net getlocalsid". + # If not defined, parameter is taking from "net getlocalsid" return +-SID="S-1-5-21-2252255531-4061614174-2474224977" ++#SID="S-1-5-21-2252255531-4061614174-2474224977" + + # Domain name the Samba server is in charged. + # If not defined, parameter is taking from smb.conf configuration file + # Ex: sambaDomain="IDEALX-NT" +-sambaDomain="DOMSMB" ++#sambaDomain="DOMSMB" + + ############################################################################## + # +@@ -71,7 +71,6 @@ + + # Master LDAP port + # If not defined, parameter is set to "389" +-#masterPort="389" + masterPort="389" + + # Use TLS for LDAP +@@ -92,15 +91,15 @@ + + # CA certificate + # see "man Net::LDAP" in start_tls section for more details +-cafile="/etc/smbldap-tools/ca.pem" ++cafile="/etc/pki/tls/certs/ldapserverca.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="/etc/pki/tls/certs/ldapclient.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="/etc/pki/tls/certs/ldapclientkey.pem" + + # LDAP Suffix + # Ex: suffix=dc=IDEALX,dc=ORG +@@ -109,7 +108,7 @@ + # 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 +-usersdn="ou=Users,${suffix}" ++usersdn="ou=People,${suffix}" + + # Where are stored Computers + # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG" +@@ -119,10 +118,10 @@ + # 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 +-groupsdn="ou=Groups,${suffix}" ++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}" + diff --git a/smbldap-tools-0.9.5-utf-8.patch b/smbldap-tools-0.9.5-utf-8.patch new file mode 100644 index 0000000..4813580 --- /dev/null +++ b/smbldap-tools-0.9.5-utf-8.patch @@ -0,0 +1,38 @@ +--- smbldap-tools-0.9.5/smbldap_tools.pm 2008-05-22 12:18:05.000000000 +0100 ++++ smbldap-tools-0.9.5/smbldap_tools.pm 2008-05-22 15:50:58.000000000 +0100 +@@ -826,7 +826,7 @@ + foreach my $attr ( $entry->attributes ) { + my @vals = $entry->get_value($attr); + foreach my $val (@vals) { +- $val = "**UNPRINTABLE**" if ( $val =~ /[^[:print:]]/ ); ++ $val = "**UNPRINTABLE**" if ( $val =~ /\P{IsPrint}/ ); + } + $lines .= $attr . ": " . join( ',', @vals ) . "\n"; + } +@@ -854,7 +854,7 @@ + foreach my $attr ( $entry->attributes ) { + my @vals = $entry->get_value($attr); + foreach my $val (@vals) { +- $val = "**UNPRINTABLE**" if ( $val =~ /[^[:print:]]/ ); ++ $val = "**UNPRINTABLE**" if ( $val =~ /\P{IsPrint}/ ); + } + if ( $attr eq "sambaPwdLastSet" + or $attr eq "sambaPwdCanChange" +@@ -1213,7 +1213,7 @@ + + return to_utf8( + -string => $arg, +- -charset => 'ISO-8859-1', ++ -charset => 'UTF8', + ); + } + +@@ -1222,7 +1222,7 @@ + + return from_utf8( + -string => $arg, +- -charset => 'ISO-8859-1', ++ -charset => 'UTF8', + ); + } + diff --git a/smbldap-tools.spec b/smbldap-tools.spec index be482da..2153570 100644 --- a/smbldap-tools.spec +++ b/smbldap-tools.spec @@ -1,12 +1,14 @@ Summary: User and group administration tools for Samba/OpenLDAP Name: smbldap-tools -Version: 0.9.4 +Version: 0.9.5 Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base URL: https://gna.org/projects/smbldap-tools/ Source0: http://download.gna.org/smbldap-tools/packages/smbldap-tools-%{version}.tgz -Patch0: smbldap-tools-0.9.4-config.patch +Patch0: smbldap-tools-0.9.5-config.patch +Patch1: smbldap-tools-0.9.5-utf-8.patch +Patch2: smbldap-tools-0.9.5-chown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openldap-clients, samba, perl(IO::Socket::SSL) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -24,7 +26,9 @@ groups and passwords. %{__perl} -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g; s|/opt/IDEALX||g;' \ smbldap_tools.pm configure.pl -%patch0 -p0 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 # Don't want these in %{_sbindir}... %{__mv} smbldap-tools.spec original-smbldap-tools.spec @@ -86,8 +90,18 @@ done %{_mandir}/man8/* %changelog -* Thu Mar 06 2008 Tom "spot" Callaway - 0.9.4-2 -Rebuild for new perl +* Thu May 22 2008 Paul Howarth 0.9.5-2 +- assume the user's locale uses UTF-8 rather than ISO-8859-1 (#441833) +- set ownership of home directory created by smbldap-useradd -m using UID + number rather than username so that delays in LDAP replication don't + affect the operation (#447758) + +* Wed Apr 23 2008 Paul Howarth 0.9.5-1 +- update to 0.9.5 +- update config patch + +* Thu Mar 6 2008 Tom "spot" Callaway 0.9.4-2 +- rebuild for new perl * Wed Sep 26 2007 Paul Howarth 0.9.4-1 - update to 0.9.4 diff --git a/sources b/sources index b341fd9..4e9487e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c9a71336fcb1af06c5766ab88e50a03 smbldap-tools-0.9.4.tgz +2a9a84c657af35b9c9734a5b1bc5fe8f smbldap-tools-0.9.5.tgz