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
This commit is contained in:
OBS User autobuild 2010-02-18 15:51:01 +00:00 committed by Git OBS Bridge
parent 29055f16c1
commit 48bb073a9b
6 changed files with 268 additions and 51 deletions

View File

@ -1,2 +1,2 @@
2306 2309
Branch : 3.4.5 Branch : 3.4.5

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:76a7add8e111d5cb1ceab78348e8ec25282989f2a1d06d0dad8179631649c6d1 oid sha256:d7eb6a478ea2c162614b81e7d18ec8149604b55f2e0ff64affdd43c1d549cc75
size 71113 size 71968

View File

@ -50,6 +50,11 @@ BuildRequires: ctdb-devel
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
BuildRequires: fdupes BuildRequires: fdupes
%endif %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 3.4.5
%define samba_ver_suffix %nil %define samba_ver_suffix %nil
%define samba_ver_full %{samba_ver}%{samba_ver_suffix} %define samba_ver_full %{samba_ver}%{samba_ver_suffix}
@ -58,7 +63,7 @@ BuildRequires: fdupes
%endif %endif
Url: http://www.samba.org/ Url: http://www.samba.org/
Version: 3.4.5 Version: 3.4.5
Release: 2 Release: 3
License: GPLv3+ License: GPLv3+
Summary: Samba Documentation Summary: Samba Documentation
Group: Documentation/Other Group: Documentation/Other
@ -267,6 +272,29 @@ scripts="creategroup mksmbpasswd.sh"
for i in $scripts; do for i in $scripts; do
%__install -m 0755 "source3/script/${i}" examples/scripts/${i} %__install -m 0755 "source3/script/${i}" examples/scripts/${i}
done 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 # configuration files
pushd vendor-files pushd vendor-files
echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf 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 <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%changelog %changelog

View File

@ -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 - 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; 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 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). - 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 Tue Jan 19 12:05:43 CET 2010 - lmuelle@suse.de

View File

@ -50,6 +50,11 @@ BuildRequires: ctdb-devel
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
BuildRequires: fdupes BuildRequires: fdupes
%endif %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 3.4.5
%define samba_ver_suffix %nil %define samba_ver_suffix %nil
%define samba_ver_full %{samba_ver}%{samba_ver_suffix} %define samba_ver_full %{samba_ver}%{samba_ver_suffix}
@ -63,7 +68,7 @@ Group: Productivity/Networking/Samba
Url: http://www.samba.org/ Url: http://www.samba.org/
AutoReqProv: on AutoReqProv: on
Version: 3.4.5 Version: 3.4.5
Release: 2 Release: 3
%ifarch ppc64 %ifarch ppc64
Obsoletes: samba-64bit Obsoletes: samba-64bit
%endif %endif
@ -158,10 +163,10 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%package client %package client
@ -201,10 +206,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@ -229,10 +234,10 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%endif %endif
@ -260,10 +265,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%endif %endif
@ -290,10 +295,10 @@ Authors:
-------- --------
Jeremy Allison <jra at samba dot org> Jeremy Allison <jra at samba dot org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%if %{make_utils} %if %{make_utils}
@ -342,10 +347,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -369,10 +374,10 @@ PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbclient %description -n libsmbclient
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%else %else
@ -414,10 +419,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%package -n libnetapi0 %package -n libnetapi0
@ -436,10 +441,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%package -n libnetapi-devel %package -n libnetapi-devel
@ -459,10 +464,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -481,10 +486,10 @@ PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbsharemodes %description -n libsmbsharemodes
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%else %else
@ -518,10 +523,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%if %{make_ldapsmb} %if %{make_ldapsmb}
@ -542,10 +547,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%package -n libtalloc-devel %package -n libtalloc-devel
@ -565,10 +570,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%package -n libtdb1 %package -n libtdb1
@ -587,10 +592,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%package -n libtdb-devel %package -n libtdb-devel
@ -610,10 +615,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%package -n libwbclient0 %package -n libwbclient0
@ -632,10 +637,10 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%package -n libwbclient-devel %package -n libwbclient-devel
@ -655,10 +660,103 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 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 <samba@samba.org>
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 <samba@samba.org>
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 <samba@samba.org>
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 <samba@samba.org>
Source Timestamp: 2309
Branch : 3.4.5
Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%package -n ldapsmb %package -n ldapsmb
@ -667,7 +765,7 @@ Summary: Tool to administer Samba's LDAP backend
Group: Productivity/Networking/Samba Group: Productivity/Networking/Samba
AutoReqProv: on AutoReqProv: on
Version: 1.34b Version: 1.34b
Release: 277 Release: 278
Requires: perl-ldap Requires: perl-ldap
%description -n ldapsmb %description -n ldapsmb
@ -680,10 +778,10 @@ Authors:
-------- --------
Guenther Deschner <guenther at deschner dot de> Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%endif %endif
@ -706,10 +804,10 @@ Authors:
-------- --------
Steve French <sfrench at Samba dot org> Steve French <sfrench at Samba dot org>
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
Source Timestamp: 2306 Source Timestamp: 2309
Branch : 3.4.5 Branch : 3.4.5
%endif %endif
@ -907,6 +1005,32 @@ rm ldapsmb
%{__make} %{?jobs:-j%jobs} all doc %{__make} %{?jobs:-j%jobs} all doc
popd popd
%endif %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 %check
pushd source3 pushd source3
@ -961,6 +1085,29 @@ scripts="creategroup mksmbpasswd.sh"
for i in $scripts; do for i in $scripts; do
%__install -m 0755 "source3/script/${i}" examples/scripts/${i} %__install -m 0755 "source3/script/${i}" examples/scripts/${i}
done 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 # configuration files
pushd vendor-files pushd vendor-files
echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf 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 %postun -n libtdb1
/sbin/ldconfig /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 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
%pre doc %pre doc
@ -1767,6 +1926,31 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
%endif %endif
%{_libdir}/libwbclient.so %{_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 %files -n ldapsmb
%defattr(-,root,root) %defattr(-,root,root)
%{_sbindir}/ldapsmb %{_sbindir}/ldapsmb

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:141bfc85e55062efe945ddf5d143dae33eaeb760934c49db69732172fd2195cd oid sha256:a2087280259f3b3686c2a367426bae02ede12d74ed4270ba3a300d44cd8a6fff
size 24381 size 24394