diff --git a/build-source-timestamp b/build-source-timestamp index 3083822..0767a84 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2165 +2180 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 65a151e..ecb2e2f 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86063b464738fc23e1e3ad431fb08551347c3f53355babb34f12bab56df778ce -size 59924 +oid sha256:ba75375df1525293bfef2b26b8905ec130df29512155b74dda6494df2aed0200 +size 61127 diff --git a/samba-doc.changes b/samba-doc.changes index 29f06ef..3b925cb 100644 --- a/samba-doc.changes +++ b/samba-doc.changes @@ -11,7 +11,7 @@ Tue Mar 10 15:07:29 CET 2009 - lmuelle@suse.de ------------------------------------------------------------------- Thu Jan 24 11:50:09 CET 2008 - lmuelle@suse.de -- Remove NoSource tags from samba-doc spec file; [#351370]. +- Remove NoSource tags from samba-doc spec file; [bnc#351370]. ------------------------------------------------------------------- Fri Jun 16 12:52:10 CEST 2006 - schwab@suse.de diff --git a/samba-doc.spec b/samba-doc.spec index 55ff133..b4c759e 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -55,7 +55,7 @@ BuildRequires: ctdb-devel %endif Url: http://www.samba.org/ Version: 3.4.0 -Release: 1 +Release: 2 License: GPL v3 or later Summary: Samba Documentation Group: Documentation/Other @@ -85,6 +85,11 @@ BuildRequires: ccache %else %define make_cifsupcall 0 %endif +%if 0%{?suse_version} && 0%{?suse_version} < 1111 +%define link_static_libs 1 +%else +%define link_static_libs 0 +%endif # Define some global directories ################################ %define DOCDIR %{_defaultdocdir}/samba @@ -175,6 +180,9 @@ sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_t # use the default optimization unset OPTIMIZATION %endif +%if 0%{suse_version} > 1110 + export SUSE_ASNEEDED=0 +%endif export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" %if %{use_ccache} export CC="ccache gcc" @@ -197,7 +205,11 @@ CONFIGURE_OPTIONS="\ --with-rootsbindir=/sbin \ --enable-cups \ --enable-debug \ +%if %{link_static_libs} --enable-static \ +%else + --disable-static \ +%endif --with-acl-support \ --with-automount \ --with-dnsupdate \ @@ -349,19 +361,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 5d6c5a8..e46c9d8 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Jul 27 13:45:04 CEST 2009 - boyang@suse.de + +- lookupname failed, cannot find domain when attempt to change password; + (bnc#520645); (bso#6560). + +------------------------------------------------------------------- +Thu Jul 16 16:09:48 CEST 2009 - lmuelle@suse.de + +- Don't link with --as-needed flag on post-11.1 systems. + +------------------------------------------------------------------- +Tue Jul 14 23:50:08 CEST 2009 - lmuelle@suse.de + +- Stop the smbfs service if an interface goes down; (bnc#517768). + +------------------------------------------------------------------- +Wed Jul 8 19:45:21 CEST 2009 - lmuelle@suse.de + +- Disable build of static libraries on post-11.1 systems; (bnc#509945). + +------------------------------------------------------------------- +Wed Jul 8 15:35:20 CEST 2009 - jmcdonough@suse.de + +- Fix missing zlibs for cifs.upcall and test_shlibs. + ------------------------------------------------------------------- Fri Jul 3 17:21:17 CEST 2009 - lmuelle@suse.de @@ -22,6 +48,11 @@ Thu Jul 2 13:04:53 CEST 2009 - lmuelle@suse.de - Package /etc/samba/smbpasswd as %ghost on post-11.1 systems. +------------------------------------------------------------------- +Tue Jun 30 13:26:32 CEST 2009 - jmcdonough@suse.de + +- Fix net ads leave; (bnc#511695). + ------------------------------------------------------------------- Thu Jun 25 12:25:33 CEST 2009 - sbrabec@suse.cz diff --git a/samba.spec b/samba.spec index e68cda4..be3c914 100644 --- a/samba.spec +++ b/samba.spec @@ -60,7 +60,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.4.0 -Release: 1 +Release: 2 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -93,6 +93,11 @@ BuildRequires: ccache %else %define make_cifsupcall 0 %endif +%if 0%{?suse_version} && 0%{?suse_version} < 1111 +%define link_static_libs 1 +%else +%define link_static_libs 0 +%endif # Define some global directories ################################ %define DOCDIR %{_defaultdocdir}/samba @@ -144,19 +149,10 @@ Authors: The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %package client @@ -196,19 +192,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -233,19 +220,10 @@ Authors: The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %endif @@ -270,19 +248,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %endif @@ -309,19 +278,10 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %if %{make_utils} @@ -343,19 +303,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %endif @@ -385,19 +336,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -407,10 +349,10 @@ License: GPL v3 or later %else %package -n libsmbclient0 +License: GPL v3 or later Provides: libsmbclient = %{version}-%{release} Obsoletes: libsmbclient %endif -License: GPL v3 or later %ifarch ppc64 Obsoletes: libsmbclient-64bit %endif @@ -421,37 +363,19 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %endif @@ -489,19 +413,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %package -n libnetapi0 @@ -520,19 +435,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %package -n libnetapi-devel @@ -552,19 +458,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -574,8 +471,8 @@ License: GPL v3 or later %else %package -n libsmbsharemodes0 -%endif License: GPL v3 or later +%endif Summary: Samba smbsharemodes Library Group: System/Libraries AutoReqProv: on @@ -583,37 +480,19 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %endif @@ -643,19 +522,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %if %{make_ldapsmb} @@ -676,19 +546,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %package -n libtalloc-devel @@ -708,19 +569,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %package -n libtdb1 @@ -739,19 +591,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %package -n libtdb-devel @@ -771,19 +614,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %package -n libwbclient0 @@ -802,19 +636,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %package -n libwbclient-devel @@ -834,19 +659,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %package -n ldapsmb @@ -855,7 +671,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 265 +Release: 266 Requires: perl-ldap %description -n ldapsmb @@ -868,19 +684,10 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %endif @@ -903,19 +710,10 @@ Authors: -------- Steve French -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %endif @@ -945,19 +743,10 @@ Authors: -------- Rainer Link -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %endif @@ -1040,6 +829,9 @@ sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_t # use the default optimization unset OPTIMIZATION %endif +%if 0%{suse_version} > 1110 + export SUSE_ASNEEDED=0 +%endif export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" %if %{use_ccache} export CC="ccache gcc" @@ -1062,7 +854,11 @@ CONFIGURE_OPTIONS="\ --with-rootsbindir=/sbin \ --enable-cups \ --enable-debug \ +%if %{link_static_libs} --enable-static \ +%else + --disable-static \ +%endif --with-acl-support \ --with-automount \ --with-dnsupdate \ @@ -1868,7 +1664,9 @@ exit 0 %files -n libnetapi-devel %defattr(-,root,root) %{_includedir}/netapi.h +%if %{link_static_libs} %{_libdir}/libnetapi.a +%endif %{_libdir}/libnetapi.so %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -1884,7 +1682,9 @@ exit 0 %files -n libsmbclient-devel %defattr(-,root,root) %{_includedir}/libsmbclient.h +%if %{link_static_libs} %{_libdir}/libsmbclient.a +%endif %{_libdir}/libsmbclient.so %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -1899,7 +1699,9 @@ exit 0 %files -n libsmbsharemodes-devel %defattr(-,root,root) %{_includedir}/smb_share_modes.h +%if %{link_static_libs} %{_libdir}/libsmbsharemodes.a +%endif %{_libdir}/libsmbsharemodes.so %if %{make_ldapsmb} @@ -1910,7 +1712,9 @@ exit 0 %files -n libtalloc-devel %defattr(-,root,root) %{_includedir}/talloc.h +%if %{link_static_libs} %{_libdir}/libtalloc.a +%endif %{_libdir}/libtalloc.so %files -n libtdb1 @@ -1920,7 +1724,9 @@ exit 0 %files -n libtdb-devel %defattr(-,root,root) %{_includedir}/tdb.h +%if %{link_static_libs} %{_libdir}/libtdb.a +%endif %{_libdir}/libtdb.so %files -n libwbclient0 @@ -1930,7 +1736,9 @@ exit 0 %files -n libwbclient-devel %defattr(-,root,root) %{_includedir}/wbclient.h +%if %{link_static_libs} #%{_libdir}/libwbclient.a +%endif %{_libdir}/libwbclient.so %files -n ldapsmb diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 735e23a..4f85a89 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6838a4b09c91bf7df02119fe3139cbfc742a0a95bcfe14bd9d6a0b032cd4282 -size 24027 +oid sha256:7f0aff82edfc7dc541e34fecc2cedcbf55956bfe2bfad07081470e3584609ffc +size 24071