Hello community,
here is the log from the commit of package samba for openSUSE:Factory
checked in at Sat Aug 1 11:43:49 CEST 2009.
--------
--- samba/samba-doc.changes 2009-06-08 21:07:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/samba/samba-doc.changes 2009-07-08 16:59:02.000000000 +0200
@@ -14 +14 @@
-- Remove NoSource tags from samba-doc spec file; [#351370].
+- Remove NoSource tags from samba-doc spec file; [bnc#351370].
--- samba/samba.changes 2009-07-03 19:41:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/samba/samba.changes 2009-07-27 16:12:36.000000000 +0200
@@ -1,0 +2,26 @@
+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.
+
+-------------------------------------------------------------------
@@ -23,0 +50,5 @@
+
+-------------------------------------------------------------------
+Tue Jun 30 13:26:32 CEST 2009 - jmcdonough@suse.de
+
+- Fix net ads leave; (bnc#511695).
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.b9u6z9/_old 2009-08-01 11:40:02.000000000 +0200
+++ /var/tmp/diff_new_pack.b9u6z9/_new 2009-08-01 11:40:02.000000000 +0200
@@ -55,7 +55,7 @@
%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 @@
%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 @@
# 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 @@
--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 @@
--------
The Samba Team
-Source Timestamp: 2165
-Branch : trunk
-
-Source Timestamp: 2165
-Branch : trunk
-
-Source Timestamp: 2165
-Branch : trunk
-
-Source Timestamp: 2165
+Source Timestamp: 2180
Branch : trunk
-Source Timestamp: 2165
+Source Timestamp: 2180
Branch : trunk
%changelog
++++++ samba.spec ++++++
++++ 660 lines (skipped)
++++ between samba/samba.spec
++++ and /mounts/work_src_done/STABLE/samba/samba.spec
++++++ build-source-timestamp ++++++
--- /var/tmp/diff_new_pack.b9u6z9/_old 2009-08-01 11:40:02.000000000 +0200
+++ /var/tmp/diff_new_pack.b9u6z9/_new 2009-08-01 11:40:02.000000000 +0200
@@ -1,2 +1,2 @@
-2165
+2180
Branch : trunk
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/6f64937ab835adbe0fea2ff38a8bd03941fc9543 new/patches/samba.org/6f64937ab835adbe0fea2ff38a8bd03941fc9543
--- old/patches/samba.org/6f64937ab835adbe0fea2ff38a8bd03941fc9543 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/6f64937ab835adbe0fea2ff38a8bd03941fc9543 2009-07-09 11:20:30.000000000 +0200
@@ -0,0 +1,19 @@
+commit 6f64937ab835adbe0fea2ff38a8bd03941fc9543
+Author: Jim McDonough
+Date: Wed Jul 8 08:02:04 2009 -0400
+
+ Fix cifs.upcall builds on some platforms (zlib)
+
+Index: source3/Makefile.in
+===================================================================
+--- source3/Makefile.in.orig
++++ source3/Makefile.in
+@@ -1470,7 +1470,7 @@ bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQ
+ @$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
+ -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
+ $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
+- $(LIBTDB_LIBS) $(NSCD_LIBS)
++ $(LIBTDB_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS)
+
+ bin/testparm@EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo Linking $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/7fd42d51c8b13d273b55823ee146967afacd7c88 new/patches/samba.org/7fd42d51c8b13d273b55823ee146967afacd7c88
--- old/patches/samba.org/7fd42d51c8b13d273b55823ee146967afacd7c88 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/7fd42d51c8b13d273b55823ee146967afacd7c88 2009-07-09 11:20:30.000000000 +0200
@@ -0,0 +1,28 @@
+commit 7fd42d51c8b13d273b55823ee146967afacd7c88
+Author: Jim McDonough
+Date: Wed Jul 8 13:12:26 2009 -0400
+
+ Fix make test_shlibs for libnss_wins and libnetapi (zlib)
+
+Index: source3/Makefile.in
+===================================================================
+--- source3/Makefile.in.orig
++++ source3/Makefile.in
+@@ -2050,7 +2050,7 @@ $(LIBNETAPI_SHARED_TARGET_SONAME): $(BIN
+ @echo Linking shared library $@
+ @$(SHLD_DSO) $(LIBNETAPI_OBJ) \
+ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
+- $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
++ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \
+ @SONAMEFLAG@`basename $@`
+
+ $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
+@@ -2385,7 +2385,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP
+ @WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ @echo "Linking $@"
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
+- $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
++ $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
+ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
+
+ bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) @LIBWBCLIENT_TARGET@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/9acc670541031414d0cb5df39d18866c4c96b37c new/patches/samba.org/9acc670541031414d0cb5df39d18866c4c96b37c
--- old/patches/samba.org/9acc670541031414d0cb5df39d18866c4c96b37c 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/9acc670541031414d0cb5df39d18866c4c96b37c 2009-07-30 16:06:40.000000000 +0200
@@ -0,0 +1,76 @@
+commit 9acc670541031414d0cb5df39d18866c4c96b37c
+Author: Bo Yang
+Date: Thu Jul 23 10:23:21 2009 +0800
+
+ s3: To correctly handle upn
+
+ lookupname failed, cannot find domain when attempt
+ to change password.
+
+ This addresses bug #6560.
+
+ Signed-off-by: Bo Yang
+
+Index: nsswitch/pam_winbind.c
+===================================================================
+--- nsswitch/pam_winbind.c.orig
++++ nsswitch/pam_winbind.c
+@@ -2284,6 +2284,7 @@ static char* winbind_upn_to_username(str
+ enum wbcSidType type;
+ char *domain;
+ char *name;
++ char *p;
+
+ /* This cannot work when the winbind separator = @ */
+
+@@ -2292,9 +2293,19 @@ static char* winbind_upn_to_username(str
+ return NULL;
+ }
+
++ name = talloc_strdup(ctx, upn);
++ if (!name) {
++ return NULL;
++ }
++
++ if ((p = strchr(name, '@')) != NULL) {
++ *p = 0;
++ domain = p + 1;
++ }
++
+ /* Convert the UPN to a SID */
+
+- wbc_status = wbcLookupName("", upn, &sid, &type);
++ wbc_status = wbcLookupName(domain, name, &sid, &type);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ return NULL;
+ }
+Index: source3/winbindd/winbindd_sid.c
+===================================================================
+--- source3/winbindd/winbindd_sid.c.orig
++++ source3/winbindd/winbindd_sid.c
+@@ -93,6 +93,11 @@ void winbindd_lookupname(struct winbindd
+ *p = 0;
+ name_domain = state->request.data.name.name;
+ name_user = p+1;
++ } else if ((p = strchr(state->request.data.name.name, '@')) != NULL) {
++ /* upn */
++ name_domain = p + 1;
++ *p = 0;
++ name_user = state->request.data.name.name;
+ } else {
+ name_domain = state->request.data.name.dom_name;
+ name_user = state->request.data.name.name;
+Index: source3/winbindd/winbindd_util.c
+===================================================================
+--- source3/winbindd/winbindd_util.c.orig
++++ source3/winbindd/winbindd_util.c
+@@ -1144,7 +1144,8 @@ bool parse_domain_user(const char *domus
+ if ( assume_domain(lp_workgroup())) {
+ fstrcpy(domain, lp_workgroup());
+ } else if ((p = strchr(domuser, '@')) != NULL) {
+- fstrcpy(domain, "");
++ fstrcpy(domain, p + 1);
++ user[PTR_DIFF(p, domuser)] = 0;
+ } else {
+ return False;
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series 2009-06-12 23:08:16.000000000 +0200
+++ new/patches/series 2009-07-30 16:06:40.000000000 +0200
@@ -5,6 +5,9 @@
# allows quilt to work in the usual way (= outside of our RPM spec file).
# Samba patches from upstream, svnanon.Samba.org
+samba.org/6f64937ab835adbe0fea2ff38a8bd03941fc9543 -p0 # Fix cifs.upcall builds
+samba.org/7fd42d51c8b13d273b55823ee146967afacd7c88 -p0 # Fix test_shlib
+samba.org/9acc670541031414d0cb5df39d18866c4c96b37c -p0 # bnc 520645, bso 6560
# 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 2009-07-03 19:37:50.000000000 +0200
+++ new/vendor-files/tools/package-data 2009-07-31 23:06:02.000000000 +0200
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="2165"
+SAMBA_PACKAGE_SVN_VERSION="2180"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/smbfs new/vendor-files/tools/smbfs
--- old/vendor-files/tools/smbfs 2009-01-27 22:24:19.000000000 +0100
+++ new/vendor-files/tools/smbfs 2009-07-15 00:16:08.000000000 +0200
@@ -67,7 +67,7 @@
;;
*if-down.d*)
if rc_active smbfs; then
- log_msg=$( rcsmbfs restart 2>&1)
+ log_msg=$( rcsmbfs stop 2>&1)
log_dbg "${log_msg}"
fi
;;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org