Hello community,
here is the log from the commit of package samba for openSUSE:Factory
checked in at Sat Apr 24 17:27:06 CEST 2010.
--------
--- samba/samba.changes 2010-04-07 15:37:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/samba/samba.changes 2010-04-21 19:18:12.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Apr 21 11:11:23 UTC 2010 - jmcdonough@suse.de
+
+- Add "net conf import" error messages; (bso#7378, bnc#598189).
+
+-------------------------------------------------------------------
+Wed Apr 21 11:22:49 CEST 2010 - jsmeix@suse.de
+
+- Define cups_lib_dir %{_prefix}/lib/cups for post-11.2 systems; (bnc#575544).
+
+-------------------------------------------------------------------
@@ -256 +266 @@
- with "unix extensions"; (bso#7104); (bnc#577868).
+ with "unix extensions"; CVE-2010-0926; (bso#7104); (bnc#577868).
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.C8B5Hq/_old 2010-04-24 17:26:39.000000000 +0200
+++ /var/tmp/diff_new_pack.C8B5Hq/_new 2010-04-24 17:26:39.000000000 +0200
@@ -63,7 +63,7 @@
%endif
Url: http://www.samba.org/
Version: 3.5.2
-Release: 1
+Release: 2
License: GPLv3+
Summary: Samba Documentation
Group: Documentation/Other
@@ -130,6 +130,11 @@
%define VENDOR %_vendor
%endif
%endif
+%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
+%define cups_lib_dir %{_prefix}/lib/cups
+%else
+%define cups_lib_dir %{_libdir}/cups
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%prep
@@ -279,27 +284,6 @@
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
-%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.7 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so.0
-ln -s libldb.so.0.9.7 ${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
@@ -400,7 +384,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%changelog
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.C8B5Hq/_old 2010-04-24 17:26:39.000000000 +0200
+++ /var/tmp/diff_new_pack.C8B5Hq/_new 2010-04-24 17:26:39.000000000 +0200
@@ -68,7 +68,7 @@
Url: http://www.samba.org/
AutoReqProv: on
Version: 3.5.2
-Release: 1
+Release: 2
%ifarch ppc64
Obsoletes: samba-64bit
%endif
@@ -138,6 +138,11 @@
%define VENDOR %_vendor
%endif
%endif
+%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
+%define cups_lib_dir %{_prefix}/lib/cups
+%else
+%define cups_lib_dir %{_libdir}/cups
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -163,7 +168,7 @@
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package client
@@ -207,7 +212,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -232,7 +237,7 @@
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%endif
@@ -260,7 +265,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%endif
@@ -287,7 +292,7 @@
--------
Jeremy Allison <jra at samba dot org>
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%if %{make_utils}
@@ -337,7 +342,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -362,7 +367,7 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbclient
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%else
@@ -407,7 +412,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libnetapi0
@@ -426,7 +431,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libnetapi-devel
@@ -446,7 +451,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -466,7 +471,7 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbsharemodes
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%else
@@ -501,7 +506,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%if %{make_ldapsmb}
@@ -522,7 +527,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libtalloc-devel
@@ -542,7 +547,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libtdb1
@@ -561,7 +566,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libtdb-devel
@@ -581,7 +586,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libwbclient0
@@ -600,7 +605,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libwbclient-devel
@@ -620,7 +625,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libtevent0
@@ -639,7 +644,7 @@
--------
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libtevent-devel
@@ -660,7 +665,7 @@
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libldb0
@@ -680,7 +685,7 @@
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n libldb-devel
@@ -701,7 +706,7 @@
The Samba Team
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%package -n ldapsmb
@@ -710,7 +715,7 @@
Group: Productivity/Networking/Samba
AutoReqProv: on
Version: 1.34b
-Release: 285
+Release: 286
Requires: perl-ldap
%description -n ldapsmb
@@ -723,7 +728,7 @@
--------
Guenther Deschner <guenther at deschner dot de>
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%endif
@@ -746,7 +751,7 @@
--------
Steve French <sfrench at Samba dot org>
-Source Timestamp: 2345
+Source Timestamp: 2355
Branch : trunk
%endif
@@ -1026,12 +1031,6 @@
%{__make} -C source3/ install \
DESTDIR=${RPM_BUILD_ROOT} \
CONFIGDIR=%{CONFIGDIR} \
-# utility scripts
-scripts="creategroup mksmbpasswd.sh"
-%__install -d -m 0755 examples/scripts
-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} \
@@ -1053,6 +1052,12 @@
%if %{link_static_libs} == 0
rm ${RPM_BUILD_ROOT}/%{_libdir}/libldb.a
%endif
+# utility scripts
+scripts="creategroup mksmbpasswd.sh"
+%__install -d -m 0755 examples/scripts
+for i in $scripts; do
+ %__install -m 0755 "source3/script/${i}" examples/scripts/${i}
+done
# configuration files
pushd vendor-files
echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf
@@ -1199,8 +1204,8 @@
cp -a ldapsmb-%{ldapsmb_ver}/ldapsmb.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5
%endif
# cups SMB support
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/cups/backend/
-touch ${RPM_BUILD_ROOT}/%{_libdir}/cups/backend/smb
+mkdir -p ${RPM_BUILD_ROOT}/%{cups_lib_dir}/backend/
+touch ${RPM_BUILD_ROOT}/%{cups_lib_dir}/backend/smb
# add docs
%if %{make_vscan}
mv examples/VFS/samba-vscan-%{vscan_ver} .
@@ -1349,7 +1354,7 @@
fi
fi
if ! test -e %{_bindir}/get_printing_ticket; then
- ln -fs %{_bindir}/smbspool %{_libdir}/cups/backend/smb
+ ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
fi
%{?fillup_only:%{fillup_only -nsd dhcp samba-client network}}
@@ -1409,14 +1414,14 @@
%endif
%post krb-printing
-if test ${1:-0} -eq 1 -a -d %{_libdir}/cups/backend; then
- ln -fs %{_bindir}/get_printing_ticket %{_libdir}/cups/backend/smb
+if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then
+ ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb
fi
%{?run_permissions:%{run_permissions}}
%postun krb-printing
-if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{_libdir}/cups/backend; then
- ln -fs %{_bindir}/smbspool %{_libdir}/cups/backend/smb
+if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{cups_lib_dir}/backend; then
+ ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
fi
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000
%verifyscript krb-printing
@@ -1646,9 +1651,9 @@
%{_bindir}/testparm
%{_sbindir}/rc%{cifs_init_script}
/%{_lib}/libnss_wins.so.2
-%dir %{_libdir}/cups
-%dir %{_libdir}/cups/backend
-%ghost %{_libdir}/cups/backend/smb
+%dir %{cups_lib_dir}
+%dir %{cups_lib_dir}/backend
+%ghost %{cups_lib_dir}/backend/smb
%dir %{_libdir}/samba
%{_libdir}/samba/charset
%{_libdir}/samba/lowcase.dat
@@ -1784,9 +1789,9 @@
%else
%attr(0750,root,lp) %{_bindir}/get_printing_ticket
%endif
-%dir %{_libdir}/cups
-%dir %{_libdir}/cups/backend
-%ghost %{_libdir}/cups/backend/smb
+%dir %{cups_lib_dir}
+%dir %{cups_lib_dir}/backend
+%ghost %{cups_lib_dir}/backend/smb
%if %{make_vscan}
%files vscan
++++++ build-source-timestamp ++++++
--- /var/tmp/diff_new_pack.C8B5Hq/_old 2010-04-24 17:26:39.000000000 +0200
+++ /var/tmp/diff_new_pack.C8B5Hq/_new 2010-04-24 17:26:39.000000000 +0200
@@ -1,2 +1,2 @@
-2345
+2355
Branch : trunk
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/c298fcb2cfb45c7807de3a241461ef9c949963de new/patches/samba.org/c298fcb2cfb45c7807de3a241461ef9c949963de
--- old/patches/samba.org/c298fcb2cfb45c7807de3a241461ef9c949963de 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/c298fcb2cfb45c7807de3a241461ef9c949963de 2010-04-21 14:04:20.000000000 +0200
@@ -0,0 +1,25 @@
+commit c298fcb2cfb45c7807de3a241461ef9c949963de
+Author: Jim McDonough
+Date: Tue Apr 20 16:28:47 2010 -0400
+
+ Display an error on net conf import failures.
+
+ When something goes wrong, such as a typo in a parameter
+ name, we'll now display the failure instead of just returning
+ with -1 and no message.
+
+Index: source3/utils/net_conf.c
+===================================================================
+--- source3/utils/net_conf.c.orig
++++ source3/utils/net_conf.c
+@@ -229,6 +229,10 @@ static WERROR import_process_service(str
+ service->param_names[idx],
+ service->param_values[idx]);
+ if (!W_ERROR_IS_OK(werr)) {
++ d_fprintf(stderr,
++ _("Error in section [%s], parameter \"%s\": %s\n"),
++ service->name, service->param_names[idx],
++ win_errstr(werr));
+ goto done;
+ }
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series 2010-04-07 13:52:51.000000000 +0200
+++ new/patches/series 2010-04-24 15:35:26.000000000 +0200
@@ -7,6 +7,7 @@
# Samba patches from upstream, svnanon.Samba.org
samba.org/2f5c2f4c72735c0764d6e022b770d8e8b9865c01 -p0 # bnc 538923. Backported from master.
samba.org/6e48267c28b05c3837a3e5ffc1f5b58316cc286f -p0 # bnc 587014
+samba.org/c298fcb2cfb45c7807de3a241461ef9c949963de -p0 # bnc 598189, bso 7378.
# SuSE specific changes
# disabled -> WIP lmuelle
++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2010-04-07 15:35:00.000000000 +0200
+++ new/vendor-files/tools/package-data 2010-04-24 15:35:46.000000000 +0200
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="2345"
+SAMBA_PACKAGE_SVN_VERSION="2355"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org