From 48bb073a9b95864ec15e2a7b0ecd7506ce3e6181a8efbed5058903b0fe740686 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 18 Feb 2010 15:51:01 +0000 Subject: [PATCH] Accepting request 32428 from network:samba:STABLE Copy from network:samba:STABLE/samba based on submit request 32428 from user lmuelle OBS-URL: https://build.opensuse.org/request/show/32428 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=56 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +- samba-doc.spec | 34 +++++- samba.changes | 7 +- samba.spec | 268 ++++++++++++++++++++++++++++++++++------- vendor-files.tar.bz2 | 4 +- 6 files changed, 268 insertions(+), 51 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 4ed446f..0c3398e 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2306 +2309 Branch : 3.4.5 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index b35fcc1..d00f748 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76a7add8e111d5cb1ceab78348e8ec25282989f2a1d06d0dad8179631649c6d1 -size 71113 +oid sha256:d7eb6a478ea2c162614b81e7d18ec8149604b55f2e0ff64affdd43c1d549cc75 +size 71968 diff --git a/samba-doc.spec b/samba-doc.spec index b17ac57..2db6657 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -50,6 +50,11 @@ BuildRequires: ctdb-devel %if 0%{?suse_version} > 1110 BuildRequires: fdupes %endif +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif %define samba_ver 3.4.5 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} @@ -58,7 +63,7 @@ BuildRequires: fdupes %endif Url: http://www.samba.org/ Version: 3.4.5 -Release: 2 +Release: 3 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -267,6 +272,29 @@ scripts="creategroup mksmbpasswd.sh" for i in $scripts; do %__install -m 0755 "source3/script/${i}" examples/scripts/${i} done +# libtevent +%{__make} -C lib/tevent/ install \ + DESTDIR=${RPM_BUILD_ROOT} \ + CONFIGDIR=%{CONFIGDIR} +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/tevent.pc +ln -s libtevent.so.0.9.8 ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.so.0 +ln -s libtevent.so.0.9.8 ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.so +%if %{link_static_libs} == 0 +rm ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.a +%endif +# libldb +%{__make} -C source4/lib/ldb/ install \ + DESTDIR=${RPM_BUILD_ROOT} \ + CONFIGDIR=%{CONFIGDIR} +%__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}/ldb +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/ldb.pc +rm -f ${RPM_BUILD_ROOT}/%{_bindir}/ldbtest +rm -f ${RPM_BUILD_ROOT}/%{py_libdir}/site-packages/ldb.so +ln -s libldb.so.0.9.3 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so.0 +ln -s libldb.so.0.9.3 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so +%if %{link_static_libs} == 0 +rm ${RPM_BUILD_ROOT}/%{_libdir}/libldb.a +%endif # configuration files pushd vendor-files echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf @@ -370,10 +398,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %changelog diff --git a/samba.changes b/samba.changes index eed51be..ac10fc0 100644 --- a/samba.changes +++ b/samba.changes @@ -3,7 +3,7 @@ Tue Feb 9 22:10:44 UTC 2010 - lmuelle@suse.de - Take extra care that a mount point of mount.cifs isn't changed during mount and don't allow it to be run as setuid root program; CVE-2009-3638; - (bnc#550002). + (bso#6853); (bnc#550002). ------------------------------------------------------------------- Tue Feb 9 17:10:55 UTC 2010 - lmuelle@suse.de @@ -32,6 +32,11 @@ Fri Feb 5 17:12:24 UTC 2010 - lmuelle@suse.de - Normalize "Changing password for" msg IDs and STRs; (bnc#499233). +------------------------------------------------------------------- +Thu Feb 4 16:58:53 UTC 2010 - rhafer@novell.com + +- Build libtevent and libldb and put them into separate subpackages. + ------------------------------------------------------------------- Tue Jan 19 12:05:43 CET 2010 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 7950127..aa2e133 100644 --- a/samba.spec +++ b/samba.spec @@ -50,6 +50,11 @@ BuildRequires: ctdb-devel %if 0%{?suse_version} > 1110 BuildRequires: fdupes %endif +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif %define samba_ver 3.4.5 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} @@ -63,7 +68,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.4.5 -Release: 2 +Release: 3 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -158,10 +163,10 @@ Authors: The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %package client @@ -201,10 +206,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -229,10 +234,10 @@ Authors: The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %endif @@ -260,10 +265,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %endif @@ -290,10 +295,10 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %if %{make_utils} @@ -342,10 +347,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -369,10 +374,10 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %else @@ -414,10 +419,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %package -n libnetapi0 @@ -436,10 +441,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %package -n libnetapi-devel @@ -459,10 +464,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -481,10 +486,10 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %else @@ -518,10 +523,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %if %{make_ldapsmb} @@ -542,10 +547,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %package -n libtalloc-devel @@ -565,10 +570,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %package -n libtdb1 @@ -587,10 +592,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %package -n libtdb-devel @@ -610,10 +615,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %package -n libwbclient0 @@ -632,10 +637,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %package -n libwbclient-devel @@ -655,10 +660,103 @@ Authors: -------- The Samba Team -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 +Branch : 3.4.5 + +%package -n libtevent0 +License: LGPLv3+ +Summary: Samba tevent Library +Group: System/Libraries +AutoReqProv: on +PreReq: /sbin/ldconfig + +%description -n libtevent0 +This package includes the tevent library. + + + +Authors: +-------- + The Samba Team + +Source Timestamp: 2309 +Branch : 3.4.5 + +Source Timestamp: 2309 +Branch : 3.4.5 + +%package -n libtevent-devel +License: LGPLv3+ +Summary: Libraries and Header Files to Develop Programs with tevent Support +Group: Development/Libraries/C and C++ +AutoReqProv: on +Requires: libtevent0 = %{version} + +%description -n libtevent-devel +This package contains the static libraries and header files needed to +develop programs which make use of the tevent programming interface. + + + +Authors: +-------- + The Samba Team + + +Source Timestamp: 2309 +Branch : 3.4.5 + +Source Timestamp: 2309 +Branch : 3.4.5 + +%package -n libldb0 +License: LGPLv3+ +Summary: Samba ldb Library +Group: System/Libraries +AutoReqProv: on +PreReq: /sbin/ldconfig + +%description -n libldb0 +This package includes the ldb library. + + + +Authors: +-------- + The Samba Team + + +Source Timestamp: 2309 +Branch : 3.4.5 + +Source Timestamp: 2309 +Branch : 3.4.5 + +%package -n libldb-devel +License: LGPLv3+ +Summary: Libraries and Header Files to Develop Programs with ldb Support +Group: Development/Libraries/C and C++ +AutoReqProv: on +Requires: libldb0 = %{version} + +%description -n libldb-devel +This package contains the static libraries and header files needed to +develop programs which make use of the tevent programming interface. + + + +Authors: +-------- + The Samba Team + + +Source Timestamp: 2309 +Branch : 3.4.5 + +Source Timestamp: 2309 Branch : 3.4.5 %package -n ldapsmb @@ -667,7 +765,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 277 +Release: 278 Requires: perl-ldap %description -n ldapsmb @@ -680,10 +778,10 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %endif @@ -706,10 +804,10 @@ Authors: -------- Steve French -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 -Source Timestamp: 2306 +Source Timestamp: 2309 Branch : 3.4.5 %endif @@ -907,6 +1005,32 @@ rm ldapsmb %{__make} %{?jobs:-j%jobs} all doc popd %endif +popd +pushd lib/tevent +%{?suse_update_config:%{suse_update_config -f}} +#aclocal +./autogen.sh +TALLOC_LIBS=../../source3/bin/libtalloc.so.1 TALLOC_CFLAGS=-I../talloc/ ./configure \ + --prefix=%{_prefix} \ + --localstatedir=%{LOCKDIR} \ + --sysconfdir=%{CONFIGDIR} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} +%{__make} +popd +pushd source4/lib/ldb +%{?suse_update_config:%{suse_update_config -f}} +./autogen.sh +TALLOC_LIBS=../../../source3/bin/libtalloc.so.1 TALLOC_CFLAGS=-I../../../lib/talloc/ \ +TEVENT_LIBS=../../../lib/tevent/libtevent.so.0.9.8 TEVENT_CFLAGS=-I../../../lib/tevent/ \ +TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include \ + ./configure --prefix=%{_prefix} \ + --localstatedir=%{LOCKDIR} \ + --sysconfdir=%{CONFIGDIR} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} +%{__make} +popd %check pushd source3 @@ -961,6 +1085,29 @@ scripts="creategroup mksmbpasswd.sh" for i in $scripts; do %__install -m 0755 "source3/script/${i}" examples/scripts/${i} done +# libtevent +%{__make} -C lib/tevent/ install \ + DESTDIR=${RPM_BUILD_ROOT} \ + CONFIGDIR=%{CONFIGDIR} +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/tevent.pc +ln -s libtevent.so.0.9.8 ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.so.0 +ln -s libtevent.so.0.9.8 ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.so +%if %{link_static_libs} == 0 +rm ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.a +%endif +# libldb +%{__make} -C source4/lib/ldb/ install \ + DESTDIR=${RPM_BUILD_ROOT} \ + CONFIGDIR=%{CONFIGDIR} +%__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}/ldb +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/ldb.pc +rm -f ${RPM_BUILD_ROOT}/%{_bindir}/ldbtest +rm -f ${RPM_BUILD_ROOT}/%{py_libdir}/site-packages/ldb.so +ln -s libldb.so.0.9.3 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so.0 +ln -s libldb.so.0.9.3 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so +%if %{link_static_libs} == 0 +rm ${RPM_BUILD_ROOT}/%{_libdir}/libldb.a +%endif # configuration files pushd vendor-files echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf @@ -1285,6 +1432,18 @@ fi %postun -n libtdb1 /sbin/ldconfig + +%post -n libtevent0 +/sbin/ldconfig + +%postun -n libtevent0 +/sbin/ldconfig + +%post -n libldb0 +/sbin/ldconfig + +%postun -n libldb0 +/sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %pre doc @@ -1767,6 +1926,31 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf %endif %{_libdir}/libwbclient.so +%files -n libtevent0 +%defattr(-,root,root) +%{_libdir}/libtevent.so.* + +%files -n libtevent-devel +%defattr(-,root,root) +%{_includedir}/tevent.h +%if %{link_static_libs} +%{_libdir}/libtevent.a +%endif +%{_libdir}/libtevent.so + +%files -n libldb0 +%defattr(-,root,root) +%{_libdir}/libldb.so.* +%attr(755,root,root) %dir %{_libdir}/ldb + +%files -n libldb-devel +%defattr(-,root,root) +%{_includedir}/ldb*.h +%if %{link_static_libs} +%{_libdir}/libldb.a +%endif +%{_libdir}/libldb.so + %files -n ldapsmb %defattr(-,root,root) %{_sbindir}/ldapsmb diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 8fa2688..da238c1 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:141bfc85e55062efe945ddf5d143dae33eaeb760934c49db69732172fd2195cd -size 24381 +oid sha256:a2087280259f3b3686c2a367426bae02ede12d74ed4270ba3a300d44cd8a6fff +size 24394