Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Mon Sep 19 15:22:28 CEST 2011.
-------- --- samba/samba.changes 2011-08-31 00:10:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2011-09-09 18:58:05.000000000 +0200 @@ -1,0 +2,26 @@ +Fri Sep 9 13:08:58 UTC 2011 - [email protected] + +- Spec file cleanup as suggested by the spec-cleaner tool. + + Make all BuildRequires, PreReq, and Provides a separate line. + + Use %{buildroot} instead of ${RPM_BUILD_ROOT}. + + Use straight commands instead of macros (make, install). + + Use -p in post and postun if we only call one command. + + Use %{_localstatedir} instead of %{_var} in the filelist. + + Remove superfluous AutoReqProv on lines. + +------------------------------------------------------------------- +Thu Sep 8 19:29:36 UTC 2011 - [email protected] + +- Remove %release from all Provides. + +------------------------------------------------------------------- +Thu Sep 1 20:54:52 UTC 2011 - [email protected] + +- Fix segfault in iconv.c which caused a null pointer dereference; (bso#8433). + +------------------------------------------------------------------- +Wed Aug 31 16:10:03 UTC 2011 - [email protected] + +- Use /var/run for the cifs state file in the init script too; (bnc#710304). + +------------------------------------------------------------------- @@ -217,0 +244,5 @@ + +------------------------------------------------------------------- +Wed Jul 20 11:05:27 CEST 2011 - [email protected] + +- Fix CUPS print job IDs; (bso#7288); (bnc#701257). calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.30zBve/_old 2011-09-19 15:22:20.000000000 +0200 +++ /var/tmp/diff_new_pack.30zBve/_new 2011-09-19 15:22:20.000000000 +0200 @@ -19,18 +19,34 @@ Name: samba-doc -BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel readline-devel +BuildRequires: cups-devel +BuildRequires: e2fsprogs-devel +BuildRequires: fam-devel +BuildRequires: libacl-devel +BuildRequires: pam-devel +BuildRequires: popt-devel +BuildRequires: readline-devel %if 0%{?suse_version} -BuildRequires: cracklib-devel openldap2-devel +BuildRequires: cracklib-devel +BuildRequires: openldap2-devel %endif %if 0%{?suse_version} > 1030 -BuildRequires: gdbm-devel pwdutils +BuildRequires: gdbm-devel +BuildRequires: pwdutils %endif %if 0%{?suse_version} > 930 -BuildRequires: krb5-devel libiniparser-devel libnscd-devel python-devel +BuildRequires: krb5-devel +BuildRequires: libiniparser-devel +BuildRequires: libnscd-devel +BuildRequires: python-devel %endif %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031 -BuildRequires: dmapi-devel libnscd-devel libxml2-devel mysql-devel postgresql-devel xfsprogs-devel +BuildRequires: dmapi-devel +BuildRequires: libnscd-devel +BuildRequires: libxml2-devel +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: xfsprogs-devel %endif %if 0%{?suse_version} > 830 && 0%{?suse_version} < 931 BuildRequires: heimdal-devel @@ -39,7 +55,9 @@ BuildRequires: cracklib-devel %endif %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} -BuildRequires: krb5-devel openldap-devel python-devel +BuildRequires: krb5-devel +BuildRequires: openldap-devel +BuildRequires: python-devel %endif %if 0%{?suse_version} > 1000 BuildRequires: keyutils-devel @@ -80,18 +98,20 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif +Version: 3.6.0 +Release: 4 Url: http://www.samba.org/ Version: 3.6.0 -Release: 3 +Release: 4 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other -AutoReqProv: on -Provides: samba-gplv3-doc = %{version}-%{release} +PreReq: coreutils +PreReq: findutils +Provides: samba-gplv3-doc = %{version} Obsoletes: samba-gplv3-doc < %{version} -Provides: samba-doc-gplv2 = %{version}-%{release} +Provides: samba-doc-gplv2 = %{version} Obsoletes: samba-doc-gplv2 < %{version} -PreReq: coreutils findutils BuildArch: noarch Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 Source1: vendor-files.tar.bz2 @@ -173,8 +193,8 @@ sed -e "s/VENDOR/%{VENDOR}/g" "${file}" >"${file}.new" && \ mv "${file}.new" "${file}" done -%__install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c -%__install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/ +install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c +install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/ # Create and add vendor suffix test -f vendor-files/tools/package-data && \ . vendor-files/tools/package-data @@ -233,7 +253,7 @@ %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" +export CFLAGS="%{optflags} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" %if %{use_ccache} export CC="ccache gcc" %endif @@ -299,15 +319,15 @@ # samba-doc nowadays is part the main samba spec file %if 0%{?suse_version} && 0%{?suse_version} < 1111 mkdir -p \ - ${RPM_BUILD_ROOT}/%{DOCDIR} \ - ${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \ - ${RPM_BUILD_ROOT}/%{SWATDIR}/help \ - ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System + %{buildroot}/%{DOCDIR} \ + %{buildroot}/%{DOCBOOKDIR} \ + %{buildroot}/%{SWATDIR}/help \ + %{buildroot}/%{_datadir}/susehelp/meta/Administration/System # utility scripts scripts="creategroup mksmbpasswd.sh" -%__install -d -m 0755 examples/scripts +install -d -m 0755 examples/scripts for i in $scripts; do - %__install -m 0755 "source3/script/${i}" examples/scripts/${i} + install -m 0755 "source3/script/${i}" examples/scripts/${i} done # configuration files pushd vendor-files @@ -316,10 +336,10 @@ echo "# samba-doc package is installed." >>config/smb.conf echo "# Date: $( date -I)" >>config/smb.conf grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf -%__install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} +install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} # SuSEhelp files -%__install -m 0644 docu/Samba.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop -%__install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html +install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop +install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html popd for file in Samba3-ByExample Samba3-Developers-Guide Samba3-HOWTO; do touch "${RPM_BUILD_ROOT}/%{SWATDIR}/help/${file}" @@ -327,21 +347,21 @@ cp -a swat/help/welcome.html "${RPM_BUILD_ROOT}/%{SWATDIR}/help" # pam_smbpass is missing cp -a source3/pam_smbpass/samples examples/pam_smbpass -%__install -m 0644 source3/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG -%__install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL -%__install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README -%__install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO -mv COPYING Manifest README Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/ +install -m 0644 source3/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG +install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL +install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README +install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO +mv COPYING Manifest README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/ # this is empty rm -rf docs/yodldocs rm -rf docs/manpages -cp -a docs/* ${RPM_BUILD_ROOT}/%{DOCDIR} -rm -rf "${RPM_BUILD_ROOT}/%{DOCBOOKDIR}" -cp -a examples/ ${RPM_BUILD_ROOT}/%{DOCDIR} -test -e "${RPM_BUILD_ROOT}/%{SWATDIR}/help/manpages" || \ - ln -s "%{DOCDIR}/htmldocs/manpages" "${RPM_BUILD_ROOT}/%{SWATDIR}/help" +cp -a docs/* %{buildroot}/%{DOCDIR} +rm -rf "%{buildroot}/%{DOCBOOKDIR}" +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 ${RPM_BUILD_ROOT}/%{SWATDIR}/help +pushd %{buildroot}/%{SWATDIR}/help for file in $( find -mindepth 1 -maxdepth 1); do file="${file#./}" case "${file}" in @@ -361,18 +381,18 @@ done popd # finally build filelist-samba-doc -for file in $( find ${RPM_BUILD_ROOT}%{DOCDIR} -maxdepth 1); do +for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do # exclude %{DOCDIR}, README, and docbook - case "${file#${RPM_BUILD_ROOT}}" in + case "${file#%{buildroot}}" in %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; esac - echo "%doc ${file#${RPM_BUILD_ROOT}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" + echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" done %if ! %{make_utils} # delete manpages if not packaged in utils-package rm -f \ - ${RPM_BUILD_ROOT}/%{_mandir}/man1/log2pcap.1* \ - ${RPM_BUILD_ROOT}/%{_mandir}/man1/vfstest.1* + %{buildroot}/%{_mandir}/man1/log2pcap.1* \ + %{buildroot}/%{_mandir}/man1/vfstest.1* %endif %endif @@ -414,7 +434,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2622 +Source Timestamp: 2630 Branch : trunk %changelog ++++++ samba.spec ++++++ ++++ 1185 lines (skipped) ++++ between samba/samba.spec ++++ and /mounts/work_src_done/STABLE/samba/samba.spec ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.30zBve/_old 2011-09-19 15:22:20.000000000 +0200 +++ /var/tmp/diff_new_pack.30zBve/_new 2011-09-19 15:22:20.000000000 +0200 @@ -1,2 +1,2 @@ -2622 +2630 Branch : trunk ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/7d2006ccf58555e82bc957aa62beab6420fcbc48 new/patches/samba.org/7d2006ccf58555e82bc957aa62beab6420fcbc48 --- old/patches/samba.org/7d2006ccf58555e82bc957aa62beab6420fcbc48 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/7d2006ccf58555e82bc957aa62beab6420fcbc48 2011-09-01 22:57:37.000000000 +0200 @@ -0,0 +1,22 @@ +commit 7d2006ccf58555e82bc957aa62beab6420fcbc48 +Author: Volker Lendecke <[email protected]> +Date: Thu Sep 1 16:55:03 2011 +0200 + + Fix bug 8433, segfault in iconv.c + + Autobuild-User: Volker Lendecke <[email protected]> + Autobuild-Date: Thu Sep 1 18:25:34 CEST 2011 on sn-devel-104 + (cherry picked from commit 1d4de78f567e908e0acc218630fceb0884b07d65) + +Index: lib/util/charset/iconv.c +=================================================================== +--- lib/util/charset/iconv.c.orig ++++ lib/util/charset/iconv.c +@@ -96,7 +96,6 @@ static struct charset_functions *find_ch + if(strcasecmp(c->name, name) == 0) { + return c; + } +- c = c->next; + } + + return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2011-08-31 00:04:20.000000000 +0200 +++ new/patches/series 2011-09-01 22:57:34.000000000 +0200 @@ -33,6 +33,7 @@ samba.org/a0a799663bd4780bb9f948e2dd0635dadb4e2c40 -p0 # bso 8412 samba.org/1a996fe1d12a55e68b7266ce5db8972b6e5f101a -p0 # bso 8420 samba.org/fc8c5880d9785103e3345781bfca48e67a92cc33 -p0 # bso 8428 +samba.org/7d2006ccf58555e82bc957aa62beab6420fcbc48 -p0 # bso 8433 # SuSE specific changes # disabled -> WIP lmuelle ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/cifs new/vendor-files/init/cifs --- old/vendor-files/init/cifs 2011-05-02 17:28:05.000000000 +0200 +++ new/vendor-files/init/cifs 2011-08-31 18:04:36.000000000 +0200 @@ -45,7 +45,7 @@ LC_ALL=en_US CIFSTAB="/etc/samba/cifstab" SMB_CONF="/etc/samba/smb.conf" -CIFS_STATE_FILE="/var/lock/subsys/cifs" +CIFS_STATE_FILE="/var/run/cifs" SLEEP=1 TIMEOUT=10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/cifs-1130 new/vendor-files/init/cifs-1130 --- old/vendor-files/init/cifs-1130 2011-05-02 17:28:05.000000000 +0200 +++ new/vendor-files/init/cifs-1130 2011-08-31 18:04:43.000000000 +0200 @@ -46,7 +46,7 @@ LC_ALL=en_US CIFSTAB="/etc/samba/cifstab" SMB_CONF="/etc/samba/smb.conf" -CIFS_STATE_FILE="/var/lock/subsys/cifs" +CIFS_STATE_FILE="/var/run/cifs" SLEEP=1 TIMEOUT=10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/smbfs new/vendor-files/init/smbfs --- old/vendor-files/init/smbfs 2011-05-02 17:28:05.000000000 +0200 +++ new/vendor-files/init/smbfs 2011-08-31 18:04:50.000000000 +0200 @@ -45,7 +45,7 @@ LC_ALL=en_US SMBFSTAB="/etc/samba/smbfstab" SMB_CONF="/etc/samba/smb.conf" -SMBFS_STATE_FILE="/var/lock/subsys/smbfs" +SMBFS_STATE_FILE="/var/run/smbfs" SLEEP=1 TIMEOUT=10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/smbfs-1010 new/vendor-files/init/smbfs-1010 --- old/vendor-files/init/smbfs-1010 2009-02-21 15:37:13.000000000 +0100 +++ new/vendor-files/init/smbfs-1010 2011-08-31 18:05:00.000000000 +0200 @@ -44,7 +44,7 @@ LC_ALL=en_US SMBFSTAB="/etc/samba/smbfstab" SMB_CONF="/etc/samba/smb.conf" -SMBFS_STATE_FILE="/var/lock/subsys/smbfs" +SMBFS_STATE_FILE="/var/run/smbfs" SLEEP=1 TIMEOUT=10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/smbfs-900 new/vendor-files/init/smbfs-900 --- old/vendor-files/init/smbfs-900 2009-02-21 15:37:13.000000000 +0100 +++ new/vendor-files/init/smbfs-900 2011-08-31 18:05:31.000000000 +0200 @@ -44,7 +44,7 @@ LC_ALL=en_US SMBFSTAB="/etc/samba/smbfstab" SMB_CONF="/etc/samba/smb.conf" -SMBFS_STATE_FILE="/var/lock/subsys/smbfs" +SMBFS_STATE_FILE="/var/run/smbfs" SLEEP=1 TIMEOUT=10 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 2011-08-31 00:07:01.000000000 +0200 +++ new/vendor-files/tools/package-data 2011-09-09 18:56:44.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2622" +SAMBA_PACKAGE_SVN_VERSION="2630" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
