scabrero/samba
SHA256
1
0
Fork 0
forked from pool/samba
Code Pull Requests Activity

Accepting request 149788 from network:samba:STABLE

Browse Source 
- 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).

- 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).

- Disable SWAT during configure and don't package it any longer.

- Remove dangling references to Heimdal from the spec file.

- s3-printing: Add new printers to registry; (bso#8554); (bso#8612);

OBS-URL: https://build.opensuse.org/request/show/149788
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=128
This commit is contained in:
Stephan Kulow 2013-01-24 15:03:20 +00:00 committed by Git OBS Bridge
commit 155a1ac29e
9 changed files with 44 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-source-timestamp
View File

@ -1 +1 @@
SOURCE_TIMESTAMP="2905"
SOURCE_TIMESTAMP="2915"

4
patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5e3e511d3bf039aa5d91bc96fdebe3991e70fe7ebcad005c5d09748f9f20ffb
size 34080
oid sha256:0e5714878ae4dba0b16076a9a2911681bf0107cbc5f5624d564777eba23219ce
size 32906

3
samba-3.6.10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:088a47f77e45475f679bbccf715e126375e2fe490011e86c63e32ee7a24e26d1
size 29484832

3
samba-3.6.11.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f1ac4aa61ef4c94dc7fde83ddb5191d841ecbd80bc60db2be2624e1557eed09
size 29474702

1
samba-client-rpmlintrc Normal file
View File

@ -0,0 +1 @@
addFilter("shlib-policy-name-error")

48
samba-doc.spec
View File

@ -89,7 +89,7 @@ BuildRequires: libtalloc-devel
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 @@ BuildRequires: libtevent-devel
%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 @@ BuildRequires: ccache
################################
%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 @@ CONFIGURE_OPTIONS="\
--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 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer"
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 @@ cp -a docs/* %{buildroot}/%{DOCDIR}
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 @@ rm -f \
%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 @@ fi
%defattr(-,root,root)
%dir %{DOCDIR}
%dir %{_datadir}/samba
%dir %{SWATDIR}
%dir %{SWATDIR}/help
%doc %{_datadir}/susehelp
%endif

28
samba.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Wed Jan 23 12:10:57 UTC 2013 - lmuelle@suse.com
- 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 - lmuelle@suse.com
- 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 - lmuelle@suse.com
- Disable SWAT during configure and don't package it any longer.
-------------------------------------------------------------------
Fri Jan 18 17:34:55 UTC 2013 - lmuelle@suse.com
- Remove dangling references to Heimdal from the spec file.
-------------------------------------------------------------------
Wed Jan 9 21:53:11 UTC 2013 - lmuelle@suse.com
@ -366,7 +392,7 @@ Wed May 30 12:07:39 UTC 2012 - lmuelle@suse.com
- s3:registry: multiple cleanups, fixes, and optimisations.
- s3:auth/server_info: the primary rid should be in the groups rid array;
(bso#8798).
- s3-printing: Add new printers to registry; (bso#8554); (baso#8612);
- s3-printing: Add new printers to registry; (bso#8554); (bso#8612);
(bso#8748).
- Fix the overwriting of errno before use in a DEBUG statement and use the
return value from store_acl_blob_fsp rather than ignoring it; (bso#8945).

63
samba.spec
View File

@ -89,7 +89,7 @@ BuildRequires: libtalloc-devel
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 @@ BuildRequires: libtevent-devel
%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 @@ BuildRequires: ccache
################################
%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 @@ CONFIGURE_OPTIONS="\
--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 @@ install -d -m 0755 -p \
%{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 @@ install -m 0755 tools/update-apparmor-samba-profile \
# 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 @@ cp -a docs/* %{buildroot}/%{DOCDIR}
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 @@ fi
%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 @@ fi
%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 @@ fi
%{_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 @@ fi
%defattr(-,root,root)
%dir %{DOCDIR}
%dir %{_datadir}/samba
%dir %{SWATDIR}
%dir %{SWATDIR}/help
%doc %{_datadir}/susehelp
%endif

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b78afc2d3007c175a06efb80f5f66a579bec28dcb51e5e8bab84a17468d01a0
size 53487
oid sha256:22f081fe713c980e77f3796660591f0c43c3bb7686005907bad9b61a6be2b4b9
size 54026