diff --git a/patches.tar.bz2 b/patches.tar.bz2 index e792e18..ea4f7f1 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ca6bd8e5d6219ef608280c2d50878042e30a5038f4cbd570b1b7243100b7ebf -size 38021 +oid sha256:7a260c88a814e73f388bfe0cfc722a22e5817fe25227eeb219ae572d31946d7e +size 52307 diff --git a/samba-3.6.16.tar.gz b/samba-3.6.16.tar.gz deleted file mode 100644 index 973e61b..0000000 --- a/samba-3.6.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:347c0abe608ad907d04e37948d0f82a2d9dd8daeba13b0b78d7463b8d7b3fef4 -size 34108738 diff --git a/samba-4.0.7.tar.gz b/samba-4.0.7.tar.gz new file mode 100644 index 0000000..57fd24c --- /dev/null +++ b/samba-4.0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9ad36ff65a1d6b6a57f272aa08f844139ac2b5b1cb2257f1236aa2a8c864245 +size 22078244 diff --git a/samba-doc.spec b/samba-doc.spec index 7c488a1..e233f2e 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: samba-doc %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf @@ -34,6 +32,8 @@ BuildRequires: libattr-devel BuildRequires: libuuid-devel %endif BuildRequires: pam-devel +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Parse::Yapp) BuildRequires: popt-devel BuildRequires: readline-devel %if 0%{?suse_version} @@ -84,15 +84,27 @@ BuildRequires: fdupes %define pkgconfig_req pkgconfig %endif BuildRequires: %{pkgconfig_req} -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 BuildRequires: libldb-devel #!BuildIgnore: libtalloc BuildRequires: libtalloc-devel +BuildRequires: pytalloc-devel #!BuildIgnore: libtdb BuildRequires: libtdb-devel +BuildRequires: python-tdb BuildRequires: libtevent-devel +BuildRequires: python-tevent +# to generate the man pages +BuildRequires: docbook-xsl-stylesheets +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 +BuildRequires: libxslt %endif -%define samba_ver 3.6.16 +%if 0%{?suse_version} > 1140 && 0%{?suse_version} < 1211 +BuildRequires: libxslt1 +%endif +%if 0%{?suse_version} > 1210 +BuildRequires: libxslt-tools +%endif +%define samba_ver 4.0.7 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -105,33 +117,19 @@ BuildRequires: libtevent-devel %define libsmbclient_name libsmbclient0 %define libsmbsharemodes_name libsmbsharemodes0 %endif -%define libldb_name libldb1 %define libnetapi_name libnetapi0 %define libwbclient_name libwbclient0 -%define libtalloc_name libtalloc2 -%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 -%else -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131 -%define libldb_ver %{version} -%define libtalloc_ver %{version} -%define libtdb_ver %{version} -%define libtevent_ver %{version} -%endif -%endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %define build_make_smp_mflags %{?_smp_mflags} %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3035 +%define SOURCE_TIMESTAMP 3048 %define BRANCH %{version} -Version: 3.6.16 +%global with_mitkrb5 1 +%global with_dc 0 +%global with_get_printing_ticket 0 +Version: 4.0.7 Release: 0 Url: http://www.samba.org/ License: GPL-3.0+ @@ -148,16 +146,9 @@ Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.t Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source4: baselibs.conf +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 -%endif -# requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent -%define make_doc 0 -%define make_utils 0 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs %else @@ -186,7 +177,9 @@ BuildRequires: ccache %else %define NET_CFGDIR network-scripts %endif +%define auth_modules auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 %define idmap_modules idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_rid,idmap_tdb2 +%define pdb_modules pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 %define vfs_modules vfs_cacheprime,vfs_readahead %if 0%{?ul_version} >= 1 %define VENDOR UL @@ -221,12 +214,13 @@ for file in docs/htmldocs/index.html vendor-files/docu/README.vendor; do sed -e "s/VENDOR/%{VENDOR}/g" "${file}" >"${file}.new" && \ mv "${file}.new" "${file}" done +%if %with_get_printing_ticket install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c +%endif 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 -pushd source3 if test "%{_project}" != "openSUSE:Factory"; then vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \ while read tag release; do \ @@ -236,8 +230,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} @@ -263,7 +256,7 @@ test "%{_build_arch}" != "" && \ product_suffix="${product_suffix}-%{_build_arch}" # 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 +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} @@ -279,61 +272,50 @@ sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_ export SUSE_ASNEEDED=0 %endif export CFLAGS="%{optflags} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" -%if %{use_ccache} -export CC="ccache gcc" -%endif -pushd source3 %if 0%{?suse_version} && 0%{?suse_version} < 1141 %{?suse_update_config:%{suse_update_config -f}} %endif -# Ensure all idl is recompiled, in case we are carrying pidl changes locally. -rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho] -%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 -./autogen.sh -%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 \ - --disable-static \ + --enable-fhs \ --with-acl-support \ --with-automount \ + --with-ads \ --with-dnsupdate \ --with-pam \ --with-pammodulesdir=%{_lib}/security \ --with-pam_smbpass \ --with-piddir=%{PIDDIR} \ --with-privatedir=%{CONFIGDIR} \ -%if %{make_devel} - --with-profiling-data \ -%endif --with-quotas \ --with-syslog \ --with-utmp \ --with-winbind \ - --with-shared-modules=%{vfs_modules},%{idmap_modules} \ -%if %{make_devel} - --enable-developer \ - --enable-krb5developer \ + --with-shared-modules=%{auth_modules},%{vfs_modules},%{pdb_modules},%{idmap_modules} \ + --without-swat \ +%if %with_mitkrb5 + --with-system-mitkrb5 \ %endif - --disable-swat \ +%if ! %with_dc + --without-ad-dc \ +%endif + --bundled-libraries=!heimdal,!popt,!zlib,\ +!ldb,!pyldb,\ +!talloc,!pytalloc,!pytalloc-util,\ +!tdb,!pytdb,\ +!tevent,!pytevent \ " -unset CONFIGURE_OPTIONS_DEVEL -%if %{make_devel} -CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer" -%endif -./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} -./script/mkversion.sh +./configure ${CONFIGURE_OPTIONS} %endif %install @@ -358,6 +340,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 # pam_smbpass is missing @@ -366,7 +349,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 @@ -382,12 +365,6 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do esac 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 \ - %{buildroot}/%{_mandir}/man1/log2pcap.1* \ - %{buildroot}/%{_mandir}/man1/vfstest.1* -%endif %endif %pre diff --git a/samba.changes b/samba.changes index c054af9..420705f 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Fri Jul 12 13:07:11 UTC 2013 - lmuelle@suse.com + +- BuildRequire perl ExtUtils::MakeMaker and Parse::Yapp. +- BuildRequire libxslt, libxslt1, or libxslt-tools depending on SUSE version. +- Require perl-base on SUSE systems only. + +------------------------------------------------------------------- +Fri Jul 12 10:27:25 UTC 2013 - lmuelle@suse.com + +- Adjust group setting of the test-devel subpackage. +- Require perl-base from the pidl subpackage. + +------------------------------------------------------------------- +Fri Jul 12 10:11:50 UTC 2013 - lmuelle@suse.com + +- Remove libdir/samba/ldb after install if we're building Samba without + Active Directory Domain Controller support. + +------------------------------------------------------------------- +Thu Jul 11 21:31:07 UTC 2013 - lmuelle@suse.com + +- Remove unused ccache switch from the spec file. + +------------------------------------------------------------------- +Thu Jul 11 20:42:23 UTC 2013 - lmuelle@suse.com + +- BuildRequire docbook-xsl-stylesheets and libxslt-tools to build the + man pages and add them to the package again. + +------------------------------------------------------------------- +Thu Jul 11 16:20:32 UTC 2013 - lmuelle@suse.com + +- Build from the package from the top level directory; (bnc#794744). +- BuildRequire pytalloc-devel, python-tdb, and python-tevent. +- Also use out of tree builds of talloc, tdb, tevent, and ldb for pre-12.1 + SUSE systems. + ------------------------------------------------------------------- Fri Jul 5 18:48:26 UTC 2013 - lmuelle@suse.com @@ -5,9 +43,34 @@ Fri Jul 5 18:48:26 UTC 2013 - lmuelle@suse.com - Explicitly use samba instead of the name macro to define the docbook dir. ------------------------------------------------------------------- -Tue Jul 2 13:39:30 UTC 2013 - ddiss@suse.com +Tue Jul 2 09:49:54 UTC 2013 - lmuelle@suse.com -- PIDL: fix parsing linemarkers in preprocessor output; (bso#9636). +- Update to 4.0.7. + + Fix a core dump with invalid lock order while opening/editing + or copying MS files; (bso#9794). + + Fix crash bug from search of mail=; (bso#9967). + + + s3-rpc_server: Ensure we are root when starting and using gensec; + (bso#9465). + + Add support for MX queries; (bso#9485). + + dns: Delete dnsNode objects when they are empty; (bso#9559). + + dns: Support larger queries when asking forwarder; (bso#9632). + + s3:lib/server_mutex: Open mutex.tdb with CLEAR_IF_FIRST; (bso#9805). + + Use of wrong RFC2307 primary group field; (bso#9880). + + Check for system libtevent; (bso#9881). + + is_printer_published GUID retrieval; (bso#9900). + + Doc fixes for 4.0; (bso#9906). + + Build fixes for 4.0 found during autoconf or debian packaging work; + (bso#9907). + + build: Add missing new line to replaced python shebang line; (bso#9909). + + PIE builds not supported; (bso#9910). + + s4:winbind: Don't leak libnet_context into the main event context; + (bso#9929). + + Fix a bug of drvupgrade of smbcontrol; (bso#9941). + + Check for netbios aliases in ad_get_referrals; (bso#9947). + + Fix tevent_poll on 32-bit machines (Coverity ID 989236); (bso#9953). + + docs: Avoid mentioning a possibly misleading option; (bso#9964). + + Fix build with system Heimdal of samba4kgetcred; (bso#9968). ------------------------------------------------------------------- Mon Jul 1 17:34:32 UTC 2013 - lmuelle@suse.com @@ -36,81 +99,47 @@ Sun Jun 23 05:45:26 UTC 2013 - jengelh@inai.de - Explicitly BuildRequire cyrus-sasl-devel, libattr-devel, and libopenssl-devel. -------------------------------------------------------------------- -Fri Jun 21 13:47:37 UTC 2013 - lmuelle@suse.com - -- Update to 3.6.16. - + Fix crash bug during Win8 sync; (bso#9822). - + Properly handle Oplock breaks in compound requests; (bso#9722). - -------------------------------------------------------------------- -Fri Jun 21 10:30:16 UTC 2013 - lmuelle@suse.com - -- Fix crash bug during Win8 sync; (bso#9822). -- Check for system libtevent and link dbwrap_tool and dbwrap_torture against - it; (bso#9881). -- errno gets overwritten in call to check_parent_exists(); (bso#9927). -- Fix a bug of drvupgrade of smbcontrol; (bso#9941). - -------------------------------------------------------------------- -Tue Jun 18 17:14:00 UTC 2013 - ddiss@suse.com - -- Document idmap_ad rfc2307 attribute requirements; (bso#9880); (bnc#820531). - -------------------------------------------------------------------- -Fri Jun 14 09:59:26 UTC 2013 - lmuelle@suse.com - -- Don't package the SWAT man page while its build is disabled; (bnc#816647). - -------------------------------------------------------------------- -Thu Jun 6 11:43:31 UTC 2013 - lmuelle@suse.com - -- Don't install the tdb utilities man pages on post-12.1 systems; (bnc#823549). - ------------------------------------------------------------------- Wed Jun 5 11:45:41 UTC 2013 - ddiss@suse.com - Fix libreplace license ambiguity; (bso#8997); (bnc#765270). ------------------------------------------------------------------- -Tue May 28 11:59:59 UTC 2013 - lmuelle@suse.com +Wed May 22 11:32:46 UTC 2013 - lmuelle@suse.com -- s3-docs: Remove "experimental" label on "max protocol=SMB2" parameter; - (bso#9688). -- Remove the compound_related_in_progress state from the smb2 global state; - (bso#9722). -- Makefile: Don't know how to make LIBNDR_PREG_OBJ; (bso#9868). +- Update to 4.0.6. + + Fix crash during Win8 sync; (bso#9822). + + Fix segfault when loging in with wrong password from w2k8r2; (bso#9834). -------------------------------------------------------------------- -Thu May 23 14:17:41 UTC 2013 - ddiss@suse.com - -- Fix is_printer_published GUID retrieval; (bso#9900); (bnc#798856). - -------------------------------------------------------------------- -Wed May 8 12:18:20 UTC 2013 - lmuelle@suse.com - -- Update to 3.6.15. - + Fix crash bug in Winbind; (bso#9854). - -------------------------------------------------------------------- -Wed May 8 11:26:49 UTC 2013 - lmuelle@suse.com - -- Add support for PFC_FLAG_OBJECT_UUID when parsing packets; (bso#9382). -- Fix "guest ok", "force user" and "force group" for guest users; (bso#9746). -- Fix 'map untrusted to domain' with NTLMv2; (bso#9817); (bnc#817919). -- Fix crash bug in Winbind; (bso#9854). - -------------------------------------------------------------------- -Wed May 8 10:03:35 UTC 2013 - ddiss@suse.com - -- Fix panic in nt_printer_publish_ads; (bso#9830). - -------------------------------------------------------------------- -Mon Apr 29 12:21:15 UTC 2013 - lmuelle@suse.com - -- Update to 3.6.14. - + Certain xattrs cause Windows error 0x800700FF; (bso#9130). -- Exclude dbwrap_tool man page from the list of packaged files. + + Fix the username map optimization; (bso#9139). + + Add support for PFC_FLAG_OBJECT_UUID when parsing packets; (bso#9382). + + SMB2 server doesn't support recvfile; (bso#9412). + + Fix the build of vfs_notify_fam; (bso#9545). + + Fix adding case sensitive spn; (bso#9699). + + Properly handle oplock breaks in compound requests; (bso#9722). + + Properly handle oplock breaks in compound requests; (bso#9722). + + Cache name_to_sid/sid_to_name correctly; (bso#9766). + + Fix 'net ads join' when called via stdin; (bso#9767). + + Fix segfault for "artificial" conn_structs in vfs_fake_perms; (bso#9775). + + vfs_dirsort uses non-stackable calls, dirfd(), malloc instead of talloc and + doesn't cope with directories being modified whilst reading; (bso#9777). + + Fix panic when running 'smbtorture smb.base'; (bso#9782). + + Use specified python for runtime installation of Samba; (bso#9785). + + Change '--with-dmapi' to 'default=auto' to match the autoconf build; + (bso#9803). + + wafsamba: Display the default value in help for SAMBA3_ADD_OPTION; + (bso#9804). + + wbinfo: Fix segfault in wbinfo_pam_logon; (bso#9807). + + Package new dbwrap_tool man page; (bso#9809). + + Old DOS SMB CTEMP request uses a non-VFS function to access + the filesystem; (bso#9811). + + Fix 'map untrusted to domain' with NTLMv2; (bso#9817). + + SMB signing and the async echo responder don't work together; (bso#9824). + + Fix panic in nt_printer_publish_ads; (bso#9830). + + talloc use after free in winbind4; (bso#9832). + + Function called in unix_convert() path can overwrite errno; (bso#9833). + + Fix NULL pointer dereference in Winbind; (bso#9854). + + Fix making LIBNDR_PREG_OBJ; (bso#9868). ------------------------------------------------------------------- Fri Apr 26 15:54:50 UTC 2013 - lmuelle@suse.com @@ -118,69 +147,77 @@ Fri Apr 26 15:54:50 UTC 2013 - lmuelle@suse.com - Remove disabled and anyhow obsoleted net-report and net_rpc_migrate patches. ------------------------------------------------------------------- -Fri Apr 26 15:09:08 UTC 2013 - lmuelle@suse.com +Tue Apr 9 10:07:28 UTC 2013 - lmuelle@suse.com -- wbinfo: fix segfault in wbinfo_pam_logon; (bso#9807). -- docs: Fix missing entry in specfile; (bso#9809). -- Old DOS SMB CTEMP request uses a non-VFS function to access the filesystem; - (bso#9811). +- Update to 4.0.5. + + Fix large reads/writes from some Linux clients; (bso#9706). + + Add 'samba-tool dbcheck --reset-well-known-acls'; (bso#9740). + + Can't delegate adding computers to domain; (bso#9267). -------------------------------------------------------------------- -Thu Apr 18 18:38:43 UTC 2013 - lmuelle@suse.com + + Fix GNU ld version detection with old gcc releases; (bso#7825). + + Never try to map global SAM name; (bso#9039). + + Certain xattrs cause Windows error 0x800700FF; (bso#9130). + + Samba returns unexpected error on SMB posix open; (bso#9519). + + Fix build on AIX; (bso#9557). + + libnss-winbindd does not provide pass struct for groups mapped with + ID_TYPE_BOTH and vice versa; (bso#9617). + + Reauth-capable client fails to access shares on Windows member; (bso#9625). + + PIDL: Fix parsing linemarkers in preprocessor output; (bso#9636). + + Rename internal subsystem pdb_ldap to pdb_ldapsam; (bso#9639). + + Fix the build of vfs_afsacl; (bso#9642). + + Fix the build with --fake-kaserver; (bso#9643). + + Fix compile of source3/lib/afs.c; (bso#9644). + + Make SMB2_GETINFO multi-volume aware; (bso#9646). + + idmap_autorid: Fix freeing of non-talloced memory; (bso#9653). + + Work around FreeBSD's getaddrinfo() underscore issue; (bso#9656). + + 'make test' hangs; (bso#9663). + + Fix correct linking of libreplace with cmdline-credentials; (bso#9664). + + Fix filtering of link-local addresses; (bso#9666). + + Fix crash in 'net rpc join' against a Samba 3.0.33 PDC; (bso#9669). + + Samba denies owner Read Control when there is a DENY entry while W2K08 + does not; (bso#9674). + + Fix several resource (fd) leaks; (bso#9683). + + Fix a memory leak in spoolss rpc server; (bso#9685). + + Fix a possible buffer overrun in pdb_smbpasswd; (bso#9686). + + Fix several possible null pointer dereferences; (bso#9687). + + Make sure that domain joins work correctly when the DC disallows NTLM + auth; (bso#9689). + + Backport tevent changes to bring library to version 0.9.18; (bso#9695). + + Remove incomplete samba_dnsupdate IPv6 link-local address check; + (bso#9696). + + DsReplicaGetInfo fails due to sendto() EMSGSIZE error on UNIX + domain socket; (bso#9697). + + Fix vfs_catia and update documentation; (bso#9701). + + Fix build on solaris8: Do not force a specific perl on pod2man; (bso#9703). + + Fix nss_winbind name on FreeBSD; (bso#9704). + + s4:winbindd: Do not drop the workgroup name in the getgrnam, getgrent and + getgrgid calls; (bso#9711). + + Set LD_LIBRARY_PATH in install_with_python.sh; (bso#9717). + + s4-idmap: Remove requirement that posixAccount or posixGroup be set for + rfc2307; (bso#9718). + + Allow forcing an override of an old @MODULES record; (bso#9719). + + Do not print the admin password during 'samba-tool classicupgrade'; + (bso#9720). + + Make samba_upgradedns more robust (do not guess addresses when just + changing roles); (bso#9721). + + Add a tool to migrate latin1 printing tdbs to registry; (bso#9723). + + is_encrypted_packet() function incorrectly used inside server; (bso#9724). + + upgradeprovision and 'samba-tool dbcheck' patches for 4.0.NEXT; (bso#9725). + + Fix NULL pointer dereference; (bso#9727). + + DO NOT install samba_upgradeprovision in 4.0.x; (bso#9728). + + Fix 'smbcontrol close-share'; (bso#9733). + + Fix Winbind separator in upn to username conversion; (bso#9735). + + Change to smbd/dir.c code gives significant performance increases on large + directory listings; (bso#9736). + + PIDL: Build fixes for hosts without CPP (Solaris 11); (bso#9739). + + Make sure that we only propogate the INHERITED flag when we are allowed + to; (bso#9747). + + Remove unneeded fstat system call from hot read path; (bso#9748). + + Don't leak the epm_Map policy handle; (bso#9758). + + Fix incorrect parsing of SMB2 command codes; (bso#9760). -- Certain xattrs cause Windows error 0x800700FF; (bso#9130). -- Fix the username map optimization; (bso#9139); (bnc#815994). -- Fix adding case sensitive spn; (bso#9699). -- Add a tool to migrate latin1 printing tdb's to registry; (bso#9723). -- is_encrypted_packet() function incorrectly used inside server; (bso#9724). -- wkssvc: Fix NULL pointer dereference; (bso#9727). -- smbcontrol close-share is not working; (bso#9733). -- Fix winbind seperator in upn to username conversion; (bso#9735). -- Change to smbd/dir.c code gives significant performance increases on large directory listings; (bso#9736). -- When creating a directory Samba allows inherited bit to slip through; (bso#9747). -- Remove unneeded fstat system call from hot read path; (bso#9748). -- Cache name_to_sid/sid_to_name correctly; (bso#9766). -- vfs_fake_perms: Fix segfault for "artificial" conn_structs; (bso#9775). - -------------------------------------------------------------------- -Mon Apr 15 13:06:58 UTC 2013 - ddiss@suse.com - -- Don't modify the pidfile name when a custom config file path is used; - (bnc#812929). - -------------------------------------------------------------------- -Wed Apr 3 20:46:14 UTC 2013 - lmuelle@suse.com - -- Update to 3.6.13. - + Fix two resource leaks in winbindd; (bso#9684). - + Unlink after open causes smbd to panic; (bso#9571). - -------------------------------------------------------------------- -Wed Apr 3 19:30:33 UTC 2013 - lmuelle@suse.com - -- Fix GNU ld version detection with old gcc releases; (bso#7825). -- 'map untrusted to domain' treats WORKSTATION as bogus domain; (bso#9039). -- Add extra attributes for AD printer publishing; (bso#9378); (bnc#798856). -- Downgrade v4 printer driver requests to v3; (bso#9474). -- Samba returns unexpected error on SMB posix open; (bso#9519). -- Add support for posix_openpt; (bso#9541). -- Add dbwrap_tool.1 manual page; (bso#9568). -- Unlink after open causes smbd to panic; (bso#9571). -- Fix a possible null pointer dereference in spoolss; (bso#9574). -- Samba 3.6.x not correctly signing any but the last response in a compound - request/response; (bso#9585). -- "smbd[pid]: disk_free: sys_popen() failed" message logged in - /var/log/messages many times; (bso#9586). -- Archive flag is always set on directories; (bso#9587). -- ACLs are not inherited to directories for DFS shares; (bso#9588). -- wbcAuthenticateEx gives unix times; (bso#9625). -- Renaming directories as guest user in security share mode doesn't work; - (bso#9637). -- Make SMB2_GETINFO multi-volume aware; (bso#9646). -- Fix initial large PAC sess setup response; (bso#9658). -- Fix two resource leaks in winbindd; (bso#9684). -- Fix a possible buffer overrun in pdb_smbpasswd; (bso#9686). -- Fix vfs_catia module; (bso#9701). +- Update to 4.0.4. + + Remove forced set of 'create mask' to 0777; CVE-2013-1863; (bnc#809624). ------------------------------------------------------------------- Thu Mar 14 14:40:51 UTC 2013 - ddiss@suse.com @@ -210,21 +247,91 @@ Fri Feb 8 21:06:56 UTC 2013 - lmuelle@suse.com - Point LD_LIBRARY_PATH to the just-built libraries while calling testparm to generate the default share snippets on pre-12.2 systems. +------------------------------------------------------------------- +Fri Feb 8 11:34:33 UTC 2013 - ddiss@suse.com + +- Explicitly configure --with-ads. + ------------------------------------------------------------------- Thu Feb 7 15:30:36 UTC 2013 - ddiss@suse.com - Fix smbclient recursive mget EPERM handling; (bso#9633); (bnc#786350). +------------------------------------------------------------------- +Thu Feb 7 12:28:31 UTC 2013 - lmuelle@suse.com + +- Remove superfluous quotation marks while setting the + SAMBA_VERSION_VENDOR_SUFFIX string. + ------------------------------------------------------------------- Wed Feb 6 14:24:40 UTC 2013 - sjayaraman@suse.de - Do not restart the smbfs service on pre-11.3 systems during dhcp lease renewal when the IP address remains the same; (bnc#800782). +------------------------------------------------------------------- +Tue Feb 5 15:17:40 UTC 2013 - lmuelle@suse.com + +- Update to 4.0.3. + + Fix ACL problem with delegation of privileges and deletion of accounts + over LDAP interface; add documentation; (bso##8909). + + check_password_quality: Handle non-ASCII characters properly; (bso##9105). + + Fix 'smbd' panic triggered by unlink after open; (bso##9571). + + smbd: Fix memleak in the async echo handler; (bso##9549). + + + defer_open is triggered multiple times on the same request; (bso#9196). + + Add extra attributes for AD printer publishing; (bso#9378). + + FSMO seize of naming role fails: NT_STATUS_IO_TIMEOUT; (bso#9461). + + Downgrade v4 printer driver requests to v3; (bso#9474). + + samba_upgradeprovision: fix the nTSecurityDescriptor on more containers; + (bso#9481). + + s3:smb2_negprot: set the 'remote_proto' value; (bso#9499). + + waf assumes that pythonX.Y-config is a Python script; (bso#9503). + + s4:drsuapi: Make sure we report the meta data from the cycle start; + (bso#9508). + + wafsamba: Use additional xml catalog file; (bso#9512). + + samba_dnsupdate: Set KRB5_CONFIG for nsupdate command; (bso#9517). + + conn->share_access appears not be be reset between users; (bso#9518). + + Remove superfluous bracket in samba.8.xml; (bso#9528). + + Fix typo in vfs_tsmsm.8.xml; (bso#9530). + + terminate the irpc_servers_byname() result with + server_id_set_disconnected(); (bso#9540). + + Make use of posix_openpt; (bso#9541). + + Fix build of vfs_commit and plug in async pwrite support; (bso#9544). + + Fix aio_suspend detection on FreeBSD; (bso#9546). + + Correctly detect O_DIRECT; (bso#9548). + + sigprocmask does not work on FreeBSD to stop further signals in a signal + handler; (bso#9550). + + smb.conf(5): Update list of available protocols; (bso#9552). + + s4-resolve: Fix parsing of IPv6/AAAA in dns_lookup; (bso#9555). + + Fix compilation of Solaris ACL module; (bso#9564). + + Adding additional Samba 4.0 DC to W2k8 srv AD domain (in win200 functional + level) produces dbcheck errors; (bso#9565). + + Add dbwrap_tool.1 manual page; (bso#9568). + + Document the command line options in dbwrap_tool(1); (bso#9568). + + ntlm_auth(1): Fix format and make examples visible; (bso#9569). + + Fix file corruption during SMB1 read by Mac OSX 10.8.2 clients; + (bso#9572). + + Fix a possible null pointer dereference in spoolss; (bso#9574). + + Duplicate flags defined in the winbindd protocol; (bso#9575). + + gensec: Allow login without a PAC by default; (bso#9581). + + smbd: disk_free: sys_popen() failed" message logged in /var/log/message + many times; (bso#9586). + + Archive flag is always set on directories; (bso#9587). + + ACLs are not inherited to directories for DFS shares; (bso#9588). + + Correct meta data in ldb manpages; (bso#9591). + + s3-winbind: Fix the build of idmap_ldap; (bso#9595). + + Linked attribute handling should be by GUID; (bso#9596). + + Fix timeouts of some IRPC calls; (bso#9598). + + Use pid,task_id as cluster_id in process_single just like process_prefork; + (bso#9598). + + Add 'ldbdump' tool; general code and documentation cleanup; (bso#9609). + + dsdb: Make secrets_tdb_sync cope with -H secrets.ldb; (bso#9610). + ------------------------------------------------------------------- Thu Jan 31 16:51:30 UTC 2013 - lmuelle@suse.com -- Update to 3.6.12. +- Update to 4.0.2. + Address SWAT security issues CVE-2013-0213 and CVE-2013-0214 which both don't apply to any SUSE Samba post-3.6.10 as it isn't longer built. + Don't build and package static libraries. @@ -236,20 +343,16 @@ Thu Jan 31 16:14:06 UTC 2013 - lmuelle@suse.com Source Timestamp line. ------------------------------------------------------------------- -Wed Jan 23 12:10:57 UTC 2013 - lmuelle@suse.com +Wed Jan 23 15:53:50 UTC 2013 - ddiss@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). +- Add server-side copy support; (fate#314770). + + Implement FSCTL_SRV_COPYCHUNK and FSCTL_SRV_REQUEST_RESUME_KEY handlers. + + Add vfs_btrfs VFS module for optimized Btrfs clone-range ioctl usage. ------------------------------------------------------------------- -Wed Jan 23 11:23:42 UTC 2013 - lmuelle@suse.com +Mon Jan 21 22:29:32 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). +- Add filter against shlib-policy-name-error for /lib*/libnss_wins.so.2. ------------------------------------------------------------------- Mon Jan 21 11:02:35 UTC 2013 - lmuelle@suse.com @@ -262,9 +365,16 @@ Fri Jan 18 17:34:55 UTC 2013 - lmuelle@suse.com - Remove dangling references to Heimdal from the spec file. ------------------------------------------------------------------- -Thu Jan 17 12:34:31 UTC 2013 - ddiss@suse.com +Thu Jan 17 18:07:11 UTC 2013 - lmuelle@suse.com -- Fix AD printer publishing; (bso#9378); (bnc#798856). +- 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 @@ -277,6 +387,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 @@ -290,6 +436,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 @@ -305,6 +459,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 @@ -347,6 +507,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 @@ -526,6 +692,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 @@ -541,6 +728,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 diff --git a/samba.spec b/samba.spec index 8103d07..9465d9c 100644 --- a/samba.spec +++ b/samba.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf @@ -34,6 +32,8 @@ BuildRequires: libattr-devel BuildRequires: libuuid-devel %endif BuildRequires: pam-devel +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Parse::Yapp) BuildRequires: popt-devel BuildRequires: readline-devel %if 0%{?suse_version} @@ -84,15 +84,27 @@ BuildRequires: fdupes %define pkgconfig_req pkgconfig %endif BuildRequires: %{pkgconfig_req} -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 BuildRequires: libldb-devel #!BuildIgnore: libtalloc BuildRequires: libtalloc-devel +BuildRequires: pytalloc-devel #!BuildIgnore: libtdb BuildRequires: libtdb-devel +BuildRequires: python-tdb BuildRequires: libtevent-devel +BuildRequires: python-tevent +# to generate the man pages +BuildRequires: docbook-xsl-stylesheets +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 +BuildRequires: libxslt %endif -%define samba_ver 3.6.16 +%if 0%{?suse_version} > 1140 && 0%{?suse_version} < 1211 +BuildRequires: libxslt1 +%endif +%if 0%{?suse_version} > 1210 +BuildRequires: libxslt-tools +%endif +%define samba_ver 4.0.7 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -105,33 +117,19 @@ BuildRequires: libtevent-devel %define libsmbclient_name libsmbclient0 %define libsmbsharemodes_name libsmbsharemodes0 %endif -%define libldb_name libldb1 %define libnetapi_name libnetapi0 %define libwbclient_name libwbclient0 -%define libtalloc_name libtalloc2 -%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 -%else -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131 -%define libldb_ver %{version} -%define libtalloc_ver %{version} -%define libtdb_ver %{version} -%define libtevent_ver %{version} -%endif -%endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %define build_make_smp_mflags %{?_smp_mflags} %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3035 +%define SOURCE_TIMESTAMP 3048 %define BRANCH %{version} -Version: 3.6.16 +%global with_mitkrb5 1 +%global with_dc 0 +%global with_get_printing_ticket 0 +Version: 4.0.7 Release: 0 License: GPL-3.0+ Url: http://www.samba.org/ @@ -151,20 +149,13 @@ Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.t Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source4: baselibs.conf +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 -%endif -# requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent -%define make_doc 0 -%define make_utils 0 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs %else @@ -193,7 +184,9 @@ BuildRequires: ccache %else %define NET_CFGDIR network-scripts %endif +%define auth_modules auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 %define idmap_modules idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_rid,idmap_tdb2 +%define pdb_modules pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 %define vfs_modules vfs_cacheprime,vfs_readahead %if 0%{?ul_version} >= 1 %define VENDOR UL @@ -318,6 +311,7 @@ Branch: %{BRANCH} %endif +%if %with_get_printing_ticket %package krb-printing License: GPL-3.0+ Summary: Wrapper binary for kerberized printing @@ -335,24 +329,88 @@ A wrapper binary to run smbspool with the original calling UID. Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} +%endif -%if %{make_utils} +%package libs +License: GPL-3.0+ +Summary: Samba libraries +Group: Development/Libraries/C and C++ +Requires: krb5-libs +PreReq: /sbin/ldconfig -%package utils -Summary: debug tools -Group: Productivity/Networking/Samba -Provides: samba-gplv3-utils = %{version} -Obsoletes: samba-gplv3-utils < %{version} - -%description utils -Some of the debug-tools for developpers. +%description libs +The samba-libs package contains the libraries needed by programs that +link against the SMB, RPC and other protocols provided by the Samba suite. Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} +%package pidl +License: GPL-3.0+ +Summary: Perl IDL compiler +Group: Development/Tools +%if 0%{?suse_version} > 0 +Requires: perl-base %endif +Requires: perl(Parse::Yapp) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description pidl +The samba-pidl package contains the Perl IDL compiler used by Samba +and Wireshark to parse IDL and similar protocols + +Source Timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + + +%package python +License: GPL-3.0+ +Summary: Samba Python libraries +Group: Applications/System +Requires: %{name} = %{version} +Requires: python-tevent +Requires: python-tdb +Requires: pyldb +Requires: pytalloc + +%description python +The samba-python package contains the Python libraries needed by programs +that use SMB, RPC and other Samba provided protocols in Python programs. + +Source Timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + + +%package test +License: GPL-3.0+ +Summary: Testing tools for Samba servers and clients +Group: Applications/System +Requires: samba = %{version} +Requires: samba-winbind = %{version} +PreReq: /sbin/ldconfig + +%description test +samba-test provides testing tools for both the server and client +packages of Samba. + +Source Timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + + +%package test-devel +License: GPL-3.0+ +Summary: Testing devel files for Samba servers and clients +Group: Development/Libraries/C and C++ + +%description test-devel +samba-test-devel provides testing devel files for both the server and client +packages of Samba. + +Source Timestamp: %{SOURCE_TIMESTAMP} +Branch: %{BRANCH} + %package winbind License: GPL-3.0+ @@ -518,145 +576,8 @@ Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - -%package -n %{libtalloc_name} -Version: %{libtalloc_ver} -License: LGPL-3.0+ -Summary: Samba talloc Library -Group: System/Libraries -PreReq: /sbin/ldconfig - -%description -n %{libtalloc_name} -This package includes the talloc library. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - - -%package -n libtalloc-devel -Version: %{libtalloc_ver} -License: LGPL-3.0+ -Summary: Libraries and Header Files to Develop Programs with talloc Support -Group: Development/Libraries/C and C++ -BuildRequires: %{pkgconfig_req} -Requires: %{libtalloc_name} = %{libtalloc_ver} - -%description -n libtalloc-devel -This package contains the static libraries and header files needed to -develop programs which make use of the talloc programming interface. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - - -%package -n %{libtdb_name} -Version: %{libtdb_ver} -License: LGPL-3.0+ -Summary: Samba tdb Library -Group: System/Libraries -PreReq: /sbin/ldconfig - -%description -n %{libtdb_name} -This package includes the tdb library. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - - -%package -n libtdb-devel -Version: %{libtdb_ver} -License: LGPL-3.0+ -Summary: Libraries and Header Files to Develop Programs with tdb Support -Group: Development/Libraries/C and C++ -#BuildRequires: %{pkgconfig_req} -Requires: %{libtdb_name} = %{libtdb_ver} - -%description -n libtdb-devel -This package contains the static libraries and header files needed to -develop programs which make use of the tdb programming interface. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - - -%package -n %{libtevent_name} -Version: %{libtevent_ver} -License: LGPL-3.0+ -Summary: Samba tevent Library -Group: System/Libraries -PreReq: /sbin/ldconfig - -%description -n %{libtevent_name} -This package includes the tevent library. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - - -%package -n libtevent-devel -Version: %{libtevent_ver} -License: LGPL-3.0+ -Summary: Libraries and Header Files to Develop Programs with tevent Support -Group: Development/Libraries/C and C++ -BuildRequires: %{pkgconfig_req} -Requires: libtalloc-devel -Requires: %{libtevent_name} = %{libtevent_ver} - -%description -n libtevent-devel -This package contains the static libraries and header files needed to -develop programs which make use of the tevent programming interface. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - - -%package -n %{libldb_name} -Version: %{libldb_ver} -License: LGPL-3.0+ -Summary: Samba ldb Library -Group: System/Libraries -BuildRequires: popt-devel -PreReq: /sbin/ldconfig - -%description -n %{libldb_name} -This package includes the ldb library. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - - -%package -n libldb-devel -Version: %{libldb_ver} -License: LGPL-3.0+ -Summary: Libraries and Header Files to Develop Programs with ldb Support -Group: Development/Libraries/C and C++ -BuildRequires: %{pkgconfig_req} -Requires: %{libldb_name} = %{libldb_ver} -Requires: libtalloc-devel - -%description -n libldb-devel -This package contains the static libraries and header files needed to -develop programs which make use of the tevent programming interface. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} - -%endif - %prep %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 || \ - exit 1 -grep "^VERSION = '%{libtalloc_ver}'$" lib/talloc/wscript || \ - exit 1 -grep "^VERSION = '%{libtdb_ver}'$" lib/tdb/wscript || \ - exit 1 -grep "^VERSION = '%{libtevent_ver}'$" lib/tevent/wscript || \ - exit 1 -%endif # patches %setup -T -D -a 2 -n samba-%{samba_ver_full} -q for patch in $( patches/tools/guards %{guards_symbols} "${file}.new" && \ mv "${file}.new" "${file}" done +%if %with_get_printing_ticket install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c +%endif 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 -pushd source3 if test "%{_project}" != "openSUSE:Factory"; then vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \ while read tag release; do \ @@ -686,8 +608,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} @@ -713,7 +634,7 @@ test "%{_build_arch}" != "" && \ product_suffix="${product_suffix}-%{_build_arch}" # 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 +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 @@ -726,132 +647,58 @@ sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_ export SUSE_ASNEEDED=0 %endif export CFLAGS="%{optflags} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" -%if %{use_ccache} -export CC="ccache gcc" -%endif -pushd source3 %if 0%{?suse_version} && 0%{?suse_version} < 1141 %{?suse_update_config:%{suse_update_config -f}} %endif -# Ensure all idl is recompiled, in case we are carrying pidl changes locally. -rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho] -%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 -./autogen.sh -%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 \ - --disable-static \ + --enable-fhs \ --with-acl-support \ --with-automount \ + --with-ads \ --with-dnsupdate \ --with-pam \ --with-pammodulesdir=%{_lib}/security \ --with-pam_smbpass \ --with-piddir=%{PIDDIR} \ --with-privatedir=%{CONFIGDIR} \ -%if %{make_devel} - --with-profiling-data \ -%endif --with-quotas \ --with-syslog \ --with-utmp \ --with-winbind \ - --with-shared-modules=%{vfs_modules},%{idmap_modules} \ -%if %{make_devel} - --enable-developer \ - --enable-krb5developer \ + --with-shared-modules=%{auth_modules},%{vfs_modules},%{pdb_modules},%{idmap_modules} \ + --without-swat \ +%if %with_mitkrb5 + --with-system-mitkrb5 \ %endif - --disable-swat \ +%if ! %with_dc + --without-ad-dc \ +%endif + --bundled-libraries=!heimdal,!popt,!zlib,\ +!ldb,!pyldb,\ +!talloc,!pytalloc,!pytalloc-util,\ +!tdb,!pytdb,\ +!tevent,!pytevent \ " -unset CONFIGURE_OPTIONS_DEVEL -%if %{make_devel} -CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer" -%endif -./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} -./script/mkversion.sh -make samba3-idl +./configure ${CONFIGURE_OPTIONS} make %{build_make_smp_mflags} \ - all bin/smbfilter -popd + all -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - -for lib_dir in tdb talloc; do -pushd lib/${lib_dir} -./configure \ - --disable-symbol-versions \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} -make -popd -done - -pushd lib/tevent -TALLOC_LIBS=../../source3/bin/libtalloc.so.2 TALLOC_CFLAGS=-I../talloc/ ./configure \ - --disable-symbol-versions \ - --bundled-libraries=!talloc,ALL \ - --prefix=%{_prefix} \ - --localstatedir=%{LOCKDIR} \ - --sysconfdir=%{CONFIGDIR} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} -make -popd - -pushd source4/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 \ - ./configure \ - --disable-symbol-versions \ - --bundled-libraries=!popt \ - --prefix=%{_prefix} \ - --localstatedir=%{LOCKDIR} \ - --sysconfdir=%{CONFIGDIR} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --with-modulesdir=%{_libdir} -make -popd - -%endif - -%check -%if 0%{?suse_version} && 0%{?suse_version} < 1211 -for lib_dir in tdb talloc tevent; do -pushd lib/${lib_dir} -make test -popd -done -%endif -pushd source3 -make test_shlibs -make test_nss_modules -make test_pam_modules -popd -pushd testsuite/libsmbclient/src -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1211 - LD_LIBRARY_PATH=../../../source3/bin/ \ -%endif -make +pushd pidl +%{__perl} Makefile.PL INSTALLDIRS=vendor 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 \ @@ -882,50 +729,27 @@ install -d -m 0755 -p \ %{buildroot}/%{DOCBOOKDIR} \ %{buildroot}/%{_datadir}/susehelp/meta/Administration/System -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - -for lib_dir in tdb talloc tevent; do -pushd lib/${lib_dir} make install \ - DESTDIR=%{buildroot} + DESTDIR=%{buildroot} \ + CONFIGDIR=%{CONFIGDIR} + +# remove ildap.so and ldbsamba_extensions.so from %{_libdir}/samba/ldb +%if ! %with_dc +rm -r %{buildroot}/%{_libdir}/samba/ldb +%endif + +# Remove PIDL files from datadir +rm -r %{buildroot}/%{_datadir}/perl5 +# And install it into the perl vendor dirs +pushd pidl +make install PERL_INSTALL_ROOT=%{buildroot} popd -done -# libldb -make -C source4/lib/ldb/ install \ - DESTDIR=%{buildroot} \ - CONFIGDIR=%{CONFIGDIR} -# we prefer the s3 binaries of the tdbtools -rm %{buildroot}/%{_bindir}/tdb{backup,dump,restore,tool} -%else -rm docs/manpages/tdb*.8 -%endif +# Clean out files left behind by the PIDL install. +find %{buildroot}/%{perl_vendorlib} -type f -name .packlist -exec rm -f {} \; +rm %{buildroot}/%{perl_vendorlib}/wscript_build +rm -r %{buildroot}/%{perl_vendorlib}/Parse/Yapp -make -C source3/ install \ - DESTDIR=%{buildroot} \ - CONFIGDIR=%{CONFIGDIR} - -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - -# libtalloc -#rm %{buildroot}/%{_libdir}/*talloc* -make -C lib/talloc/ install \ - DESTDIR=%{buildroot} \ - CONFIGDIR=%{CONFIGDIR} -install -m 0644 source3/pkgconfig/talloc.pc %{buildroot}/%{_libdir}/pkgconfig -# libtevent -make -C lib/talloc/ install \ - DESTDIR=%{buildroot} \ - CONFIGDIR=%{CONFIGDIR} -rm -r %{buildroot}/%{python_sitearch} \ - %{buildroot}/%{_libdir}/ldb/lib{t*,p*} \ - %{buildroot}/%{_libdir}/tevent - -%endif - -for file in source3/pkgconfig/{netapi,smbclient,smbsharemodes,wbclient}.pc; do - install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig -done # utility scripts scripts="creategroup mksmbpasswd.sh" install -d -m 0755 examples/scripts @@ -1042,17 +866,11 @@ 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 -install -m 0755 nsswitch/libnss_wins.so %{buildroot}/%{_lib}/libnss_wins.so.2 # winbind stuff install -m 0644 examples/pam_winbind/pam_winbind.conf %{buildroot}/%{_sysconfdir}/security/pam_winbind.conf -install -m 0755 nsswitch/libnss_winbind.so %{buildroot}/%{_lib}/libnss_winbind.so.2 -# smbfilter -install -m 0755 source3/bin/smbfilter %{buildroot}/%{_bindir}/smbfilter -# smbget -install -m 0755 source3/bin/smbget %{buildroot}/%{_bindir}/smbget # install nsswitch-headers (for squid, etc. #FIXME) install -d -m 0755 \ %{buildroot}/%{_includedir}/samba/nsswitch \ @@ -1063,18 +881,6 @@ done for file in winbindd.h winbindd_proto.h; do install -m 0644 "source3/winbindd/${file}" %{buildroot}/%{_includedir}/samba/winbindd/${file} done -# install smbtorture and other test-programs -%if %{make_utils} -install -m 0755 source3/bin/debug2html %{buildroot}/%{_bindir}/debug2html -install -m 0755 source3/bin/log2pcap %{buildroot}/%{_bindir}/log2pcap -install -m 0755 source3/bin/smbtorture %{buildroot}/%{_bindir}/smbtorture -install -m 0755 source3/bin/talloctort %{buildroot}/%{_bindir}/talloctort -install -m 0755 source3/bin/msgtest %{buildroot}/%{_bindir}/msgtest -install -m 0755 source3/bin/maketest %{buildroot}/%{_bindir}/maketest -install -m 0755 source3/bin/locktest %{buildroot}/%{_bindir}/locktest -install -m 0755 source3/bin/nsstest %{buildroot}/%{_bindir}/nsstest -install -m 0755 source3/bin/vfstest %{buildroot}/%{_bindir}/vfstest -%endif # cups SMB support mkdir -p %{buildroot}/%{cups_lib_dir}/backend/ touch %{buildroot}/%{cups_lib_dir}/backend/smb @@ -1084,7 +890,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 @@ -1100,16 +906,6 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do esac 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 \ - %{buildroot}/%{_mandir}/man1/log2pcap.1* \ - %{buildroot}/%{_mandir}/man1/vfstest.1* -%endif -# find pam_winbind language files -%find_lang pam_winbind -cat pam_winbind.lang >> ${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-winbind -%find_lang net for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba done @@ -1199,9 +995,11 @@ if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then fi fi %endif +%if %with_get_printing_ticket if ! test -e %{_bindir}/get_printing_ticket; then ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb fi +%endif %{?fillup_only:%{fillup_only -nsd dhcp samba-client network}} %postun client @@ -1216,26 +1014,7 @@ fi %postun -n %{libwbclient_name} -p /sbin/ldconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - -%post -n %{libtalloc_name} -p /sbin/ldconfig - -%postun -n %{libtalloc_name} -p /sbin/ldconfig - -%post -n %{libtdb_name} -p /sbin/ldconfig - -%postun -n %{libtdb_name} -p /sbin/ldconfig - -%post -n %{libtevent_name} -p /sbin/ldconfig - -%postun -n %{libtevent_name} -p /sbin/ldconfig - -%post -n %{libldb_name} -p /sbin/ldconfig - -%postun -n %{libldb_name} -p /sbin/ldconfig - -%endif - +%if %with_get_printing_ticket %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 @@ -1256,6 +1035,19 @@ fi %verifyscript krb-printing %verify_permissions -e %{_bindir}/get_printing_ticket %endif +%endif + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%post pidl -p /sbin/ldconfig + +%postun pidl -p /sbin/ldconfig + +%post test -p /sbin/ldconfig + +%postun test -p /sbin/ldconfig %pre winbind # we need this group for squid (ntlmauth) @@ -1332,6 +1124,7 @@ fi %attr(0775,root,ntadmin) %{LOCKDIR}/drivers %{LOCKDIR}/netlogon %attr(0770,root,users) %dir %{LOCKDIR}/profiles +%exclude %{_datadir}/samba/swat %{_bindir}/smbstatus %{_sbindir}/nmbd %{_sbindir}/rcnmb @@ -1350,11 +1143,13 @@ fi %doc %{_mandir}/man5/smbpasswd.5.* %doc %{_mandir}/man8/nmbd.8.* %doc %{_mandir}/man8/smbd.8.* +%doc %{_mandir}/man8/smbta-util.8.* %exclude %{_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_aio_fork.8.* +%doc %{_mandir}/man8/vfs_aio_linux.8.* +%doc %{_mandir}/man8/vfs_aio_pthread.8.* %doc %{_mandir}/man8/vfs_audit.8.* %doc %{_mandir}/man8/vfs_cacheprime.8.* %doc %{_mandir}/man8/vfs_cap.8.* @@ -1363,13 +1158,12 @@ fi %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_media_harmony.8.* %doc %{_mandir}/man8/vfs_netatalk.8.* %doc %{_mandir}/man8/vfs_notify_fam.8.* %doc %{_mandir}/man8/vfs_prealloc.8.* @@ -1377,24 +1171,22 @@ fi %doc %{_mandir}/man8/vfs_readahead.8.* %doc %{_mandir}/man8/vfs_readonly.8.* %doc %{_mandir}/man8/vfs_recycle.8.* +%doc %{_mandir}/man8/vfs_scannedonly.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_depot.8.* %doc %{_mandir}/man8/vfs_streams_xattr.8.* %doc %{_mandir}/man8/vfs_time_audit.8.* +%doc %{_mandir}/man8/vfs_tsmsm.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 -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 +%exclude %{_mandir}/man8/samba-tool.8.* +%exclude %{_mandir}/man8/samba.8.* -%files devel -%defattr(-,root,root) -%{_includedir}/samba -%endif - -%files client -f net.lang +%files client %defattr(-,root,root) %if 0%{?suse_version} && 0%{?suse_version} < 1221 %attr(0754,root,root) %config %{INITDIR}/%{cifs_init_script} @@ -1423,10 +1215,17 @@ fi %if 0%{?suse_version} && 0%{?suse_version} > 1100 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client %endif +%{_bindir}/cifsdd +%{_bindir}/dbwrap_tool %{_bindir}/eventlogadm -%{_bindir}/findsmb %{_bindir}/net %{_bindir}/nmblookup +%{_bindir}/nmblookup4 +%{_bindir}/oLschema2ldif +%{_bindir}/regdiff +%{_bindir}/regpatch +%{_bindir}/regshell +%{_bindir}/regtree %{_bindir}/nmbstatus %{_bindir}/pdbedit %{_bindir}/profiles @@ -1434,9 +1233,9 @@ fi %{_bindir}/sharesec %{_bindir}/smbcacls %{_bindir}/smbclient +%{_bindir}/smbclient4 %{_bindir}/smbcontrol %{_bindir}/smbcquotas -%{_bindir}/smbfilter %{_bindir}/smbget %{_bindir}/smbpasswd %{_bindir}/smbprngenpdf @@ -1444,35 +1243,24 @@ fi %{_bindir}/smbtar %{_bindir}/smbtree %{_bindir}/testparm -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1211 -%{_bindir}/ldbadd -%{_bindir}/ldbdel -%{_bindir}/ldbedit -%{_bindir}/ldbmodify -%{_bindir}/ldbrename -%{_bindir}/ldbsearch -%{_bindir}/tdbbackup -%{_bindir}/tdbdump -%{_bindir}/tdbrestore -%{_bindir}/tdbtool -%doc %{_mandir}/man8/tdbbackup.8.* -%doc %{_mandir}/man8/tdbdump.8.* -%doc %{_mandir}/man8/tdbtool.8.* -%endif -/%{_lib}/libnss_wins.so.2 %dir %{cups_lib_dir} %dir %{cups_lib_dir}/backend %ghost %{cups_lib_dir}/backend/smb +%{_libdir}/libnss_wins.so.* %dir %{_libdir}/samba %{_libdir}/samba/charset -%{_libdir}/samba/lowcase.dat -%{_libdir}/samba/upcase.dat -%{_libdir}/samba/valid.dat -%exclude %{_mandir}/man1/dbwrap_tool.1.* +%doc %{_mandir}/man1/dbwrap_tool.1.* %doc %{_mandir}/man1/findsmb.1.* +%doc %{_mandir}/man1/log2pcap.1.* %doc %{_mandir}/man1/nmblookup.1.* +%doc %{_mandir}/man1/nmblookup4.1.* %doc %{_mandir}/man1/nmbstatus.1.* +%doc %{_mandir}/man1/oLschema2ldif.1.* %doc %{_mandir}/man1/profiles.1.* +%doc %{_mandir}/man1/regdiff.1.* +%doc %{_mandir}/man1/regpatch.1.* +%doc %{_mandir}/man1/regshell.1.* +%doc %{_mandir}/man1/regtree.1.* %doc %{_mandir}/man1/rpcclient.1.* %doc %{_mandir}/man1/sharesec.1.* %doc %{_mandir}/man1/smbcacls.1.* @@ -1492,6 +1280,7 @@ fi %doc %{_mandir}/man8/pdbedit.8.* %doc %{_mandir}/man8/smbpasswd.8.* %doc %{_mandir}/man8/smbspool.8.* +%{_datadir}/samba/codepages %dir %{_datadir}/samba %dir %{_datadir}/samba/LDAP %config %{_datadir}/samba/LDAP/samba-nds.schema @@ -1503,6 +1292,193 @@ fi %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} %ghost %dir %{PIDDIR} +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 + +%files devel +%defattr(-,root,root) +%{_includedir}/samba +%{_includedir}/samba-4.0 +%exclude %{_includedir}/samba-4.0/libsmbclient.h +%exclude %{_includedir}/samba-4.0/netapi.h +%exclude %{_includedir}/samba-4.0/smb_share_modes.h +%exclude %{_includedir}/samba-4.0/torture.h +%exclude %{_includedir}/samba-4.0/wbclient.h +%{_libdir}/libdcerpc-atsvc.so +%{_libdir}/libdcerpc-binding.so +%{_libdir}/libdcerpc-samr.so +%{_libdir}/libdcerpc.so +%{_libdir}/libgensec.so +%{_libdir}/libndr-krb5pac.so +%{_libdir}/libndr-nbt.so +%{_libdir}/libndr-standard.so +%{_libdir}/libndr.so +%{_libdir}/libnss_winbind.so +%{_libdir}/libnss_wins.so +%{_libdir}/libpdb.so +%{_libdir}/libregistry.so +%{_libdir}/libsamba-credentials.so +%{_libdir}/libsamba-hostconfig.so +%{_libdir}/libsamba-policy.so +%{_libdir}/libsamba-util.so +%{_libdir}/libsamdb.so +%{_libdir}/libsmbclient-raw.so +%{_libdir}/libsmbconf.so +%{_libdir}/libsmbldap.so +%{_libdir}/libtevent-util.so +%{_libdir}/pkgconfig/dcerpc.pc +%{_libdir}/pkgconfig/dcerpc_atsvc.pc +%{_libdir}/pkgconfig/dcerpc_samr.pc +%{_libdir}/pkgconfig/gensec.pc +%{_libdir}/pkgconfig/ndr.pc +%{_libdir}/pkgconfig/ndr_krb5pac.pc +%{_libdir}/pkgconfig/ndr_nbt.pc +%{_libdir}/pkgconfig/ndr_standard.pc +%{_libdir}/pkgconfig/registry.pc +%{_libdir}/pkgconfig/samba-credentials.pc +%{_libdir}/pkgconfig/samba-hostconfig.pc +%{_libdir}/pkgconfig/samba-policy.pc +%{_libdir}/pkgconfig/samba-util.pc +%{_libdir}/pkgconfig/samdb.pc +%{_libdir}/pkgconfig/smbclient-raw.pc +%endif + +%files libs +%defattr(-,root,root,-) +%{_libdir}/libdcerpc-atsvc.so.* +%{_libdir}/libdcerpc-binding.so.* +%{_libdir}/libdcerpc-samr.so.* +%{_libdir}/libdcerpc.so.* +%{_libdir}/libgensec.so.* +%{_libdir}/libndr-krb5pac.so.* +%{_libdir}/libndr-nbt.so.* +%{_libdir}/libndr-standard.so.* +%{_libdir}/libndr.so.* +%{_libdir}/libpdb.so.* +%{_libdir}/libregistry.so.* +%{_libdir}/libsamba-credentials.so.* +%{_libdir}/libsamba-hostconfig.so.* +%{_libdir}/libsamba-policy.so.* +%{_libdir}/libsamba-util.so.* +%{_libdir}/libsamdb.so.* +%{_libdir}/libsmbclient-raw.so.* +%{_libdir}/libsmbconf.so.* +%{_libdir}/libsmbldap.so.* +%{_libdir}/libtevent-util.so.* +%dir %{_libdir}/samba +%{_libdir}/samba/libCHARSET3.so +%{_libdir}/samba/libLIBWBCLIENT_OLD.so +%{_libdir}/samba/libMESSAGING.so +%{_libdir}/samba/libaddns.so +%{_libdir}/samba/libads.so +%{_libdir}/samba/libasn1util.so +%{_libdir}/samba/libauth.so +%{_libdir}/samba/libauth4.so +%{_libdir}/samba/libauth_sam_reply.so +%{_libdir}/samba/libauth_unix_token.so +%{_libdir}/samba/libauthkrb5.so +%{_libdir}/samba/libccan.so +%{_libdir}/samba/libcli-ldap-common.so +%{_libdir}/samba/libcli-ldap.so +%{_libdir}/samba/libcli-nbt.so +%{_libdir}/samba/libcli_cldap.so +%{_libdir}/samba/libcli_smb_common.so +%{_libdir}/samba/libcli_spoolss.so +%{_libdir}/samba/libcliauth.so +%{_libdir}/samba/libcluster.so +%{_libdir}/samba/libcmdline-credentials.so +%{_libdir}/samba/libdbwrap.so +%{_libdir}/samba/libdcerpc-samba.so +%{_libdir}/samba/libdcerpc-samba4.so +%{_libdir}/samba/libdfs_server_ad.so +%{_libdir}/samba/libdsdb-module.so +%{_libdir}/samba/liberrors.so +%{_libdir}/samba/libevents.so +%{_libdir}/samba/libflag_mapping.so +%{_libdir}/samba/libgpo.so +%{_libdir}/samba/libgse.so +%{_libdir}/samba/libidmap.so +%{_libdir}/samba/libinterfaces.so +%{_libdir}/samba/libkrb5samba.so +%{_libdir}/samba/libldb-cmdline.so +%{_libdir}/samba/libldbsamba.so +%{_libdir}/samba/liblibcli_lsa3.so +%{_libdir}/samba/liblibcli_netlogon3.so +%{_libdir}/samba/liblibsmb.so +%{_libdir}/samba/libmsrpc3.so +%{_libdir}/samba/libndr-samba.so +%{_libdir}/samba/libndr-samba4.so +%{_libdir}/samba/libnet_keytab.so +%{_libdir}/samba/libnetif.so +%{_libdir}/samba/libnpa_tstream.so +%{_libdir}/samba/libnss_info.so +%{_libdir}/samba/libpopt_samba3.so +%{_libdir}/samba/libprinting_migrate.so +%{_libdir}/samba/libreplace.so +%{_libdir}/samba/libsamba-modules.so +%{_libdir}/samba/libsamba-net.so +%{_libdir}/samba/libsamba-security.so +%{_libdir}/samba/libsamba-sockets.so +%{_libdir}/samba/libsamba3-util.so +%{_libdir}/samba/libsamba_python.so +%{_libdir}/samba/libsamdb-common.so +%{_libdir}/samba/libsecrets3.so +%{_libdir}/samba/libserver-role.so +%{_libdir}/samba/libshares.so +%{_libdir}/samba/libsmb_transport.so +%{_libdir}/samba/libsmbd_base.so +%{_libdir}/samba/libsmbd_conn.so +%{_libdir}/samba/libsmbd_shim.so +%{_libdir}/samba/libsmbldaphelper.so +%{_libdir}/samba/libsmbpasswdparser.so +%{_libdir}/samba/libsmbregistry.so +%{_libdir}/samba/libsubunit.so +%{_libdir}/samba/libtdb-wrap.so +%{_libdir}/samba/libtdb_compat.so +%{_libdir}/samba/libtrusts_util.so +%{_libdir}/samba/libutil_cmdline.so +%{_libdir}/samba/libutil_reg.so +%{_libdir}/samba/libutil_setid.so +%{_libdir}/samba/libutil_tdb.so +%{_libdir}/samba/libwinbind-client.so +%{_libdir}/samba/libxattr_tdb.so +%dir %{_libdir}/samba/pdb +%{_libdir}/samba/pdb/ldapsam.so +%{_libdir}/samba/pdb/smbpasswd.so +%{_libdir}/samba/pdb/tdbsam.so +%{_libdir}/samba/pdb/wbc_sam.so + +%files pidl +%defattr(-,root,root,-) +%dir %{perl_vendorlib}/Parse +%{perl_vendorlib}/Parse/Pidl* +%{_mandir}/man1/pidl* +%{_mandir}/man3/Parse::Pidl* +%attr(755,root,root) %{_bindir}/pidl + +%files python +%defattr(-,root,root,-) +%{python_sitearch}/* + +%files test +%defattr(-,root,root,-) +%{_bindir}/gentest +%{_bindir}/locktest +%{_bindir}/masktest +%{_bindir}/ndrdump +%{_bindir}/smbtorture +%{_libdir}/libtorture.so.* +%doc %{_mandir}/man1/gentest.1.* +%doc %{_mandir}/man1/locktest.1.* +%doc %{_mandir}/man1/masktest.1.* +%doc %{_mandir}/man1/ndrdump.1.* +%doc %{_mandir}/man1/smbtorture.1.* +%doc %{_mandir}/man1/vfstest.1.* + +%files test-devel +%defattr(-,root,root,-) +%{_includedir}/samba-4.0/torture.h +%{_libdir}/libtorture.so +%{_libdir}/pkgconfig/torture.pc %files winbind -f filelist-samba-winbind %defattr(-,root,root) @@ -1511,21 +1487,20 @@ 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 %{_sbindir}/winbindd -/%{_lib}/libnss_winbind.so.2 /%{_lib}/security/pam_winbind.so +%{_libdir}/libnss_winbind.so.* %{_libdir}/samba/idmap %{_libdir}/samba/nss_info +%{_libdir}/winbind_krb5_locator.so +%doc %{_mandir}/man1/ntlm_auth.1.* +%doc %{_mandir}/man1/wbinfo.1.* %doc %{_mandir}/man7/winbind_krb5_locator.7.* +%doc %{_mandir}/man5/pam_winbind.conf.5.* %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.* @@ -1534,29 +1509,13 @@ fi %doc %{_mandir}/man8/idmap_tdb.8.* %doc %{_mandir}/man8/idmap_tdb2.8.* %doc %{_mandir}/man8/pam_winbind.8.* +%doc %{_mandir}/man8/winbindd.8.* %if 0%{?suse_version} && 0%{?suse_version} < 1100 %dir %{_datadir}/omc %dir %{_datadir}/omc/svcinfo.d %endif %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/winbind.xml %attr(0750,root,winbind) %dir %{LOCKDIR}/winbindd_privileged -%if %{make_utils} - -%files utils -%defattr(-,root,root) -%{_bindir}/debug2html -%{_bindir}/log2pcap -%{_bindir}/locktest -%{_bindir}/locktest2 -%{_bindir}/masktest -%{_bindir}/msgtest -%{_bindir}/nsstest -%{_bindir}/smbtorture -%{_bindir}/talloctort -%{_bindir}/vfstest -%doc %{_mandir}/man1/log2pcap.1.* -%doc %{_mandir}/man1/vfstest.1.* -%endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %files doc -f filelist-samba-doc @@ -1565,6 +1524,7 @@ fi %doc %{_datadir}/susehelp %endif +%if %with_get_printing_ticket %files krb-printing %defattr(-,root,root) %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 @@ -1575,6 +1535,7 @@ fi %dir %{cups_lib_dir} %dir %{cups_lib_dir}/backend %ghost %{cups_lib_dir}/backend/smb +%endif %files -n %{libnetapi_name} %defattr(-,root,root) @@ -1582,20 +1543,20 @@ fi %files -n libnetapi-devel %defattr(-,root,root) -%{_includedir}/netapi.h +%{_includedir}/samba-4.0/netapi.h %{_libdir}/libnetapi.so %{_libdir}/pkgconfig/netapi.pc %files -n %{libsmbclient_name} %defattr(-,root,root) %{_libdir}/libsmbclient.so.* -%doc %{_mandir}/man7/libsmbclient.7.* %files -n libsmbclient-devel %defattr(-,root,root) -%{_includedir}/libsmbclient.h +%{_includedir}/samba-4.0/libsmbclient.h %{_libdir}/libsmbclient.so %{_libdir}/pkgconfig/smbclient.pc +%{_mandir}/man7/libsmbclient.7.* %files -n %{libsmbsharemodes_name} %defattr(-,root,root) @@ -1603,77 +1564,18 @@ fi %files -n libsmbsharemodes-devel %defattr(-,root,root) -%{_includedir}/smb_share_modes.h +%{_includedir}/samba-4.0/smb_share_modes.h %{_libdir}/libsmbsharemodes.so %{_libdir}/pkgconfig/smbsharemodes.pc -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - -%files -n %{libtalloc_name} -%defattr(-,root,root) -%{_libdir}/libpytalloc-util.so.* -%{_libdir}/libtalloc.so.* - -%files -n libtalloc-devel -%defattr(-,root,root) -%{_includedir}/pytalloc.h -%{_includedir}/talloc.h -%{_libdir}/libpytalloc-util.so -%{_libdir}/libtalloc.so -%{_libdir}/pkgconfig/pytalloc-util.pc -%{_libdir}/pkgconfig/talloc.pc - -%files -n %{libtdb_name} -%defattr(-,root,root) -%{_libdir}/libtdb.so.* - -%files -n libtdb-devel -%defattr(-,root,root) -%{_includedir}/tdb.h -%{_libdir}/libtdb.so -%{_libdir}/pkgconfig/tdb.pc - -%endif - %files -n %{libwbclient_name} %defattr(-,root,root) %{_libdir}/libwbclient.so.* %files -n libwbclient-devel %defattr(-,root,root) -%{_includedir}/wbclient.h +%{_includedir}/samba-4.0/wbclient.h %{_libdir}/libwbclient.so %{_libdir}/pkgconfig/wbclient.pc -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - -%files -n %{libtevent_name} -%defattr(-,root,root) -%{_libdir}/libtevent.so.* - -%files -n libtevent-devel -%defattr(-,root,root) -%{_includedir}/tevent.h -%{_includedir}/tevent_internal.h -%{_libdir}/libtevent.so -%{_libdir}/pkgconfig/tevent.pc - -%files -n %{libldb_name} -%defattr(-,root,root) -%{_libdir}/libldb.so.* -%dir %{_libdir}/ldb -%{_libdir}/ldb/*.so -%{_libdir}/libpyldb-util.so.* - -%files -n libldb-devel -%defattr(-,root,root) -%{_includedir}/ldb*.h -%{_includedir}/pyldb.h -%{_libdir}/libldb.so -%{_libdir}/libpyldb-util.so -%{_libdir}/pkgconfig/ldb.pc -%{_libdir}/pkgconfig/pyldb-util.pc - -%endif - %changelog diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index fd4f69c..ad8f60e 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:9325fa7c80957cf1f5174ef49def1a9ea53d2194887290bedb25e3ab1f350a26 -size 53560 +oid sha256:3026f70305842c4fe53c749920f23aa0d2b7cd31c7d35454a39152bc3f6b40d1 +size 53653