Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2013-01-24 16:03:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2013-01-10 22:35:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2013-01-24 16:03:23.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Jan 23 12:10:57 UTC 2013 - [email protected] + +- Update to 3.6.11. + + defer_open is triggered multiple times on the same request; (bso#9196). + + Fix SEGV when using second vfs module; (bso#9471). + +------------------------------------------------------------------- +Wed Jan 23 11:23:42 UTC 2013 - [email protected] + +- defer_open is triggered multiple times on the same request; (bso#9196). +- Fix SEGV when using second vfs module; (bso#9471). +- Correctly detect O_DIRECT; (bso#9548). +- Mask off signals the correct way from the signal handler; (bso#9550). +- ntlm_auth.1: Fix format and make examples visible; (bso#9569). + +------------------------------------------------------------------- +Mon Jan 21 11:02:35 UTC 2013 - [email protected] + +- Disable SWAT during configure and don't package it any longer. + +------------------------------------------------------------------- +Fri Jan 18 17:34:55 UTC 2013 - [email protected] + +- Remove dangling references to Heimdal from the spec file. + +------------------------------------------------------------------- @@ -369 +395 @@ -- s3-printing: Add new printers to registry; (bso#8554); (baso#8612); +- s3-printing: Add new printers to registry; (bso#8554); (bso#8612); Old: ---- samba-3.6.10.tar.bz2 New: ---- samba-3.6.11.tar.bz2 samba-client-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.AAzlxh/_old 2013-01-24 16:03:26.000000000 +0100 +++ /var/tmp/diff_new_pack.AAzlxh/_new 2013-01-24 16:03:26.000000000 +0100 @@ -89,7 +89,7 @@ BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.10 +%define samba_ver 3.6.11 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -126,9 +126,9 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2905 +%define SOURCE_TIMESTAMP 2915 %define BRANCH %{version} -Version: 3.6.10 +Version: 3.6.11 Release: 0 %define ldapsmb_ver 1.34b Url: http://www.samba.org/ @@ -182,7 +182,6 @@ ################################ %define DOCDIR %{_defaultdocdir}/samba %define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook -%define SWATDIR %{_datadir}/samba/swat %define LOGDIR %{_localstatedir}/log/samba %define LOCKDIR %{_localstatedir}/lib/samba %define CONFIGDIR %{_sysconfdir}/samba @@ -345,11 +344,8 @@ --enable-developer \ --enable-krb5developer \ %endif + --disable-swat \ " -# make sure we have a chance to find krb5-config -for dir in /usr/lib/mit/bin /usr/lib/heimdal; do - test -d "${dir}" && export PATH="${PATH}:${dir}" -done unset CONFIGURE_OPTIONS_DEVEL %if %{make_devel} CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer" @@ -364,7 +360,6 @@ mkdir -p \ %{buildroot}/%{DOCDIR} \ %{buildroot}/%{DOCBOOKDIR} \ - %{buildroot}/%{SWATDIR}/help \ %{buildroot}/%{_datadir}/susehelp/meta/Administration/System # utility scripts scripts="creategroup mksmbpasswd.sh" @@ -401,28 +396,6 @@ rm -rf "%{buildroot}/%{DOCBOOKDIR}" rm -f examples/VFS/*~ cp -a examples/ %{buildroot}/%{DOCDIR} -test -e "%{buildroot}/%{SWATDIR}/help/manpages" || \ - ln -s "%{DOCDIR}/htmldocs/manpages" "%{buildroot}/%{SWATDIR}/help" -# Install HTML pages only in the samba-doc package -pushd %{buildroot}/%{SWATDIR}/help -for file in $( find -mindepth 1 -maxdepth 1); do - file="${file#./}" - case "${file}" in - welcome-no-samba-doc.html) - case "%{name}" in - samba*-doc) rm "${file}" ;; - esac - continue - ;; - welcome.html) ;; - *) - rm -r "${file}" - ln -s "%{DOCDIR}/htmldocs/${file}" . - ;; - esac - echo "%doc %{SWATDIR}/help/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc -done -popd # finally build filelist-samba-doc for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do # exclude %{DOCDIR}, README, and docbook @@ -440,17 +413,6 @@ %endif %pre -# Remove all directories and files from usr/share/samba/swat/help expect welcome-*.html -if [ -d usr/share/samba/swat/help ]; then - find usr/share/samba/swat/help -mindepth 1 -maxdepth 1 -type d -print0 | \ - xargs -0 rm -rf - for file in $( find usr/share/samba/swat/help -maxdepth 1 -type f); do - case "${file}" in - usr/share/samba/swat/help/welcome*.html) continue ;; - *) rm -f "${file}" ;; - esac - done -fi %clean [ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" @@ -461,8 +423,6 @@ %defattr(-,root,root) %dir %{DOCDIR} %dir %{_datadir}/samba -%dir %{SWATDIR} -%dir %{SWATDIR}/help %doc %{_datadir}/susehelp %endif ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.AAzlxh/_old 2013-01-24 16:03:27.000000000 +0100 +++ /var/tmp/diff_new_pack.AAzlxh/_new 2013-01-24 16:03:27.000000000 +0100 @@ -89,7 +89,7 @@ BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.10 +%define samba_ver 3.6.11 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -126,9 +126,9 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2905 +%define SOURCE_TIMESTAMP 2915 %define BRANCH %{version} -Version: 3.6.10 +Version: 3.6.11 Release: 0 %define ldapsmb_ver 1.34b License: GPL-3.0+ @@ -189,7 +189,6 @@ ################################ %define DOCDIR %{_defaultdocdir}/samba %define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook -%define SWATDIR %{_datadir}/samba/swat %define LOGDIR %{_localstatedir}/log/samba %define LOCKDIR %{_localstatedir}/lib/samba %define CONFIGDIR %{_sysconfdir}/samba @@ -812,11 +811,8 @@ --enable-developer \ --enable-krb5developer \ %endif + --disable-swat \ " -# make sure we have a chance to find krb5-config -for dir in /usr/lib/mit/bin /usr/lib/heimdal; do - test -d "${dir}" && export PATH="${PATH}:${dir}" -done unset CONFIGURE_OPTIONS_DEVEL %if %{make_devel} CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer" @@ -926,7 +922,6 @@ %{buildroot}/%{_var}/run \ %{buildroot}/%{DOCDIR} \ %{buildroot}/%{DOCBOOKDIR} \ - %{buildroot}/%{SWATDIR}/help \ %{buildroot}/%{_datadir}/susehelp/meta/Administration/System %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -1031,7 +1026,6 @@ # PDF generator install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf touch %{buildroot}/var/run/%{cifs_init_script} -install -m 0644 config/swat.xinetd %{buildroot}/%{_sysconfdir}/xinetd.d/swat install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba install -m 0644 config/dhcp.conf %{buildroot}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf @@ -1125,28 +1119,6 @@ rm -rf "%{buildroot}/%{DOCBOOKDIR}" rm -f examples/VFS/*~ cp -a examples/ %{buildroot}/%{DOCDIR} -test -e "%{buildroot}/%{SWATDIR}/help/manpages" || \ - ln -s "%{DOCDIR}/htmldocs/manpages" "%{buildroot}/%{SWATDIR}/help" -# Install HTML pages only in the samba-doc package -pushd %{buildroot}/%{SWATDIR}/help -for file in $( find -mindepth 1 -maxdepth 1); do - file="${file#./}" - case "${file}" in - welcome-no-samba-doc.html) - case "%{name}" in - samba*-doc) rm "${file}" ;; - esac - continue - ;; - welcome.html) ;; - *) - rm -r "${file}" - ln -s "%{DOCDIR}/htmldocs/${file}" . - ;; - esac - echo "%doc %{SWATDIR}/help/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc -done -popd # finally build filelist-samba-doc for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do # exclude %{DOCDIR}, README, and docbook @@ -1283,22 +1255,6 @@ %endif -%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 - -%pre doc -# Remove all directories and files from usr/share/samba/swat/help expect welcome-*.html -if [ -d usr/share/samba/swat/help ]; then - find usr/share/samba/swat/help -mindepth 1 -maxdepth 1 -type d -print0 | \ - xargs -0 rm -rf - for file in $( find usr/share/samba/swat/help -maxdepth 1 -type f); do - case "${file}" in - usr/share/samba/swat/help/welcome*.html) continue ;; - *) rm -f "${file}" ;; - esac - done -fi -%endif - %post krb-printing if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb @@ -1382,7 +1338,6 @@ %config(noreplace) %{CONFIGDIR}/smbusers %config %{_sysconfdir}/pam.d/samba %{_sysconfdir}/slp.reg.d -%config(noreplace) %{_sysconfdir}/xinetd.d/swat %if 0%{?suse_version} && 0%{?suse_version} > 1020 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/netbios-server %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-server @@ -1393,22 +1348,14 @@ %{_libdir}/samba/auth %{_libdir}/samba/config %{_libdir}/samba/rpc -%{_libdir}/samba/*.msg %attr(0775,root,ntadmin) %{LOCKDIR}/drivers %{LOCKDIR}/netlogon %attr(0770,root,users) %dir %{LOCKDIR}/profiles -%dir %{SWATDIR} -%dir %{SWATDIR}/help -%{SWATDIR}/help/welcome-no-samba-doc.html -%{SWATDIR}/images -%{SWATDIR}/include -%{SWATDIR}/lang %{_bindir}/smbstatus %{_sbindir}/nmbd %{_sbindir}/rcnmb %{_sbindir}/rcsmb %{_sbindir}/smbd -%{_sbindir}/swat %{_bindir}/smbta-util %if 0%{?suse_version} && 0%{?suse_version} < 1100 %dir %{_datadir}/omc @@ -1632,8 +1579,6 @@ %defattr(-,root,root) %dir %{DOCDIR} %dir %{_datadir}/samba -%dir %{SWATDIR} -%dir %{SWATDIR}/help %doc %{_datadir}/susehelp %endif ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.AAzlxh/_old 2013-01-24 16:03:27.000000000 +0100 +++ /var/tmp/diff_new_pack.AAzlxh/_new 2013-01-24 16:03:27.000000000 +0100 @@ -1 +1 @@ -SOURCE_TIMESTAMP="2905" +SOURCE_TIMESTAMP="2915" ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/heimdal/heimdal-0.7.1-light.diff new/patches/heimdal/heimdal-0.7.1-light.diff --- old/patches/heimdal/heimdal-0.7.1-light.diff 2012-09-17 12:40:35.000000000 +0200 +++ new/patches/heimdal/heimdal-0.7.1-light.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -Author: Björn JACKE <bj at SerNet dot de> -Subject: Limit build of heimdal to the required components - ---- Makefile.in 2005-10-14 12:46:55.325879536 +0000 -+++ Makefile.in 2005-10-14 12:47:53.383879902 +0000 -@@ -367,7 +367,7 @@ - @KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la - @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la - @KCM_TRUE@kcm_dir = kcm --SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) appl doc tools -+SUBDIRS = include lib tools - ACLOCAL_AMFLAGS = -I cf - EXTRA_DIST = Makefile.am.common krb5.conf - all: all-recursive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/heimdal/heimdal-configure-pthread.diff new/patches/heimdal/heimdal-configure-pthread.diff --- old/patches/heimdal/heimdal-configure-pthread.diff 2012-09-17 12:40:35.000000000 +0200 +++ new/patches/heimdal/heimdal-configure-pthread.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -Author: Lars Mueller <lmuelle at samba dort org> -Subject: fix pthread libs command line option - -We only could patch configure as our autoconf in ul1/ sles8 and 9.0 is too -old. - -Index: configure -=================================================================== ---- configure -+++ configure -@@ -22578,7 +22578,7 @@ case "$host" in - 2.*) - native_pthread_support=yes - PTHREADS_CFLAGS=-pthread -- PTHREADS_LIBS=-pthread -+ PTHREADS_LIBS=-lpthread - ;; - esac - ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/heimdal/samba3-exampleheimdal4.diff new/patches/heimdal/samba3-exampleheimdal4.diff --- old/patches/heimdal/samba3-exampleheimdal4.diff 2012-09-17 12:40:35.000000000 +0200 +++ new/patches/heimdal/samba3-exampleheimdal4.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -Author: Björn JACKE <bj at SerNet dot de> -Subject: Use the heimdal version we just built - ---- ../examples/pdb/Makefile -+++ ../examples/pdb/Makefile 2005-01-25 13:30:14 -@@ -8,7 +8,7 @@ - SAMBA_INCL = ../../source/include - UBIQX_SRC = ../../source/ubiqx - SMBWR_SRC = ../../source/smbwrapper --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g -I/usr/include/heimdal -fPIC -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g -I../../heimdal/include/ -fPIC - PDB_OBJS = test.la - - # Default target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/heimdal/series new/patches/heimdal/series --- old/patches/heimdal/series 2012-09-17 12:40:35.000000000 +0200 +++ new/patches/heimdal/series 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# needed if we build heimdal as part of the Samba build process -heimdal/heimdal-0.7.1-light.diff -p0 -heimdal/heimdal-configure-pthread.diff -p0 -heimdal/samba3-exampleheimdal4.diff -p0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/82db35cdb426355e4b7fd7ecf1ce9d9fca59ecd3 new/patches/samba.org/82db35cdb426355e4b7fd7ecf1ce9d9fca59ecd3 --- old/patches/samba.org/82db35cdb426355e4b7fd7ecf1ce9d9fca59ecd3 2012-12-10 23:27:00.000000000 +0100 +++ new/patches/samba.org/82db35cdb426355e4b7fd7ecf1ce9d9fca59ecd3 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -commit 82db35cdb426355e4b7fd7ecf1ce9d9fca59ecd3 -Author: Tsukasa Hamano <[email protected]> -Date: Thu Dec 6 13:01:33 2012 -0800 - - Fix bug #9471 - SEGV when using second vfs module. - - Don't use default_classname_table when we obviously shoud be using - classname_table. - - Reviewed by: Jeremy Allison <[email protected]> - Reviewed-by: Michael Adam <[email protected]> - - Autobuild-User(master): Michael Adam <[email protected]> - Autobuild-Date(master): Fri Dec 7 17:51:50 CET 2012 on sn-devel-104 - (cherry picked from commit 16d725b4f5ed77db865e2a3c27ae0eb4accca5a8) - (cherry picked from commit 25eb1af07cc09e5e019a0702c60a763cc3266196) - -Index: lib/util/debug.c -=================================================================== ---- lib/util/debug.c.orig -+++ lib/util/debug.c -@@ -953,7 +953,7 @@ bool dbghdrclass(int level, int cls, con - slprintf(header_str + hs_len, - sizeof(header_str) -1 - hs_len, - ", class=%s", -- default_classname_table[cls]); -+ classname_table[cls]); - } - - /* Print it all out at once to prevent split syslog output. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2012-12-10 23:24:15.000000000 +0100 +++ new/patches/series 2013-01-23 13:09:04.000000000 +0100 @@ -5,7 +5,6 @@ # allows quilt to work in the usual way (= outside of our RPM spec file). # Samba patches from upstream, git.samba.org -samba.org/82db35cdb426355e4b7fd7ecf1ce9d9fca59ecd3 -p0 # bso 9471 # SuSE specific changes # disabled -> WIP lmuelle ++++++ samba-3.6.10.tar.bz2 -> samba-3.6.11.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/samba/samba-3.6.10.tar.bz2 /work/SRC/openSUSE:Factory/.samba.new/samba-3.6.11.tar.bz2 differ: char 11, line 1 ++++++ samba-client-rpmlintrc ++++++ addFilter("shlib-policy-name-error") ++++++ 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 2013-01-09 23:14:53.000000000 +0100 +++ new/vendor-files/tools/package-data 2013-01-23 15:21:44.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2905" +SAMBA_PACKAGE_SVN_VERSION="2915" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
