packages: smbldap-tools/smbldap-tools-configure.patch, smbldap-tools/smblda...
baggins
baggins at pld-linux.org
Tue Nov 22 11:35:22 CET 2011
Author: baggins Date: Tue Nov 22 10:35:22 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated patches
- removed obsolete patches
- updated build system
---- Files affected:
packages/smbldap-tools:
smbldap-tools-configure.patch (1.1 -> 1.2) , smbldap-tools-krb5.patch (1.4 -> 1.5) , smbldap-tools-no-client-cert.patch (1.1 -> 1.2) , smbldap-tools.spec (1.30 -> 1.31) , smbldap-tools-Makefile.patch (1.1 -> NONE) (REMOVED), smbldap-tools-nscd.patch (1.3 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/smbldap-tools/smbldap-tools-configure.patch
diff -u packages/smbldap-tools/smbldap-tools-configure.patch:1.1 packages/smbldap-tools/smbldap-tools-configure.patch:1.2
--- packages/smbldap-tools/smbldap-tools-configure.patch:1.1 Wed Mar 1 15:50:54 2006
+++ packages/smbldap-tools/smbldap-tools-configure.patch Tue Nov 22 11:35:17 2011
@@ -1,6 +1,5 @@
-diff -u smbldap-tools-0.9.1/configure.pl smbldap-tools-0.9.1.new/configure.pl
---- smbldap-tools-0.9.1/configure.pl 2006-03-01 15:54:49.000000000 +0200
-+++ smbldap-tools-0.9.1.new/configure.pl 2006-03-01 16:49:31.000000000 +0200
+--- smbldap-tools-0.9.7/smbldap-config.pl 2006-03-01 15:54:49.000000000 +0200
++++ smbldap-tools-0.9.7.new/smbldap-config.pl 2006-03-01 16:49:31.000000000 +0200
@@ -211,7 +211,7 @@
my $logonpath=read_entry(" logon path (press the \".\" character if you don't want roaming profile)","logonpath","\\\\$netbios_name\\profiles\\\%U",0);
#$logonpath=~s/\\/\\\\/g;
@@ -25,30 +24,3 @@
$ldap_machine_suffix=~s/ou=//;
my $ldap_idmap_suffix=read_entry(". Idmap suffix","ldapidmapsuffix","ou=Idmap",0);
print ". sambaUnixIdPooldn: object where you want to store the next uidNumber\n";
-@@ -243,7 +243,7 @@
- }
- $server=~s/\///;
- my $ldapmasterserver;
--print ". ldap master server: IP adress or DNS name of the master (writable) ldap server\n";
-+print ". ldap master server: IP address or DNS name of the master (writable) ldap server\n";
- $ldapmasterserver=read_entry(" ldap master server","",$server,0);
- my $ldapmasterport;
- if (defined $config{ldapport}) {
-@@ -258,7 +258,7 @@
- system "stty echo";
-
- # parameters for the slave ldap server
--print ". ldap slave server: IP adress or DNS name of the slave ldap server: can also be the master one\n";
-+print ". ldap slave server: IP address or DNS name of the slave ldap server: can also be the master one\n";
- my $ldap_slave_server=read_entry(" ldap slave server","","$server",0);
- my $ldap_slave_port;
- if (defined $config{ldapport}) {
-@@ -308,7 +308,7 @@
-
- my $skeletonDir=read_entry(". default skeleton directory","","/etc/skel",0);
-
--my $mailDomain=read_entry(". default domain name to append to mail adress", "","",0);
-+my $mailDomain=read_entry(". default domain name to append to mail address", "","",0);
-
- print "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n";
- my $template_smbldap="
================================================================
Index: packages/smbldap-tools/smbldap-tools-krb5.patch
diff -u packages/smbldap-tools/smbldap-tools-krb5.patch:1.4 packages/smbldap-tools/smbldap-tools-krb5.patch:1.5
--- packages/smbldap-tools/smbldap-tools-krb5.patch:1.4 Thu Nov 5 13:52:18 2009
+++ packages/smbldap-tools/smbldap-tools-krb5.patch Tue Nov 22 11:35:17 2011
@@ -16,12 +16,12 @@
# SMBLDAP-TOOLS Configuration (default are ok for a RedHat)
#
##############################################################################
-diff -ur smbldap-tools-0.9.6/smbldap-useradd smbldap-tools-0.9.6-krb5/smbldap-useradd
---- smbldap-tools-0.9.6/smbldap-useradd 2009-06-22 16:19:38.853899020 +0200
-+++ smbldap-tools-0.9.6-krb5/smbldap-useradd 2009-06-22 16:37:34.637118213 +0200
-@@ -384,6 +384,12 @@
- # add posix account first
- my $add;
+diff -ur smbldap-tools-0.9.6/smbldap-useradd.pl smbldap-tools-0.9.6-krb5/smbldap-useradd.pl
+--- smbldap-tools-0.9.6/smbldap-useradd.pl 2009-06-22 16:19:38.853899020 +0200
++++ smbldap-tools-0.9.6-krb5/smbldap-useradd.pl 2009-06-22 16:37:34.637118213 +0200
+@@ -405,6 +405,13 @@
+ exit 0;
+ }
+my $userPass;
+if ( $config{hash_encrypt} eq "K5KEY" ) {
@@ -29,27 +29,19 @@
+} else {
+ $userPass = "{crypt}x";
+}
- # if AIX account, inetOrgPerson obectclass can't be used
- if ( defined( $Options{'b'} ) ) {
- $add = $ldap_master->add(
-@@ -402,7 +408,7 @@
- 'homeDirectory' => "$userHomeDirectory",
- 'loginShell' => "$config{userLoginShell}",
- 'gecos' => "$config{userGecos}",
-- 'userPassword' => "{crypt}x"
-+ 'userPassword' => "$userPass"
- ]
- );
- }
-@@ -424,7 +430,7 @@
- 'homeDirectory' => "$userHomeDirectory",
- 'loginShell' => "$config{userLoginShell}",
- 'gecos' => "$config{userGecos}",
-- 'userPassword' => "{crypt}x"
-+ 'userPassword' => "$userPass"
- ]
- );
- }
++
+ # USER ACCOUNT
+ # add posix account first
+ my @objectclass = qw(top person organizationalPerson posixAccount);
+@@ -418,7 +425,7 @@
+ 'homeDirectory' => $userHomeDirectory,
+ 'loginShell' => $config{userLoginShell},
+ 'gecos' => $config{userGecos},
+- 'userPassword' => "{crypt}x"
++ 'userPassword' => "$userPass"
+ );
+
+ push(@objectclass, 'shadowAccount') if ($config{shadowAccount});
@@ -547,21 +547,47 @@
$valacctflags = "$tmp";
}
@@ -113,8 +105,8 @@
$modify->code && die "failed to add entry: ", $modify->error;
---- smbldap-tools-0.9.6/smbldap-passwd.orig 2009-06-25 22:40:05.764901892 +0200
-+++ smbldap-tools-0.9.6/smbldap-passwd 2009-06-25 22:49:03.906899121 +0200
+--- smbldap-tools-0.9.6/smbldap-passwd.pl.orig 2009-06-25 22:40:05.764901892 +0200
++++ smbldap-tools-0.9.6/smbldap-passwd.pl 2009-06-25 22:49:03.906899121 +0200
@@ -77,6 +77,10 @@
}
}
================================================================
Index: packages/smbldap-tools/smbldap-tools-no-client-cert.patch
diff -u packages/smbldap-tools/smbldap-tools-no-client-cert.patch:1.1 packages/smbldap-tools/smbldap-tools-no-client-cert.patch:1.2
--- packages/smbldap-tools/smbldap-tools-no-client-cert.patch:1.1 Thu Jun 25 11:50:13 2009
+++ packages/smbldap-tools/smbldap-tools-no-client-cert.patch Tue Nov 22 11:35:17 2011
@@ -1,6 +1,6 @@
-diff -ur smbldap-tools-0.9.6/smbldap_tools.pm y/smbldap_tools.pm
---- smbldap-tools-0.9.6/smbldap_tools.pm 2009-06-24 13:47:32.302630165 +0200
-+++ y/smbldap_tools.pm 2009-06-25 11:46:51.000000000 +0200
+diff -ur smbldap-tools-0.9.6/smbldap_tools.pl y/smbldap_tools.pl
+--- smbldap-tools-0.9.6/smbldap_tools.pl 2009-06-24 13:47:32.302630165 +0200
++++ y/smbldap_tools.pl 2009-06-25 11:46:51.000000000 +0200
@@ -331,12 +331,19 @@
"erreur LDAP: Can't contact master ldap server for writing ($@)";
}
@@ -27,3 +27,55 @@
if ( $mesg->code ) {
die( "Could not start_tls: " . $mesg->error );
}
+@@ -411,12 +411,19 @@
+ $config{slavePw} = $config{masterPw};
+ }
+ elsif ( $config{ldapTLS} == 1 ) {
+- $mesg = $ldap_slave->start_tls(
+- verify => "$config{verify}",
+- clientcert => "$config{clientcert}",
+- clientkey => "$config{clientkey}",
+- cafile => "$config{cafile}"
+- );
++ if ( defined($config{clientcert}) && defined($config{clientkey}) ) {
++ $mesg = $ldap_slave->start_tls(
++ verify => "$config{verify}",
++ clientcert => "$config{clientcert}",
++ clientkey => "$config{clientkey}",
++ cafile => "$config{cafile}"
++ );
++ } else {
++ $mesg = $ldap_slave->start_tls(
++ verify => "$config{verify}",
++ cafile => "$config{cafile}"
++ );
++ }
+ if ( $mesg->code ) {
+ die( "Could not start_tls: " . $mesg->error );
+ }
+@@ -578,12 +585,19 @@
+ }
+ if ($userLdap) {
+ if ( $config{ldapTLS} == 1 ) {
+- $userLdap->start_tls(
+- verify => "$config{verify}",
+- clientcert => "$config{clientcert}",
+- clientkey => "$config{clientkey}",
+- cafile => "$config{cafile}"
+- );
++ if ( defined($config{clientcert}) && defined($config{clientkey}) ) {
++ $mesg = $userLdap->start_tls(
++ verify => "$config{verify}",
++ clientcert => "$config{clientcert}",
++ clientkey => "$config{clientkey}",
++ cafile => "$config{cafile}"
++ );
++ } else {
++ $mesg = $userLdap->start_tls(
++ verify => "$config{verify}",
++ cafile => "$config{cafile}"
++ );
++ }
+ }
+ my $mesg = $userLdap->bind( dn => $dn, password => $pass );
+ if ( $mesg->code eq 0 ) {
================================================================
Index: packages/smbldap-tools/smbldap-tools.spec
diff -u packages/smbldap-tools/smbldap-tools.spec:1.30 packages/smbldap-tools/smbldap-tools.spec:1.31
--- packages/smbldap-tools/smbldap-tools.spec:1.30 Mon Nov 14 21:12:03 2011
+++ packages/smbldap-tools/smbldap-tools.spec Tue Nov 22 11:35:17 2011
@@ -15,11 +15,9 @@
Source0: http://download.gna.org/smbldap-tools/sources/0.9.7/%{name}-%{version}.tar.gz
# Source0-md5: d9f169a77b527672778e4307091bec36
URL: https://gna.org/projects/smbldap-tools/
-Patch0: %{name}-Makefile.patch
-Patch1: %{name}-configure.patch
-Patch2: %{name}-nscd.patch
-Patch3: %{name}-krb5.patch
-Patch4: %{name}-no-client-cert.patch
+Patch0: %{name}-configure.patch
+Patch1: %{name}-krb5.patch
+Patch2: %{name}-no-client-cert.patch
BuildRequires: rpm-perlprov >= 4.1-13
%if %{with autodeps}
BuildRequires: perl-Crypt-SmbHash
@@ -49,22 +47,20 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+%build
+%configure
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/smbldap-tools
+
%{__make} install \
- prefix=%{_prefix} \
- sbindir=%{_sbindir} \
- sysconfdir=%{_sysconfdir} \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{perl_vendorlib}
-mv -f $RPM_BUILD_ROOT%{_sbindir}/%{_name}.pm $RPM_BUILD_ROOT%{perl_vendorlib}
-install configure.pl $RPM_BUILD_ROOT%{_sbindir}/smbldap-configure
-
-rm -f $RPM_BUILD_ROOT%{_sbindir}/*.{orig,spec}
+install -p smbldap.conf smbldap_bind.conf $RPM_BUILD_ROOT%{_sysconfdir}/smbldap-tools
+install -p smbldap-config.cmd $RPM_BUILD_ROOT%{_sbindir}/smbldap-config
%clean
rm -rf $RPM_BUILD_ROOT
@@ -72,7 +68,7 @@
%files
%defattr(644,root,root,755)
%doc CONTRIBUTORS ChangeLog FILES INFRA README INSTALL TODO
-%doc doc/smb.conf smbldap.conf smbldap_bind.conf doc/smbldap* doc/migration_scripts/smbldap-migrate-*
+%doc doc/*.example doc/smbldap-tools.* doc/migration_scripts
%dir %{_sysconfdir}/smbldap-tools
%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap.conf
%attr(600,root,root) %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap_bind.conf
@@ -85,6 +81,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.31 2011/11/22 10:35:17 baggins
+- updated patches
+- removed obsolete patches
+- updated build system
+
Revision 1.30 2011/11/14 20:12:03 baggins
- fetch 0.9.7
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smbldap-tools/smbldap-tools-configure.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smbldap-tools/smbldap-tools-krb5.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smbldap-tools/smbldap-tools-no-client-cert.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smbldap-tools/smbldap-tools.spec?r1=1.30&r2=1.31&f=u
More information about the pld-cvs-commit
mailing list