[meego-commits] 5912: Changes to Trunk:Testing/samba
Kangkai Yin
kangkai.yin at intel.com
Thu Jul 22 03:05:56 UTC 2010
Hi,
I have made the following changes to samba in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Kangkai Yin
[This message was auto-generated]
---
Request #5912:
submit: home:kai:branches:Trunk:Testing/samba(r2)(cleanup) -> Trunk:Testing/samba
Message:
Update to 3.5.4
State: new 2010-07-21T14:59:31 kai
Comment: None
changes files:
--------------
--- samba.changes
+++ samba.changes
@@ -0,0 +1,3 @@
+* Thu Jul 22 2010 Yin Kangkai <kangkai.yin at intel.com> - 3.5.4-1
+- Update to 3.5.4
+
old:
----
samba-3.4.4.tar.gz
samba-3.4.5-CVE-2009-3297-mount_cifs.patch
samba-3.4.6-CVE-2010-0926-Exploiting-the-Samba-Symlink-Traversal-1-2.patch
samba-3.4.6-CVE-2010-0926-Exploiting-the-Samba-Symlink-Traversal-2-2.patch
new:
----
samba-3.5.4.tar.gz
spec files:
-----------
--- samba.spec
+++ samba.spec
@@ -1,6 +1,6 @@
-%define samba_version 3.4.4
-%define tdb_version 1.1.3
-%define talloc_version 1.3.0
+%define samba_version 3.5.4
+%define tdb_version 1.2.1
+%define talloc_version 2.0.1
%define pre_release %nil
%define samba_release 1
@@ -42,11 +42,7 @@
# The passwd part has been applied, but not the group part
Patch107: samba-3.2.0pre1-grouppwd.patch
Patch200: samba-3.2.5-inotify.patch
-# CVE-2009-3297, Race condition by mount (mount.cifs) / umount operations
-Patch201: samba-3.4.5-CVE-2009-3297-mount_cifs.patch
-# CVE-2010-0926, Exploiting the Samba Symlink Traversal
-Patch202: samba-3.4.6-CVE-2010-0926-Exploiting-the-Samba-Symlink-Traversal-1-2.patch
-Patch203: samba-3.4.6-CVE-2010-0926-Exploiting-the-Samba-Symlink-Traversal-2-2.patch
+
Requires(pre): samba-common = %{samba_version}-%{release}
Requires: pam >= 0.64
@@ -54,8 +50,9 @@
BuildRoot: %{_tmppath}/%{name}-%{samba_version}-%{release}-root
Requires(post): /sbin/chkconfig, /sbin/service
Requires(preun): /sbin/chkconfig, /sbin/service
-BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel
+BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel, ctdb-devel
BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel, libuuid-devel
+BuildRequires: libtalloc-devel, libtdb-devel
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE999}
@@ -179,59 +176,6 @@
The libsmbclient-devel package contains the header files and libraries needed to
develop programs that link against the SMB client library in the Samba suite.
-%package -n libtdb
-Summary: The TDB library and tools
-Group: Applications/System
-Version: %{tdb_version}
-Release: 1
-
-%description -n libtdb
-The TDB library from the Samba suite.
-
-
-%package -n tdb-tools
-Summary: The TDB tools
-Group: Applications/System
-Version: %{tdb_version}
-Release: 1
-Requires: libtdb = %{tdb_version}-%{release}
-
-%description -n tdb-tools
-Some TDB tools from the Samba suite.
-
-
-%package -n libtdb-devel
-Summary: Developer tools for the TDB library
-Group: Development
-Version: %{tdb_version}
-Release: 1
-Requires: libtdb = %{tdb_version}-%{release}
-
-%description -n libtdb-devel
-The libtdb-devel package contains the header files and libraries needed to
-develop programs that link against the TDB library in the Samba suite.
-
-
-%package -n libtalloc
-Summary: The talloc library
-Group: Applications/System
-Version: %{talloc_version}
-Release: 1
-
-%description -n libtalloc
-The talloc library from the Samba suite.
-
-
-%package -n libtalloc-devel
-Summary: Developer tools for the talloc library
-Group: Development
-Version: %{talloc_version}
-Release: 1
-Requires: libtalloc = %{talloc_version}-%{release}
-
-%description -n libtalloc-devel
-The libtalloc-devel package contains the header files and libraries needed to
-develop programs that link against the talloc library in the Samba suite.
%prep
# TAG: change for non-pre
@@ -257,9 +201,6 @@
#%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
%patch107 -p1 -b .grouppwd
%patch200 -p0 -b .inotify
-%patch201 -p1 -b samba-3.4.5-CVE-2009-3297-mount_cifs.patch
-%patch202 -p1 -b samba-3.4.6-CVE-2010-0926-Exploiting-the-Samba-Symlink-Traversal-1-2.patch
-%patch203 -p1 -b samba-3.4.6-CVE-2010-0926-Exploiting-the-Samba-Symlink-Traversal-2-2.patch
mv %samba_source/VERSION %samba_source/VERSION.orig
sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -313,11 +254,12 @@
--with-swatdir=%{_datadir}/swat \
--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
--with-cifsupcall \
- --with-libtalloc=yes \
- --with-libtdb=yes \
--with-cluster-support=no \
+ --with-libtalloc=no \
+ --enable-external-libtalloc=yes \
+ --with-libtdb=no \
--with-ctdb=no \
-# --enable-external-libtalloc=yes \
+ --with-cifsumount
# --enable-external-libtdb=yes \
# --with-aio-support \
@@ -403,32 +345,15 @@
mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
build_libdir="$RPM_BUILD_ROOT%{_libdir}"
-# talloc
-cd lib/talloc
-# just to get the correct .pc file generated
-./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../..
-
-# tdb
-cd lib/tdb
-# just to get the correct .pc file generated
-./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../..
-
# make install puts libraries in the wrong place
# (but at least gets the versioning right now)
-list="smbclient smbsharemodes netapi talloc tdb wbclient"
+list="smbclient smbsharemodes netapi wbclient"
#build_libdir="$RPM_BUILD_ROOT%{_libdir}"
for i in $list; do
- #cp -P $build_libdir/samba/lib$i.so* $build_libdir/
install -m 644 %samba_source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
- #rm -f $build_libdir/samba/lib$i.so* $build_libdir/samba/lib$i.a || true
done
-install -m 644 lib/talloc/talloc.pc $build_libdir/pkgconfig/
-install -m 644 lib/tdb/tdb.pc $build_libdir/pkgconfig/
-
/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/
# }
@@ -438,8 +363,8 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
-install -m755 $RPM_BUILD_ROOT/usr/sbin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 $RPM_BUILD_ROOT/usr/sbin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+mv -f $RPM_BUILD_ROOT/usr/sbin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+mv -f $RPM_BUILD_ROOT/usr/sbin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m 755 %samba_source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
@@ -457,9 +382,11 @@
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmount.8*
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8*
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
+#rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{u,}mount.cifs.8*
+#rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{u,}cifs.upcall.8*
-# why are these getting installed in the wrong place?
-rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
+#rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
+#rm -f $RPM_BUILD_ROOT%{_sbindir}/cifs.upcall
#Rename ldb tools, as samba3 has an old copy of ldb.
mv -f $RPM_BUILD_ROOT%{_bindir}/ldbadd $RPM_BUILD_ROOT%{_bindir}/ldb3add
@@ -475,15 +402,16 @@
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
+rm -f $RPM_BUILD_ROOT%{_bindir}/tdbbackup
+rm -f $RPM_BUILD_ROOT%{_bindir}/tdbdump
+rm -f $RPM_BUILD_ROOT%{_bindir}/tdbtool
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbbackup.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbdump.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbtool.8*
%clean
rm -rf $RPM_BUILD_ROOT
-%post winbind-clients -p /sbin/ldconfig
-
-%postun winbind-clients -p /sbin/ldconfig
-
-
%post
/sbin/chkconfig --add smb
/sbin/chkconfig --add nmb
@@ -527,23 +455,16 @@
%postun common
/sbin/ldconfig
-
-%post -n libsmbclient
+%post winbind-clients
/sbin/ldconfig
-%postun -n libsmbclient
+%postun winbind-clients
/sbin/ldconfig
-%post -n libtdb
-/sbin/ldconfig
-
-%postun -n libtdb
-/sbin/ldconfig
-
-%post -n libtalloc
+%post -n libsmbclient
/sbin/ldconfig
-%postun -n libtalloc
+%postun -n libsmbclient
/sbin/ldconfig
%files
@@ -570,6 +491,9 @@
%dir %{_sysconfdir}/openldap/schema
%{_sysconfdir}/openldap/schema/samba.schema
+#%doc examples/autofs examples/LDAP examples/libsmbclient examples/misc examples/printer-accounting
+#%doc examples/printing
+
%files swat
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/xinetd.d/swat
@@ -659,6 +583,7 @@
%{_mandir}/man8/smbpasswd.8*
%{_mandir}/man8/pdbedit.8*
%{_mandir}/man8/net.8*
+%{_datadir}/locale/*/LC_MESSAGES/net.mo
%doc README COPYING Manifest
%doc WHATSNEW.txt Roadmap
@@ -677,6 +602,7 @@
%{_mandir}/man1/ntlm_auth.1*
%{_mandir}/man1/wbinfo.1*
%{_mandir}/man8/pam_winbind.8*
+%{_mandir}/man5/pam_winbind.conf.5.gz
%{_mandir}/man7/winbind_krb5_locator.7*
%{_mandir}/man8/winbindd.8*
%{_mandir}/man8/idmap_*.8*
@@ -694,6 +620,7 @@
%files winbind-devel
%defattr(-,root,root,-)
%{_includedir}/wbclient.h
+%{_includedir}/wbc_async.h
%{_libdir}/libwbclient.so
%{_libdir}/pkgconfig/wbclient.pc
@@ -718,30 +645,6 @@
%{_libdir}/pkgconfig/smbsharemodes.pc
%{_mandir}/man7/libsmbclient.7*
-%files -n libtalloc
-%attr(755,root,root) %{_libdir}/libtalloc.so.*
-
-%files -n libtalloc-devel
-%{_includedir}/talloc.h
-%{_libdir}/libtalloc.so
-%{_libdir}/pkgconfig/talloc.pc
-
-%files -n libtdb
-%attr(755,root,root) %{_libdir}/libtdb.so.*
-
-%files -n libtdb-devel
-%{_includedir}/tdb.h
-%{_libdir}/libtdb.so
-%{_libdir}/pkgconfig/tdb.pc
-
-%files -n tdb-tools
-%{_bindir}/tdbbackup
-%{_bindir}/tdbdump
-%{_bindir}/tdbtool
-%{_mandir}/man8/tdbbackup.8*
-%{_mandir}/man8/tdbdump.8*
-%{_mandir}/man8/tdbtool.8*
-
%files domainjoin-gui
%{_sbindir}/netdomjoin-gui
%dir %{_datadir}/pixmaps/samba
other changes:
--------------
++++++ MD5SUM
--- MD5SUM
+++ MD5SUM
@@ -1 +1 @@
-491a1bc9c94ad2f1e6d1c29da271b242 samba-3.4.4.tar.gz
+22c8c977eaa18be50f3878c6d0e0c2f0 samba-3.5.4.tar.gz
++++++ samba-3.4.4.tar.gz -> samba-3.5.4.tar.gz
1507176 lines of diff (skipped)
++++++ deleted files:
--- samba-3.4.5-CVE-2009-3297-mount_cifs.patch
--- samba-3.4.6-CVE-2010-0926-Exploiting-the-Samba-Symlink-Traversal-1-2.patch
--- samba-3.4.6-CVE-2010-0926-Exploiting-the-Samba-Symlink-Traversal-2-2.patch
More information about the MeeGo-commits
mailing list