diff --git a/build-source-timestamp b/build-source-timestamp index 46351d5..f7355ca 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -SOURCE_TIMESTAMP="2905" +SOURCE_TIMESTAMP="2908" diff --git a/patches.tar.bz2 b/patches.tar.bz2 index ab7e2a4..ab705a4 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5e3e511d3bf039aa5d91bc96fdebe3991e70fe7ebcad005c5d09748f9f20ffb -size 34080 +oid sha256:8d295dbe07ea5943e4634e22a6fc09e3a2e322c577c8744d5fc8554d6c550e05 +size 32058 diff --git a/samba-3.6.10.tar.bz2 b/samba-3.6.10.tar.bz2 deleted file mode 100644 index 783fe9c..0000000 --- a/samba-3.6.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:088a47f77e45475f679bbccf715e126375e2fe490011e86c63e32ee7a24e26d1 -size 29484832 diff --git a/samba-4.0.1.tar.bz2 b/samba-4.0.1.tar.bz2 new file mode 100644 index 0000000..bb9fb5d --- /dev/null +++ b/samba-4.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a17bc8f0e0c791af94552d2934208f16febd41d10341015152569b1d3df0df0 +size 17752256 diff --git a/samba-client-rpmlintrc b/samba-client-rpmlintrc new file mode 100644 index 0000000..47ff962 --- /dev/null +++ b/samba-client-rpmlintrc @@ -0,0 +1 @@ +setBadness('shlib-policy-name-error', 0) diff --git a/samba-doc.spec b/samba-doc.spec index bdf8cae..07781ba 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -89,7 +89,7 @@ BuildRequires: libtalloc-devel BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.10 +%define samba_ver 4.0.1 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -109,10 +109,10 @@ BuildRequires: libtevent-devel %define libtdb_name libtdb1 %define libtevent_name libtevent0 %if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211 -%define libldb_ver 1.0.2 -%define libtalloc_ver 2.0.5 -%define libtdb_ver 1.2.9 -%define libtevent_ver 0.9.11 +%define libldb_ver 1.1.13 +%define libtalloc_ver 2.0.7 +%define libtdb_ver 1.2.10 +%define libtevent_ver 0.9.17 %else %if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131 %define libldb_ver %{version} @@ -126,9 +126,9 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2905 +%define SOURCE_TIMESTAMP 2908 %define BRANCH %{version} -Version: 3.6.10 +Version: 4.0.1 Release: 0 %define ldapsmb_ver 1.34b Url: http://www.samba.org/ @@ -148,9 +148,9 @@ Source2: patches.tar.bz2 Source3: build-source-timestamp Source4: baselibs.conf Source11: http://www.samba.org/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 +Source100: samba-client-rpmlintrc # Choose some features / extra packages here ############################################ -%define make_devel 0 %define use_ccache 0 %if 0%{?use_ccache} > 0 BuildRequires: ccache @@ -247,8 +247,7 @@ else vendor_tag_release="" fi vendor_tag=$( echo -n "${vendor_tag_release}"; \ - echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}"; \ - test %{make_devel} -eq 1 && echo -n "devel-" || :) + echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}" ) # Create product suffix test 0%{?centos_version} -gt 0 && product_version=%{?centos_version} test 0%{?fedora_version} -gt 0 && product_version=%{?fedora_version} @@ -275,9 +274,10 @@ fi # Add the build architecture test "%{_build_arch}" != "" && \ product_suffix="${product_suffix}-%{_build_arch}" +popd # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file -mv VERSION VERSION.orig -sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION +###mv VERSION VERSION.orig +###sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION %endif %build samba-%{samba_ver_full} @@ -307,18 +307,17 @@ rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho] %endif CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ - --localstatedir=%{LOCKDIR} \ + --localstatedir=%{_localstatedir} \ --sysconfdir=%{CONFIGDIR} \ --with-configdir=%{CONFIGDIR} \ --libdir=%{_libdir} \ --with-lockdir=%{LOCKDIR} \ --with-logfilebase=%{LOGDIR} \ - --with-mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-modulesdir=%{_libdir}/samba \ - --with-rootsbindir=/sbin \ - --with-nmbdsocketdir=%{LOCKDIR} \ --enable-cups \ --enable-debug \ + --enable-fhs \ %if %{link_static_libs} --enable-static \ %else @@ -332,29 +331,17 @@ CONFIGURE_OPTIONS="\ --with-pam_smbpass \ --with-piddir=%{PIDDIR} \ --with-privatedir=%{CONFIGDIR} \ -%if %{make_devel} - --with-profiling-data \ -%endif --with-quotas \ - --with-swatdir=%{SWATDIR} \ --with-syslog \ --with-utmp \ --with-winbind \ --with-shared-modules=%{vfs_modules},%{idmap_modules} \ -%if %{make_devel} - --enable-developer \ - --enable-krb5developer \ -%endif " # 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" -%endif -./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} +./configure ${CONFIGURE_OPTIONS} ./script/mkversion.sh %endif @@ -381,6 +368,7 @@ grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} # SuSEhelp files install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop +install -d -m 0755 -p ../docs/htmldocs install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html popd for file in Samba3-ByExample Samba3-Developers-Guide Samba3-HOWTO; do @@ -393,7 +381,7 @@ 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}/ +mv COPYING README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/ # this is empty rm -rf docs/yodldocs rm -rf docs/manpages @@ -401,8 +389,8 @@ 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" +#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 diff --git a/samba.changes b/samba.changes index 9a9d368..f13a04d 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jan 17 18:07:11 UTC 2013 - lmuelle@suse.com + +- Remove /lib/samba prefix from the localstatedir configure option. + +------------------------------------------------------------------- +Tue Jan 15 12:12:17 UTC 2013 - lmuelle@suse.com + +- Update to 4.0.1. + + Samba 4.0.0 as an AD DC may provide authenticated users with write access + to LDAP directory objects; CVE-2013-0172; (bnc#798364). + ------------------------------------------------------------------- Wed Jan 9 21:53:11 UTC 2013 - lmuelle@suse.com @@ -9,6 +21,42 @@ Sun Dec 23 14:56:51 UTC 2012 - lmuelle@suse.com - Use the version macro while definition of the branch macro. +------------------------------------------------------------------- +Wed Dec 19 22:52:28 UTC 2012 - lmuelle@suse.com + +- Remove references to no longer used devel macros. + +------------------------------------------------------------------- +Tue Dec 11 18:42:04 UTC 2012 - lmuelle@suse.com + +- Update to 4.0.0. + + Honor password complexity settings; (bso#9414). + + Install SWAT *.msg files with waf; (bso#9415). + + Fix netr_ServerPasswordSet2, netr_LogonSamLogon with netlogon AES; + (bso#9438). + + developer-build: Fix panic when acl_xattr fails with access denied; + (bso#9456). + + Fix "map username script" with "security=ads" and Winbind; (bso#9457). + + Install manpages only if we install the target; (bso#9459). + + Respond correctly to FILE_STREAM_INFO requests; (bso#9460). + + Users can not be given write permissions any more by default; (bso#9462). + + Fix MMC crashes; (bso#9470). + + Fix SEGV when using second vfs module; (bso#9471). + + Support FIPS mode when building Samba; (bso#9479). + + Fix ACL on "cn=partitions,cn=configuration"; (bso#9481). + +------------------------------------------------------------------- +Tue Dec 11 11:41:59 UTC 2012 - lmuelle@suse.com + +- netr_ServerPasswordSet2, netr_LogonSamLogon with netlogon AES broken; + (bso#9438). +- s3:auth: fix create_token_from_sid() to not fail in the winbindd case; + (bso#9457). +- s4:dsdb/acl_read: return the nTSecurityDescriptor attr if the sd_flags + control is given; (bso#9470). +- Support FIPS mode when building Samba; (bso#9479). +- s4:provision: set the correct nTSecurityDescriptor; (bso#9481). + ------------------------------------------------------------------- Mon Dec 10 22:25:04 UTC 2012 - lmuelle@suse.com @@ -22,6 +70,14 @@ Mon Dec 10 11:24:52 UTC 2012 - lmuelle@suse.com + Fix segfault when "default devmode" is disabled; (bso#9433). + Fix segfaults in "log level = 10" on Solaris; (bso#9390). +------------------------------------------------------------------- +Sun Dec 9 00:05:32 UTC 2012 - lmuelle@suse.com + +- s3:smbd:vfs_acl: fix a PANIC when setting an ACL fails with ACCESS_DENIED; + (bso#9456). +- Install manpages only if we install the target; (bso#9459). +- Users can not be given write permissions any more by default; (bso#9462). + ------------------------------------------------------------------- Sat Dec 8 18:57:16 UTC 2012 - lmuelle@suse.com @@ -37,6 +93,12 @@ Sat Dec 8 18:57:16 UTC 2012 - lmuelle@suse.com - Allow to force DNS updates using net; (bso#9451). - Respond correctly to FILE_STREAM_INFO requests; (bso#9460). +------------------------------------------------------------------- +Fri Dec 7 15:48:52 UTC 2012 - lmuelle@suse.com + +- Update to 4.0.0rc6. + See WHATSNEW.txt from the samba-doc package. + ------------------------------------------------------------------- Tue Dec 4 14:29:48 UTC 2012 - lmuelle@suse.com @@ -79,6 +141,12 @@ Tue Nov 27 17:22:58 UTC 2012 - ddiss@suse.com - Fix spoolss segfault when default devmode is disabled; (bso#9433); (bnc#791183). +------------------------------------------------------------------- +Mon Nov 19 17:49:36 UTC 2012 - lmuelle@suse.com + +- Update to 4.0.0rc5. + See WHATSNEW.txt from the samba-doc package. + ------------------------------------------------------------------- Fri Nov 16 18:23:42 UTC 2012 - lmuelle@suse.com @@ -258,6 +326,27 @@ Mon Aug 6 19:40:23 UTC 2012 - lmuelle@suse.com - Fix bugs in SMB2 credit handling code; (bso#9057). - rpcclient: Fix bad call to data_blob_const; (bso#9062). +------------------------------------------------------------------- +Fri Jul 20 23:02:10 UTC 2012 - lmuelle@suse.com + +- Create missing doc directories while install. +- Remove no longer existing Manifest file from install. +- Don't creat a link to non existend html man pages for swat. +- Don't call the no longer existing libsmbclient testsuit while build. + +------------------------------------------------------------------- +Fri Jul 20 22:08:35 UTC 2012 - lmuelle@suse.com + +- Configure with option --mandir instead --with-mandir. +- Remove obsoleted --with-rootsbindir, --with-nmbdsocketdir, and + --with-swatdir configure options. + +------------------------------------------------------------------- +Thu Jul 19 11:12:48 UTC 2012 - lmuelle@suse.com + +- Update to 4.0.0beta4. + See WHATSNEW.txt from the samba-doc package. + ------------------------------------------------------------------- Mon Jul 16 14:35:39 UTC 2012 - lmuelle@suse.com @@ -273,6 +362,17 @@ Wed Jul 11 14:20:48 UTC 2012 - lmuelle@suse.com - Fix shell syntax in dhcpcd hook script; (bnc#769957). +------------------------------------------------------------------- +Wed Jun 27 21:22:11 UTC 2012 - lmuelle@suse.com + +- Add missing int declaration to the net kdc lookup patch. + +------------------------------------------------------------------- +Mon Jun 25 21:42:20 UTC 2012 - lmuelle@suse.com + +- Update to 4.0.0beta2. + See WHATSNEW.txt from the samba-doc package. + ------------------------------------------------------------------- Mon Jun 25 19:46:31 UTC 2012 - lmuelle@suse.com @@ -366,7 +466,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). diff --git a/samba.spec b/samba.spec index 57de28c..5b68e66 100644 --- a/samba.spec +++ b/samba.spec @@ -89,7 +89,7 @@ BuildRequires: libtalloc-devel BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.10 +%define samba_ver 4.0.1 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -109,10 +109,10 @@ BuildRequires: libtevent-devel %define libtdb_name libtdb1 %define libtevent_name libtevent0 %if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211 -%define libldb_ver 1.0.2 -%define libtalloc_ver 2.0.5 -%define libtdb_ver 1.2.9 -%define libtevent_ver 0.9.11 +%define libldb_ver 1.1.13 +%define libtalloc_ver 2.0.7 +%define libtdb_ver 1.2.10 +%define libtevent_ver 0.9.17 %else %if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131 %define libldb_ver %{version} @@ -126,9 +126,9 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2905 +%define SOURCE_TIMESTAMP 2908 %define BRANCH %{version} -Version: 3.6.10 +Version: 4.0.1 Release: 0 %define ldapsmb_ver 1.34b License: GPL-3.0+ @@ -151,13 +151,13 @@ Source2: patches.tar.bz2 Source3: build-source-timestamp Source4: baselibs.conf Source11: http://www.samba.org/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 +Source100: samba-client-rpmlintrc PreReq: /usr/bin/getent PreReq: /usr/sbin/groupadd PreReq: coreutils PreReq: grep # Choose some features / extra packages here ############################################ -%define make_devel 0 %define use_ccache 0 %if 0%{?use_ccache} > 0 BuildRequires: ccache @@ -675,7 +675,7 @@ Branch: %{BRANCH} %setup -n samba-%{samba_ver_full} -q # check if our library versions from the spec are still current %if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211 -grep "^VERSION = '%{libldb_ver}'$" source4/lib/ldb/wscript || \ +grep "^VERSION = '%{libldb_ver}'$" lib/ldb/wscript || \ exit 1 grep "^VERSION = '%{libtalloc_ver}'$" lib/talloc/wscript || \ exit 1 @@ -717,8 +717,7 @@ else vendor_tag_release="" fi vendor_tag=$( echo -n "${vendor_tag_release}"; \ - echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}"; \ - test %{make_devel} -eq 1 && echo -n "devel-" || :) + echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}" ) # Create product suffix test 0%{?centos_version} -gt 0 && product_version=%{?centos_version} test 0%{?fedora_version} -gt 0 && product_version=%{?fedora_version} @@ -745,9 +744,10 @@ fi # Add the build architecture test "%{_build_arch}" != "" && \ product_suffix="${product_suffix}-%{_build_arch}" +popd # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file -mv VERSION VERSION.orig -sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION +###mv VERSION VERSION.orig +###sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION %build %if 0%{?suse_version} && 0%{?suse_version} < 911 @@ -774,18 +774,17 @@ rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho] %endif CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ - --localstatedir=%{LOCKDIR} \ + --localstatedir=%{_localstatedir} \ --sysconfdir=%{CONFIGDIR} \ --with-configdir=%{CONFIGDIR} \ --libdir=%{_libdir} \ --with-lockdir=%{LOCKDIR} \ --with-logfilebase=%{LOGDIR} \ - --with-mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-modulesdir=%{_libdir}/samba \ - --with-rootsbindir=/sbin \ - --with-nmbdsocketdir=%{LOCKDIR} \ --enable-cups \ --enable-debug \ + --enable-fhs \ %if %{link_static_libs} --enable-static \ %else @@ -799,29 +798,17 @@ CONFIGURE_OPTIONS="\ --with-pam_smbpass \ --with-piddir=%{PIDDIR} \ --with-privatedir=%{CONFIGDIR} \ -%if %{make_devel} - --with-profiling-data \ -%endif --with-quotas \ - --with-swatdir=%{SWATDIR} \ --with-syslog \ --with-utmp \ --with-winbind \ --with-shared-modules=%{vfs_modules},%{idmap_modules} \ -%if %{make_devel} - --enable-developer \ - --enable-krb5developer \ -%endif " # 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" -%endif -./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} +./configure ${CONFIGURE_OPTIONS} ./script/mkversion.sh make samba3-idl make %{build_make_smp_mflags} \ @@ -859,7 +846,7 @@ TALLOC_LIBS=../../source3/bin/libtalloc.so.2 TALLOC_CFLAGS=-I../talloc/ ./config make popd -pushd source4/lib/ldb +pushd lib/ldb TALLOC_LIBS=../../../source3/bin/libtalloc.so.2 TALLOC_CFLAGS=-I../../../lib/talloc/ \ TEVENT_LIBS=../../../lib/tevent/bin/default/lib/tevent/libtevent.so TEVENT_CFLAGS=-I../../../lib/tevent/ \ TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include \ @@ -890,14 +877,8 @@ make test_shlibs make test_nss_modules make test_pam_modules popd -pushd testsuite/libsmbclient/src -make -popd %install -%if %{make_devel} - export NO_BRP_STRIP_DEBUG="true" -%endif install -d -m 0755 -p \ %{buildroot}/%{_sysconfdir}/{pam.d,xinetd.d,logrotate.d} \ %{buildroot}/%{_sysconfdir}/openldap/schema \ @@ -938,7 +919,7 @@ make install \ popd done # libldb -make -C source4/lib/ldb/ install \ +make -C lib/ldb/ install \ DESTDIR=%{buildroot} \ CONFIGDIR=%{CONFIGDIR} # we prefer the s3 binaries of the tdbtools @@ -1025,7 +1006,6 @@ for script in ${startScripts}; do >"%{buildroot}/%{_datadir}/omc/svcinfo.d/${script}.xml" done install -m 0755 tools/nmbstatus %{buildroot}/%{_bindir}/nmbstatus -pod2man tools/nmbstatus >%{buildroot}/%{_mandir}/man1/nmbstatus.1 install -m 0755 tools/update-apparmor-samba-profile \ %{buildroot}/%{_datadir}/samba/ # PDF generator @@ -1071,6 +1051,7 @@ done install -m 0644 docu/README.vendor %{buildroot}/%{DOCDIR}/README.%{VENDOR} # SuSEhelp files install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop +install -d -m 0755 -p ../docs/htmldocs install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html popd # libnss_wins.so @@ -1106,7 +1087,6 @@ install -m 0755 source3/bin/vfstest %{buildroot}/%{_bindir}/vfstest %endif %if %{make_ldapsmb} install -m 0700 ldapsmb-%{ldapsmb_ver}/ldapsmb %{buildroot}/%{_sbindir}/ -cp -a ldapsmb-%{ldapsmb_ver}/ldapsmb.5 %{buildroot}/%{_mandir}/man5 %endif # cups SMB support mkdir -p %{buildroot}/%{cups_lib_dir}/backend/ @@ -1117,7 +1097,7 @@ 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}/ +mv COPYING README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/ # this is empty rm -rf docs/yodldocs rm -rf docs/manpages @@ -1125,8 +1105,8 @@ 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" +#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 @@ -1393,7 +1373,6 @@ 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 @@ -1418,44 +1397,6 @@ fi %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml %dir %{_datadir}/samba %{_datadir}/samba/update-apparmor-samba-profile -%doc %{_mandir}/man1/smbstatus.1.* -%doc %{_mandir}/man5/smbpasswd.5.* -%doc %{_mandir}/man8/nmbd.8.* -%doc %{_mandir}/man8/smbd.8.* -%doc %{_mandir}/man8/swat.8.* -%doc %{_mandir}/man8/vfs_aio_fork.8.* -%doc %{_mandir}/man8/vfs_aio_pthread.8.* -%doc %{_mandir}/man8/vfs_acl_tdb.8.* -%doc %{_mandir}/man8/vfs_acl_xattr.8.* -%doc %{_mandir}/man8/vfs_audit.8.* -%doc %{_mandir}/man8/vfs_cacheprime.8.* -%doc %{_mandir}/man8/vfs_cap.8.* -%doc %{_mandir}/man8/vfs_catia.8.* -%doc %{_mandir}/man8/vfs_commit.8.* -%doc %{_mandir}/man8/vfs_crossrename.8.* -%doc %{_mandir}/man8/vfs_default_quota.8.* -%doc %{_mandir}/man8/vfs_dirsort.8.* -%doc %{_mandir}/man8/vfs_scannedonly.8.* -%doc %{_mandir}/man8/vfs_streams_depot.8.* -%doc %{_mandir}/man8/vfs_extd_audit.8.* -%doc %{_mandir}/man8/vfs_fake_perms.8.* -%doc %{_mandir}/man8/vfs_fileid.8.* -%doc %{_mandir}/man8/vfs_full_audit.8.* -%doc %{_mandir}/man8/vfs_gpfs.8.* -%doc %{_mandir}/man8/vfs_netatalk.8.* -%doc %{_mandir}/man8/vfs_notify_fam.8.* -%doc %{_mandir}/man8/vfs_prealloc.8.* -%doc %{_mandir}/man8/vfs_preopen.8.* -%doc %{_mandir}/man8/vfs_readahead.8.* -%doc %{_mandir}/man8/vfs_readonly.8.* -%doc %{_mandir}/man8/vfs_recycle.8.* -%doc %{_mandir}/man8/vfs_shadow_copy.8.* -%doc %{_mandir}/man8/vfs_shadow_copy2.8.* -%doc %{_mandir}/man8/vfs_smb_traffic_analyzer.8.* -%doc %{_mandir}/man8/vfs_streams_xattr.8.* -%doc %{_mandir}/man8/vfs_time_audit.8.* -%doc %{_mandir}/man8/vfs_xattr_tdb.8.* -%doc %{_mandir}/man8/smbta-util.8.* %if 0%{?suse_version} && 0%{?suse_version} < 1021 %{_includedir}/samba %endif @@ -1486,6 +1427,7 @@ fi %if 0%{?suse_version} && 0%{?suse_version} > 1100 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client %endif +%{_bindir}/dbwrap_tool %{_bindir}/eventlogadm %{_bindir}/findsmb %{_bindir}/net @@ -1526,35 +1468,7 @@ fi %ghost %{cups_lib_dir}/backend/smb %dir %{_libdir}/samba %{_libdir}/samba/charset -%{_libdir}/samba/lowcase.dat -%{_libdir}/samba/upcase.dat -%{_libdir}/samba/valid.dat -%doc %{_mandir}/man1/findsmb.1.* -%doc %{_mandir}/man1/nmblookup.1.* -%doc %{_mandir}/man1/nmbstatus.1.* -%doc %{_mandir}/man1/profiles.1.* -%doc %{_mandir}/man1/rpcclient.1.* -%doc %{_mandir}/man1/sharesec.1.* -%doc %{_mandir}/man1/smbcacls.1.* -%doc %{_mandir}/man1/smbcontrol.1.* -%doc %{_mandir}/man1/smbclient.1.* -%doc %{_mandir}/man1/smbcquotas.1.* -%doc %{_mandir}/man1/smbget.1.* -%doc %{_mandir}/man1/smbtar.1.* -%doc %{_mandir}/man1/smbtree.1.* -%doc %{_mandir}/man1/testparm.1.* -%doc %{_mandir}/man5/lmhosts.5.* -%doc %{_mandir}/man5/smb.conf.5.* -%doc %{_mandir}/man5/smbgetrc.5.* -%doc %{_mandir}/man7/samba.7.* -%doc %{_mandir}/man8/eventlogadm.8.* -%doc %{_mandir}/man8/net.8.* -%doc %{_mandir}/man8/pdbedit.8.* -%doc %{_mandir}/man8/smbpasswd.8.* -%doc %{_mandir}/man8/smbspool.8.* -%doc %{_mandir}/man8/tdbbackup.8.* -%doc %{_mandir}/man8/tdbdump.8.* -%doc %{_mandir}/man8/tdbtool.8.* +%{_datadir}/samba/codepages %if 0%{?suse_version} && 0%{?suse_version} < 1100 %dir %{_datadir}/omc %dir %{_datadir}/omc/svcinfo.d @@ -1580,10 +1494,6 @@ fi %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/55-samba-winbindd %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/55-samba-winbindd %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/samba-winbindd -%doc %{_mandir}/man1/ntlm_auth.1.* -%doc %{_mandir}/man1/wbinfo.1.* -%doc %{_mandir}/man5/pam_winbind.conf.5.* -%doc %{_mandir}/man8/winbindd.8.* %{_bindir}/ntlm_auth %{_bindir}/wbinfo %{_sbindir}/rcwinbind @@ -1592,17 +1502,6 @@ fi /%{_lib}/security/pam_winbind.so %{_libdir}/samba/idmap %{_libdir}/samba/nss_info -%doc %{_mandir}/man7/winbind_krb5_locator.7.* -%doc %{_mandir}/man8/idmap_ad.8.* -%doc %{_mandir}/man8/idmap_adex.8.* -%doc %{_mandir}/man8/idmap_autorid.8.* -%doc %{_mandir}/man8/idmap_hash.8.* -%doc %{_mandir}/man8/idmap_ldap.8.* -%doc %{_mandir}/man8/idmap_nss.8.* -%doc %{_mandir}/man8/idmap_rid.8.* -%doc %{_mandir}/man8/idmap_tdb.8.* -%doc %{_mandir}/man8/idmap_tdb2.8.* -%doc %{_mandir}/man8/pam_winbind.8.* %if 0%{?suse_version} && 0%{?suse_version} < 1100 %dir %{_datadir}/omc %dir %{_datadir}/omc/svcinfo.d @@ -1664,7 +1563,6 @@ fi %files -n %{libsmbclient_name} %defattr(-,root,root) %{_libdir}/libsmbclient.so.* -%doc %{_mandir}/man7/libsmbclient.7.* %files -n libsmbclient-devel %defattr(-,root,root) @@ -1769,7 +1667,6 @@ fi %files -n ldapsmb %defattr(-,root,root) %{_sbindir}/ldapsmb -%{_mandir}/man5/ldapsmb.5.* %endif %changelog diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 6ab1440..4ab6661 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b78afc2d3007c175a06efb80f5f66a579bec28dcb51e5e8bab84a17468d01a0 -size 53487 +oid sha256:32280058c8be3c6095d1fbd7f54d8e2289891837651d56ec6627c5babd9afb20 +size 53808