rpms/smbldap-tools/EL-5 smbldap-tools-0.9.4-config.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 smbldap-tools.spec, 1.4, 1.5 sources, 1.2, 1.3 smbldap-tools-0.9.2-config.patch, 1.2, NONE

Paul Howarth (pghmcfc) fedora-extras-commits at redhat.com
Tue Oct 9 09:34:30 UTC 2007


Author: pghmcfc

Update of /cvs/pkgs/rpms/smbldap-tools/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14071

Modified Files:
	.cvsignore smbldap-tools.spec sources 
Added Files:
	smbldap-tools-0.9.4-config.patch 
Removed Files:
	smbldap-tools-0.9.2-config.patch 
Log Message:
resync with devel

smbldap-tools-0.9.4-config.patch:

--- NEW FILE smbldap-tools-0.9.4-config.patch ---
--- 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}"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Mar 2006 07:15:06 -0000	1.2
+++ .cvsignore	9 Oct 2007 09:33:57 -0000	1.3
@@ -1 +1 @@
-smbldap-tools-0.9.2.tgz
+smbldap-tools-0.9.4.tgz


Index: smbldap-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/EL-5/smbldap-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smbldap-tools.spec	29 Oct 2006 14:34:24 -0000	1.4
+++ smbldap-tools.spec	9 Oct 2007 09:33:57 -0000	1.5
@@ -1,16 +1,17 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
-Version:	0.9.2
-Release:	5%{?dist}
-License:	GPL
+Version:	0.9.4
+Release:	1%{?dist}
+License:	GPLv2+
 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
+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
 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))
 BuildArch:	noarch
+BuildRequires:	openssl
 
 %description
 In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful
@@ -22,21 +23,40 @@
 %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
+	smbldap_tools.pm configure.pl
 %patch0 -p0
-# Don't want this in %{_sbindir}...
+
+# Don't want these in %{_sbindir}...
 %{__mv} smbldap-tools.spec original-smbldap-tools.spec
 
+# Convert docs to UTF-8 where needed
+for f in CONTRIBUTORS README; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 < ${f} > ${f}.utf8
+	%{__mv} -f ${f}.utf8 ${f}
+done
+
+# Generate manpages
+%{__mkdir} manpages
+for i in smbldap-*; do
+	/usr/bin/pod2man --section=8 ${i} > manpages/${i}.8
+done
+
+# Figure out where ssl stuff goes
+%define use_pki %(if [ -f %{_sysconfdir}/pki/tls/certs/ca-bundle.crt ]; then echo 1; else echo 0; fi)
+%if ! %{use_pki}
+%{__perl} -pi -e 's|/etc/pki/tls/certs/|%{_datadir}/ssl/certs/|g;' smbldap.conf
+%endif
+
 %build
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_sbindir}
-%{__install} -d -m0755 %{buildroot}%{perl_vendorlib}
-%{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}
-%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}
+%{__install} -d -m0755 %{buildroot}%{_sbindir}/
+%{__install} -d -m0755 %{buildroot}%{_mandir}/man8/
+%{__install} -d -m0755 %{buildroot}%{perl_vendorlib}/
+%{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}/
+%{__install} -p -m0644 manpages/* %{buildroot}%{_mandir}/man8/
+%{__install} -p -m0644 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
 
@@ -44,9 +64,9 @@
 %{__rm} -rf %{buildroot}
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc ChangeLog CONTRIBUTORS COPYING FILES INFRA INSTALL README TODO
-%doc configure.pl *.conf doc/*
+%doc configure.pl *.conf doc/*.conf doc/migration_scripts/ doc/*.pdf
 %dir %{_sysconfdir}/smbldap-tools/
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap.conf
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap_bind.conf
@@ -58,12 +78,30 @@
 %{_sbindir}/smbldap-populate
 %{_sbindir}/smbldap-useradd
 %{_sbindir}/smbldap-userdel
+%{_sbindir}/smbldap-userlist
 %{_sbindir}/smbldap-usermod
 %{_sbindir}/smbldap-userinfo
 %{_sbindir}/smbldap-usershow
 %{perl_vendorlib}/smbldap_tools.pm
+%{_mandir}/man8/*
 
 %changelog
+* Wed Sep 26 2007 Paul Howarth <paul at city-fan.org> 0.9.4-1
+- update to 0.9.4
+- new upstream, new URLs
+- drop useradd_option-o enhancement patch, new included upstream
+- update config patch
+- new script smbldap-userlist included
+- convert docs to UTF-8
+- HTML docs no longer included with upstream source
+- make and include manpages
+
+* Thu Aug 23 2007 Paul Howarth <paul at city-fan.org> 0.9.2a-1
+- update URLs, as original upstream source is now dead
+- apply useradd_option-o enhancement patch from upstream
+- clarify license as GPL version 2 or later
+- add openssl buildreq for detection of TLS cert/key directory
+
 * Sun Oct 29 2006 Paul Howarth <paul at city-fan.org> 0.9.2-5
 - perl(Unicode::MapUTF8) now available on x86_64, so remove ExcludeArch
   and revert to noarch package (#211866)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smbldap-tools/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Mar 2006 07:15:06 -0000	1.2
+++ sources	9 Oct 2007 09:33:57 -0000	1.3
@@ -1 +1 @@
-bb8eb44adb4e7946de5b486acf480c24  smbldap-tools-0.9.2.tgz
+5c9a71336fcb1af06c5766ab88e50a03  smbldap-tools-0.9.4.tgz


--- smbldap-tools-0.9.2-config.patch DELETED ---




More information about the fedora-extras-commits mailing list