diff --git a/samba-3.3.0-ldbrename.patch b/samba-3.3.0-ldbrename.patch new file mode 100644 index 0000000..4345f10 --- /dev/null +++ b/samba-3.3.0-ldbrename.patch @@ -0,0 +1,37 @@ +diff --git a/source/Makefile.in b/source/Makefile.in +index a77ec48..f7b4431 100644 +--- a/source/Makefile.in ++++ b/source/Makefile.in +@@ -194,7 +194,7 @@ BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \ + bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \ + bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@ + BIN_PROGS4 = bin/ldbedit@EXEEXT@ bin/ldbsearch@EXEEXT@ bin/ldbadd@EXEEXT@ \ +- bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@ ++ bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@ bin/ldbrename@EXEEXT@ + + TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \ + bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \ +@@ -1080,6 +1080,7 @@ LDBSEARCH_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbsearch.o + LDBADD_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbadd.o + LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbdel.o + LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o ++LDBRENAME_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbrename.o + + WINBIND_KRB5_LOCATOR_OBJ1 = nsswitch/winbind_krb5_locator.o + WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(LIBREPLACE_OBJ) +@@ -1579,6 +1580,12 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIB + $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \ + $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) + ++bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ ++ @echo Linking $@ ++ @$(CC) $(FLAGS) -o $@ $(LDBRENAME_OBJ) $(DYNEXP) $(LDFLAGS) \ ++ $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \ ++ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) ++ + + ##################################################################### + # +-- +1.5.6.6 + diff --git a/samba.spec b/samba.spec index aa4645e..b2d9576 100644 --- a/samba.spec +++ b/samba.spec @@ -1,4 +1,4 @@ -%define main_release 25 +%define main_release 26 %define samba_version 3.3.0 %define tdb_version 1.1.2 %define talloc_version 1.2.0 @@ -42,6 +42,7 @@ Patch102: samba-3.2.0pre1-pipedir.patch Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch # The passwd part has been applied, but not the group part Patch107: samba-3.2.0pre1-grouppwd.patch +Patch199: samba-3.3.0-ldbrename.patch Patch200: samba-3.2.5-inotify.patch Patch201: 0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch @@ -246,6 +247,7 @@ cp %{SOURCE11} packaging/Fedora/ #%patch103 -p1 -b .logfiles #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply %patch107 -p1 -b .grouppwd +%patch199 -p1 -b .ldbrename %patch200 -p0 -b .inotify %patch201 -p1 -b .ldap_ssl @@ -444,6 +446,20 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8* # why are these getting installed in the wrong place? rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs +#Rename ldb tools, as samba3 has an old copy of ldb. +mv -f $RPM_BUILD_ROOT%{_bindir}/ldbadd $RPM_BUILD_ROOT%{_bindir}/ldb3add +mv -f $RPM_BUILD_ROOT%{_bindir}/ldbdel $RPM_BUILD_ROOT%{_bindir}/ldb3del +mv -f $RPM_BUILD_ROOT%{_bindir}/ldbmodify $RPM_BUILD_ROOT%{_bindir}/ldb3modify +mv -f $RPM_BUILD_ROOT%{_bindir}/ldbsearch $RPM_BUILD_ROOT%{_bindir}/ldb3search +mv -f $RPM_BUILD_ROOT%{_bindir}/ldbrename $RPM_BUILD_ROOT%{_bindir}/ldb3rename +mv -f $RPM_BUILD_ROOT%{_bindir}/ldbedit $RPM_BUILD_ROOT%{_bindir}/ldb3edit +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbadd.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3add.1 +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbdel.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3del.1 +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbedit.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3edit.1 +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbmodify.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3modify.1 +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbsearch.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3search.1 +#mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbrename.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3rename.1 + %clean rm -rf $RPM_BUILD_ROOT @@ -716,11 +732,12 @@ exit 0 %{_bindir}/profiles %{_bindir}/smbcquotas %{_bindir}/smbcontrol -%{_bindir}/ldbadd -%{_bindir}/ldbdel -%{_bindir}/ldbedit -%{_bindir}/ldbmodify -%{_bindir}/ldbsearch +%{_bindir}/ldb3add +%{_bindir}/ldb3del +%{_bindir}/ldb3edit +%{_bindir}/ldb3modify +%{_bindir}/ldb3search +%{_bindir}/ldb3rename %dir /var/lib/samba %attr(700,root,root) %dir /var/lib/samba/private %dir /var/lib/samba/scripts @@ -730,11 +747,12 @@ exit 0 %dir %{_sysconfdir}/samba %attr(0700,root,root) %dir /var/log/samba %attr(0700,root,root) %dir /var/log/samba/old -%{_mandir}/man1/ldbadd.1.* -%{_mandir}/man1/ldbdel.1.* -%{_mandir}/man1/ldbedit.1.* -%{_mandir}/man1/ldbmodify.1.* -%{_mandir}/man1/ldbsearch.1.* +%{_mandir}/man1/ldb3add.1.gz +%{_mandir}/man1/ldb3del.1.gz +%{_mandir}/man1/ldb3edit.1.gz +%{_mandir}/man1/ldb3modify.1.gz +%{_mandir}/man1/ldb3search.1.gz +#%{_mandir}/man1/ldb3rename.1.gz %{_mandir}/man1/profiles.1* %{_mandir}/man1/smbcquotas.1* %{_mandir}/man1/smbcontrol.1* @@ -828,6 +846,9 @@ exit 0 %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Thu Feb 21 2009 Simo Sorce - 3.3.0-0.26 +- Rename ldb* tools to ldb3* to avoid conflicts with newer ldb releases + * Tue Feb 3 2009 Guenther Deschner - 3.3.0-0.25 - Update to 3.3.0 final - Add upstream fix for ldap connections to AD (Bug #6073)