From 6b65005b6e67e5991a8ed6307c7a8b0c81d9370f Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mar 24 2006 07:15:06 +0000 Subject: auto-import smbldap-tools-0.9.2-2 on branch devel from smbldap-tools-0.9.2-2.src.rpm --- diff --git a/.cvsignore b/.cvsignore index e69de29..bdd25d4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +smbldap-tools-0.9.2.tgz diff --git a/smbldap-tools-0.9.2-config.patch b/smbldap-tools-0.9.2-config.patch new file mode 100644 index 0000000..bc52ffd --- /dev/null +++ b/smbldap-tools-0.9.2-config.patch @@ -0,0 +1,54 @@ +--- smbldap.conf 2006-01-27 10:52:27.000000000 +0000 ++++ smbldap.conf 2006-01-27 11:34:20.000000000 +0000 +@@ -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-4205727931-4131263253-1851132061" ++#SID="S-1-5-21-4205727931-4131263253-1851132061" + + # Domain name the Samba server is in charged. + # If not defined, parameter is taking from smb.conf configuration file + # Ex: sambaDomain="IDEALX-NT" +-sambaDomain="IDEALX-NT" ++#sambaDomain="IDEALX-NT" + + ############################################################################## + # +@@ -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,7 +112,7 @@ + # 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" diff --git a/smbldap-tools.spec b/smbldap-tools.spec new file mode 100644 index 0000000..3f5731b --- /dev/null +++ b/smbldap-tools.spec @@ -0,0 +1,109 @@ +Summary: User and group administration tools for Samba/OpenLDAP +Name: smbldap-tools +Version: 0.9.2 +Release: 2%{?dist} +License: GPL +Group: System Environment/Base +URL: http://samba.idealx.org/index.en.html +Source: http://samba.idealx.org/dist/smbldap-tools-%{version}.tgz +Patch0: smbldap-tools-0.9.2-config.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: openldap-clients, samba +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildArch: noarch + +%description +In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful +to add, modify and delete users and groups, and to change Unix and Samba +passwords. In those contexts they replace the system tools to manage users, +groups and passwords. + +%prep +%setup -q +%{__perl} -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g; + s|/opt/IDEALX||g;' \ + Makefile smb.conf smbldap.conf \ + smbldap-populate smbldap_tools.pm configure.pl \ + doc/html/*.html +%patch0 -p0 +# Don't want this in %{_sbindir}... +%{__mv} smbldap-tools.spec original-smbldap-tools.spec + +%build + +%install +%{__rm} -rf %{buildroot} +%{__install} -d -m0755 %{buildroot}%{_sbindir} +%{__install} -d -m0755 %{buildroot}%{perl_vendorlib} +%{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir} +%{__install} -p -m0755 smbldap_tools.pm %{buildroot}%{perl_vendorlib} +%{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf +%{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-, root, root, 0755) +%doc ChangeLog CONTRIBUTORS COPYING FILES INFRA INSTALL README TODO +%doc configure.pl *.conf doc/* +%dir %{_sysconfdir}/smbldap-tools/ +%config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap.conf +%config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap_bind.conf +%{_sbindir}/smbldap-groupadd +%{_sbindir}/smbldap-groupdel +%{_sbindir}/smbldap-groupmod +%{_sbindir}/smbldap-groupshow +%{_sbindir}/smbldap-passwd +%{_sbindir}/smbldap-populate +%{_sbindir}/smbldap-useradd +%{_sbindir}/smbldap-userdel +%{_sbindir}/smbldap-usermod +%{_sbindir}/smbldap-userinfo +%{_sbindir}/smbldap-usershow +%{perl_vendorlib}/smbldap_tools.pm + +%changelog +* Fri Jan 27 2006 Paul Howarth 0.9.2-2 +- Incorporate smbldap.conf review suggestions from Steven Pritchard (#178905) + Undefine SID so it is fetched with "net getlocalsid" + Undefine sambaDomain so it is fetched from smb.conf + TLS keys and certs should go in /etc/pki/tls/certs + usersdn should be "ou=People,${suffix}" to match OpenLDAP migration tools + groupsdn should be "ou=Group,${suffix}" to match OpenLDAP migration tools + +* Wed Jan 25 2006 Paul Howarth 0.9.2-1 +- Update to 0.9.2 + +* Tue Jan 17 2006 Paul Howarth 0.9.1-2 +- Unpack tarball quietly +- Clean up file list +- Put smbldap_tools.pm in %{perl_vendorlib} rather than %{_sbindir} +- Add %%{?dist} tag + +* Sat Jun 04 2005 Dag Wieers - 0.9.1-1 - 3108+/dag +- Updated to release 0.9.1. + +* Tue Apr 05 2005 Dag Wieers - 0.8.8-1 +- Updated to release 0.8.8. + +* Wed Feb 16 2005 Dag Wieers - 0.8.7-2 +- Fixed locations, removed /opt/IDEALX. (Alain Rykaert) + +* Tue Feb 15 2005 Dag Wieers - 0.8.7-1 +- Updated to release 0.8.7. + +* Sat Jan 22 2005 Dag Wieers - 0.8.6-1 +- Updated to release 0.8.6. + +* Sun Jun 20 2004 Dag Wieers - 0.8.5-1 +- Updated to release 0.8.5. + +* Sat Mar 13 2004 Dag Wieers - 0.8.4-1 +- Updated to release 0.8.4. + +* Fri Dec 05 2003 Dag Wieers - 0.8.2-0 +- Updated to release 0.8.2. + +* Thu Oct 09 2003 Dag Wieers - 0.8.1-0 +- Initial package. (using DAR) diff --git a/sources b/sources index e69de29..14db1a0 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +bb8eb44adb4e7946de5b486acf480c24 smbldap-tools-0.9.2.tgz