From 15ca46bd71c8a791e3d214aeec69e83ef3dac534ea8128481adb47eae20439d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 11 Apr 2014 12:21:33 +0000 Subject: [PATCH 1/8] - Fix malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response; (bnc#872396). - User error strings instead of hex codes where possible for FSRVP errors; (bnc#866927). - Fix remote share shadow copy request UNCs; (bso#10521); (bnc#870957). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=398 --- patches.tar.bz2 | 4 ++-- samba.changes | 16 ++++++++++++++++ samba.spec | 3 ++- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index a3ec78a..19dfb7e 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5e1c5b94dd6f996e26882689367702747bf99e624eaa624bc0832d207f3f0d9 -size 192013 +oid sha256:e93961f7bb50ba45105854fb1e9e75d7f7d86e8e270ea781f5365a645eac233c +size 277908 diff --git a/samba.changes b/samba.changes index 23a1b06..0ec79f5 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Apr 11 12:09:23 UTC 2014 - ddiss@suse.com + +- Fix malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response; (bnc#872396). + +------------------------------------------------------------------- +Fri Apr 11 11:50:08 UTC 2014 - nopower@suse.de + +- User error strings instead of hex codes where possible for FSRVP + errors; (bnc#866927). + +------------------------------------------------------------------- +Tue Apr 1 16:49:05 UTC 2014 - ddiss@suse.com + +- Fix remote share shadow copy request UNCs; (bso#10521); (bnc#870957). + ------------------------------------------------------------------- Tue Apr 1 15:20:21 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index e07f486..69d2773 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3217 +%define SOURCE_TIMESTAMP 3220 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1975,6 +1975,7 @@ fi %_includedir/samba-4.0/core/doserr.h %_includedir/samba-4.0/core/error.h %_includedir/samba-4.0/core/ntstatus.h +%_includedir/samba-4.0/core/hresult.h %_includedir/samba-4.0/core/werror.h %_includedir/samba-4.0/domain_credentials.h %dir %_includedir/samba-4.0/gen_ndr/ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 713b4d6..3f045f1 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:2099e649123423950387df410b3a1ea818ddb2c7e7e553e8bd2764a26bfcd0e3 -size 54809 +oid sha256:3f0f0262eff4438f40d01ca3d685c0f0c18c7397e265ed620467a52b13d97bba +size 54464 From 04b7a2fef707fa4988869febcb26e887b062c62256b91cc70930333ad68ece26 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Fri, 11 Apr 2014 13:03:14 +0000 Subject: [PATCH 2/8] - Fix minor compiler warnings in snapshot code-path; (bnc#873177). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=399 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 19dfb7e..7c0be8b 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e93961f7bb50ba45105854fb1e9e75d7f7d86e8e270ea781f5365a645eac233c -size 277908 +oid sha256:38c323a266f145c753ed640616fd4c674af0d2951cb4149798374317a6846731 +size 284690 diff --git a/samba.changes b/samba.changes index 0ec79f5..3778938 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 11 12:37:48 UTC 2014 - ddiss@suse.com + +- Fix minor compiler warnings in snapshot code-path; (bnc#873177). + ------------------------------------------------------------------- Fri Apr 11 12:09:23 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 69d2773..6d65c4e 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3220 +%define SOURCE_TIMESTAMP 3221 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 3f045f1..a8a7e2c 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:3f0f0262eff4438f40d01ca3d685c0f0c18c7397e265ed620467a52b13d97bba -size 54464 +oid sha256:331fb296c0504d668088358b3b24f6fe5e311f8b715b856ca2839ea6c3bd3831 +size 54412 From a51d63175dc2a0d69bca752acdd4099e17a824afdefd5b49d9923538ae3d0fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 11 Apr 2014 13:53:11 +0000 Subject: [PATCH 3/8] Remove references to the obsolete samba-krb-printing package and get_printing_ticket binary. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=400 --- patches.tar.bz2 | 4 +-- samba.changes | 6 +++++ samba.spec | 62 +------------------------------------------- vendor-files.tar.bz2 | 4 +-- 4 files changed, 11 insertions(+), 65 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 7c0be8b..c2a5669 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38c323a266f145c753ed640616fd4c674af0d2951cb4149798374317a6846731 -size 284690 +oid sha256:8ef1bee7dded31a3c0683ed1b86faeb6a2cc7754176c89ca2cccbccde95e8c91 +size 278585 diff --git a/samba.changes b/samba.changes index 3778938..bddcccd 100644 --- a/samba.changes +++ b/samba.changes @@ -3,6 +3,12 @@ Fri Apr 11 12:37:48 UTC 2014 - ddiss@suse.com - Fix minor compiler warnings in snapshot code-path; (bnc#873177). +------------------------------------------------------------------- +Fri Apr 11 12:21:48 UTC 2014 - lmuelle@suse.com + +- Remove references to the obsolete samba-krb-printing package and + get_printing_ticket binary. + ------------------------------------------------------------------- Fri Apr 11 12:09:23 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 6d65c4e..64e1e13 100644 --- a/samba.spec +++ b/samba.spec @@ -144,11 +144,10 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3221 +%define SOURCE_TIMESTAMP 3222 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -%global with_get_printing_ticket 0 Version: 4.1.6 Release: 0 License: GPL-3.0+ @@ -331,26 +330,6 @@ Branch: %{BRANCH} %endif -%if %with_get_printing_ticket -%package krb-printing -License: GPL-3.0+ -Summary: Wrapper binary for kerberized printing -Group: Productivity/Networking/Samba -PreReq: coreutils -Provides: samba-gplv3-krb-printing = %{version} -Obsoletes: samba-gplv3-krb-printing < %{version} -%if 0%{?suse_version} > 1000 -PreReq: permissions -%endif -Requires: samba-client >= %{version} - -%description krb-printing -A wrapper binary to run smbspool with the original calling UID. - -Source Timestamp: %{SOURCE_TIMESTAMP} -Branch: %{BRANCH} -%endif - %package libs License: GPL-3.0+ @@ -1146,9 +1125,6 @@ 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 && \ @@ -1644,29 +1620,6 @@ fi %postun -n %{libwbclient_name} -p /sbin/ldconfig -%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 -fi -%if 0%{?suse_version} > 0 -%if 0%{?suse_version} < 1131 -%{run_permissions} -%else -%{set_permissions} %{_bindir}/get_printing_ticket -%endif -%endif - -%postun krb-printing -if test ${1:-0} -eq 0 -a -e %{_bindir}/smbspool -a -d %{cups_lib_dir}/backend; then - ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb -fi -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 -%verifyscript krb-printing -%verify_permissions -e %{_bindir}/get_printing_ticket -%endif -%endif - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -2202,19 +2155,6 @@ 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 -%verify(not mode) %attr(4750,root,lp) %{_bindir}/get_printing_ticket -%else -%attr(0750,root,lp) %{_bindir}/get_printing_ticket -%endif -%dir %{cups_lib_dir} -%dir %{cups_lib_dir}/backend -%ghost %{cups_lib_dir}/backend/smb -%endif - %files -n libdcerpc-atsvc0 %defattr(-,root,root) %_libdir/libdcerpc-atsvc.so.0* diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index a8a7e2c..c4f51bd 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:331fb296c0504d668088358b3b24f6fe5e311f8b715b856ca2839ea6c3bd3831 -size 54412 +oid sha256:9df31153a6a3447e0e472b23da9c3d257e97f9eef709cb87c10c4a08eaa623b7 +size 54798 From 96b15eb168cda3107e14dd73aebd8e3b99023912624111cc198280a16a065e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 11 Apr 2014 18:44:42 +0000 Subject: [PATCH 4/8] Remove superfluous or dead code. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=401 --- samba.spec | 146 ++++++++++++++++++++++++++--------------------------- 1 file changed, 71 insertions(+), 75 deletions(-) diff --git a/samba.spec b/samba.spec index 64e1e13..9a4a6ef 100644 --- a/samba.spec +++ b/samba.spec @@ -15,18 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf %endif -BuildRequires: gcc -BuildRequires: make -BuildRequires: patch BuildRequires: cups-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel +BuildRequires: gcc +BuildRequires: make +BuildRequires: patch %if 0%{?suse_version} > 1300 BuildRequires: libarchive-devel %endif @@ -45,8 +46,8 @@ BuildRequires: popt-devel BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel -BuildRequires: openldap2-devel BuildRequires: libopenssl-devel +BuildRequires: openldap2-devel %endif %if 0%{?suse_version} > 1030 BuildRequires: gdbm-devel @@ -98,8 +99,8 @@ BuildRequires: libtalloc-devel BuildRequires: pytalloc-devel #!BuildIgnore: libtdb BuildRequires: libtdb-devel -BuildRequires: python-tdb BuildRequires: libtevent-devel +BuildRequires: python-tdb BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets @@ -110,8 +111,8 @@ BuildRequires: libxslt BuildRequires: libxslt1 %endif %if 0%{?suse_version} > 1210 -BuildRequires: libxslt-tools BuildRequires: dbus-1-devel +BuildRequires: libxslt-tools %endif %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline @@ -144,15 +145,13 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3222 +%define SOURCE_TIMESTAMP 3224 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 Version: 4.1.6 Release: 0 -License: GPL-3.0+ Url: http://www.samba.org/ -Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} Requires: samba-client >= %{version} @@ -161,6 +160,8 @@ Recommends: cron Recommends: logrotate %endif Summary: A SMB/CIFS File, Print, and Authentication Server +License: GPL-3.0+ +Group: Productivity/Networking/Samba Source: %{samba_source_location} Source5: %{samba_source_signature_location} Source6: http://www.samba.org/samba/ftp/samba-pubkey_6568B7EA.asc @@ -250,8 +251,8 @@ Branch: %{BRANCH} %package client -License: GPL-3.0+ Summary: Samba Client Utilities +License: GPL-3.0+ Group: Productivity/Networking/Samba Provides: samba-gplv3-client = %{version} Provides: smbfs @@ -290,8 +291,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package core-devel -License: GPL-3.0+ Summary: Development files shared by Samba subpackages +License: GPL-3.0+ Group: Development/Libraries/C and C++ Conflicts: samba-devel @@ -307,8 +308,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc -License: GPL-3.0+ Summary: Samba Documentation +License: GPL-3.0+ Group: Documentation/Other PreReq: coreutils PreReq: findutils @@ -330,10 +331,9 @@ Branch: %{BRANCH} %endif - %package libs -License: GPL-3.0+ Summary: Samba libraries +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: krb5 PreReq: /sbin/ldconfig @@ -347,8 +347,8 @@ Branch: %{BRANCH} %package pidl -License: GPL-3.0+ Summary: Perl IDL compiler +License: GPL-3.0+ Group: Development/Tools %if 0%{?suse_version} > 0 Requires: perl-base @@ -364,14 +364,14 @@ Branch: %{BRANCH} %package python -License: GPL-3.0+ Summary: Samba Python libraries +License: GPL-3.0+ Group: Applications/System Requires: %{name} = %{version} -Requires: python-tevent -Requires: python-tdb Requires: pyldb Requires: pytalloc +Requires: python-tdb +Requires: python-tevent %description python The samba-python package contains the Python libraries needed by programs @@ -382,8 +382,8 @@ Branch: %{BRANCH} %package test -License: GPL-3.0+ Summary: Testing tools for Samba servers and clients +License: GPL-3.0+ Group: Applications/System Requires: samba = %{version} Requires: samba-winbind = %{version} @@ -398,8 +398,8 @@ Branch: %{BRANCH} %package test-devel -License: GPL-3.0+ Summary: Testing devel files for Samba servers and clients +License: GPL-3.0+ Group: Development/Libraries/C and C++ %description test-devel @@ -411,8 +411,8 @@ Branch: %{BRANCH} %package winbind -License: GPL-3.0+ Summary: Winbind Daemon and Tool +License: GPL-3.0+ Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} @@ -442,8 +442,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc0 -License: GPL-3.0+ Summary: DCE/RPC AT scheduler service library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-atsvc0 @@ -455,8 +455,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc-devel -License: GPL-3.0+ Summary: Development files for the DCE/RPC ATSVC library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libdcerpc-atsvc0 = %{version} @@ -472,8 +472,8 @@ Branch: %{BRANCH} %package -n libdcerpc-binding0 -License: GPL-3.0+ Summary: Some samba library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-binding0 @@ -483,8 +483,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr0 -License: GPL-3.0+ Summary: Security Account Manager (SAM) Remote Protocol library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-samr0 @@ -494,8 +494,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr-devel -License: GPL-3.0+ Summary: Development files for the SAMR protocol library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libdcerpc-samr0 = %{version} @@ -508,8 +508,8 @@ Branch: %{BRANCH} %package -n libdcerpc0 -License: GPL-3.0+ Summary: Distributed Computing Environment Remote Procedure Calls library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc0 @@ -525,11 +525,11 @@ Branch: %{BRANCH} %package -n libdcerpc-devel -License: GPL-3.0+ Summary: Development files for the DCE/RPC library +License: GPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libdcerpc0 = %{version} Requires: libdcerpc-binding0 = %{version} +Requires: libdcerpc0 = %{version} Requires: samba-core-devel = %{version} %description -n libdcerpc-devel @@ -548,8 +548,8 @@ Branch: %{BRANCH} %package -n libgensec0 -License: GPL-3.0+ Summary: Samba generic security library +License: GPL-3.0+ Group: System/Libraries %description -n libgensec0 @@ -559,8 +559,8 @@ Branch: %{BRANCH} %package -n libgensec-devel -License: GPL-3.0+ Summary: Development files for Samba's generic security library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libgensec0 = %{version} Requires: samba-core-devel = %{version} @@ -574,8 +574,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac0 -License: GPL-3.0+ Summary: NDR marshallers for the KRB5 PAC formats +License: GPL-3.0+ Group: System/Libraries %description -n libndr-krb5pac0 @@ -585,8 +585,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac-devel -License: GPL-3.0+ Summary: Development files for the ndr-krb5pac library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-krb5pac0 = %{version} Requires: samba-core-devel = %{version} @@ -600,8 +600,8 @@ Branch: %{BRANCH} %package -n libndr-nbt0 -License: GPL-3.0+ Summary: NDR marshallers for NBT formats +License: GPL-3.0+ Group: System/Libraries %description -n libndr-nbt0 @@ -611,8 +611,8 @@ Branch: %{BRANCH} %package -n libndr-nbt-devel -License: GPL-3.0+ Summary: Development files for the ndr-nbt library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-nbt0 = %{version} Requires: samba-core-devel = %{version} @@ -626,8 +626,8 @@ Branch: %{BRANCH} %package -n libndr-standard0 -License: GPL-3.0+ Summary: NDR marshallers for the standard set of DCE/RPC interfaces +License: GPL-3.0+ Group: System/Libraries %description -n libndr-standard0 @@ -637,8 +637,8 @@ Branch: %{BRANCH} %package -n libndr-standard-devel -License: GPL-3.0+ Summary: Development files for the libndr-standard library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-standard0 = %{version} Requires: samba-core-devel = %{version} @@ -652,8 +652,8 @@ Branch: %{BRANCH} %package -n libndr0 -License: GPL-3.0+ Summary: Network Data Representation library +License: GPL-3.0+ Group: System/Libraries %description -n libndr0 @@ -665,8 +665,8 @@ Branch: %{BRANCH} %package -n libndr-devel -License: GPL-3.0+ Summary: Development files for the Network Data Representation library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr0 = %{version} Requires: samba-core-devel = %{version} @@ -683,8 +683,8 @@ Branch: %{BRANCH} %package -n libpdb0 -License: GPL-3.0+ Summary: Samba3 password database library +License: GPL-3.0+ Group: System/Libraries %description -n libpdb0 @@ -694,11 +694,11 @@ Branch: %{BRANCH} %package -n libpdb-devel -License: GPL-3.0+ Summary: Development files for the Samba3 password database library +License: GPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libpdb0 = %{version} Requires: libndr-standard-devel = %{version} +Requires: libpdb0 = %{version} Requires: libtevent-devel %description -n libpdb-devel @@ -710,8 +710,8 @@ Branch: %{BRANCH} %package -n libregistry0 -License: GPL-3.0+ Summary: Windows-style registry library +License: GPL-3.0+ Group: System/Libraries %description -n libregistry0 @@ -721,8 +721,8 @@ Branch: %{BRANCH} %package -n libregistry-devel -License: GPL-3.0+ Summary: Development files for the Samba Windows-style registry library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libregistry0 = %{version} Requires: samba-core-devel = %{version} @@ -736,8 +736,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials0 -License: GPL-3.0+ Summary: Samba credential management library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-credentials0 @@ -747,8 +747,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials-devel -License: GPL-3.0+ Summary: Development files for the Samba credential management library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-credentials0 = %{version} @@ -761,8 +761,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig0 -License: GPL-3.0+ Summary: Host-wide Samba configuration library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-hostconfig0 @@ -772,8 +772,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig-devel -License: GPL-3.0+ Summary: Development files for the host-wide Samba configuration library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-hostconfig0 = %{version} Requires: samba-core-devel = %{version} @@ -787,8 +787,8 @@ Branch: %{BRANCH} %package -n libsamba-policy0 -License: GPL-3.0+ Summary: Active Directory Group Policy library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-policy0 @@ -798,8 +798,8 @@ Branch: %{BRANCH} %package -n libsamba-policy-devel -License: GPL-3.0+ Summary: Development files for the Samba AD Group Policy library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-policy0 = %{version} @@ -812,8 +812,8 @@ Branch: %{BRANCH} %package -n libsamba-util0 -License: GPL-3.0+ Summary: Samba utility function library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-util0 @@ -823,8 +823,8 @@ Branch: %{BRANCH} %package -n libsamba-util-devel -License: GPL-3.0+ Summary: Development files for the Samba utility function library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-util0 = %{version} Requires: samba-core-devel = %{version} @@ -838,8 +838,8 @@ Branch: %{BRANCH} %package -n libsamdb0 -License: GPL-3.0+ Summary: Samba's SAM database library +License: GPL-3.0+ Group: System/Libraries %description -n libsamdb0 @@ -849,8 +849,8 @@ Branch: %{BRANCH} %package -n libsamdb-devel -License: GPL-3.0+ Summary: Development files for Samba's SAM database library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamdb0 = %{version} @@ -863,8 +863,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw0 -License: GPL-3.0+ Summary: Samba4's raw SMB client library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbclient-raw0 @@ -874,8 +874,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw-devel -License: GPL-3.0+ Summary: Development files for Samba4's raw SMB client library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbclient-raw0 = %{version} Requires: samba-core-devel = %{version} @@ -889,8 +889,8 @@ Branch: %{BRANCH} %package -n libsmbconf0 -License: GPL-3.0+ Summary: Samba3 configuration library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbconf0 @@ -902,8 +902,8 @@ Branch: %{BRANCH} %package -n libsmbconf-devel -License: GPL-3.0+ Summary: Development files for the Samba3 configuration library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbconf0 = %{version} @@ -919,8 +919,8 @@ Branch: %{BRANCH} %package -n libsmbldap0 -License: GPL-3.0+ Summary: Samba LDAP protocol helper function library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbldap0 @@ -931,8 +931,8 @@ Branch: %{BRANCH} %package -n libsmbldap-devel -License: GPL-3.0+ Summary: Development files for the smbldap library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbldap0 = %{version} Requires: libtalloc-devel @@ -950,8 +950,8 @@ Branch: %{BRANCH} %package -n libtevent-util0 -License: GPL-3.0+ Summary: tevent <-> system status code conversion utility library +License: GPL-3.0+ Group: System/Libraries %description -n libtevent-util0 @@ -963,8 +963,8 @@ Branch: %{BRANCH} %package -n libtevent-util-devel -License: GPL-3.0+ Summary: Development files for the Samba tevent utility library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libtevent-devel Requires: libtevent-util0 = %{version} @@ -982,12 +982,12 @@ Branch: %{BRANCH} %package -n %{libsmbclient_name} -License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif Summary: Samba Client Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1001,12 +1001,12 @@ Branch: %{BRANCH} %package -n libsmbclient-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: krb5-devel Requires: %{libsmbclient_name} = %{version} +Requires: krb5-devel %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1017,8 +1017,8 @@ Branch: %{BRANCH} %package -n %{libnetapi_name} -License: GPL-3.0+ Summary: Samba netapi Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1030,8 +1030,8 @@ Branch: %{BRANCH} %package -n libnetapi-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libnetapi_name} = %{version} @@ -1045,12 +1045,12 @@ Branch: %{BRANCH} %package -n %{libsmbsharemodes_name} -License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbsharemodes = %{version} Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1062,8 +1062,8 @@ Branch: %{BRANCH} %package -n libsmbsharemodes-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libsmbsharemodes_name} = %{version} @@ -1077,8 +1077,8 @@ Branch: %{BRANCH} %package -n %{libwbclient_name} -License: LGPL-3.0+ Summary: Samba libwbclient Library +License: LGPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1090,8 +1090,8 @@ Branch: %{BRANCH} %package -n libwbclient-devel -License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support +License: LGPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libwbclient_name} = %{version} @@ -1236,7 +1236,6 @@ install -d -m 0755 -p \ %if 0%{?suse_version} && 0%{?suse_version} > 1020 %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services \ %endif - %{buildroot}/%{_sysconfdir}/permissions.d \ %{buildroot}/%{_sysconfdir}/security \ %{buildroot}/%{_sysconfdir}/slp.reg.d \ %{buildroot}/%{CONFIGDIR} \ @@ -1561,9 +1560,6 @@ fi %if 0%{?suse_version} > 1220 %{fillup_only -ans samba client} %endif -if ! test -e %{_bindir}/get_printing_ticket; then - ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb -fi %{?fillup_only:%{fillup_only -nsd dhcp samba-client network}} %postun client From 4402ca45e381938f30138a6959a80567e019e421918f92f086eee5a8b3cee5bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 11 Apr 2014 19:18:09 +0000 Subject: [PATCH 5/8] No longer recommend the no longer existing samba-krb-printing OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=402 --- patches.tar.bz2 | 4 +- samba.spec | 143 +++++++++++++++++++++---------------------- vendor-files.tar.bz2 | 4 +- 3 files changed, 75 insertions(+), 76 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index c2a5669..83bfe12 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ef1bee7dded31a3c0683ed1b86faeb6a2cc7754176c89ca2cccbccde95e8c91 -size 278585 +oid sha256:40f370507ff6074cb26418e166e7972f0a67adabcd6d09e08f299e693e6e6b54 +size 278134 diff --git a/samba.spec b/samba.spec index 9a4a6ef..0f654fe 100644 --- a/samba.spec +++ b/samba.spec @@ -15,19 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf %endif -BuildRequires: cups-devel -BuildRequires: cyrus-sasl-devel -BuildRequires: e2fsprogs-devel BuildRequires: gcc BuildRequires: make BuildRequires: patch +BuildRequires: cups-devel +BuildRequires: cyrus-sasl-devel +BuildRequires: e2fsprogs-devel %if 0%{?suse_version} > 1300 BuildRequires: libarchive-devel %endif @@ -46,8 +45,8 @@ BuildRequires: popt-devel BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel -BuildRequires: libopenssl-devel BuildRequires: openldap2-devel +BuildRequires: libopenssl-devel %endif %if 0%{?suse_version} > 1030 BuildRequires: gdbm-devel @@ -99,8 +98,8 @@ BuildRequires: libtalloc-devel BuildRequires: pytalloc-devel #!BuildIgnore: libtdb BuildRequires: libtdb-devel -BuildRequires: libtevent-devel BuildRequires: python-tdb +BuildRequires: libtevent-devel BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets @@ -111,8 +110,8 @@ BuildRequires: libxslt BuildRequires: libxslt1 %endif %if 0%{?suse_version} > 1210 -BuildRequires: dbus-1-devel BuildRequires: libxslt-tools +BuildRequires: dbus-1-devel %endif %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline @@ -145,13 +144,15 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3224 +%define SOURCE_TIMESTAMP 3225 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 Version: 4.1.6 Release: 0 +License: GPL-3.0+ Url: http://www.samba.org/ +Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} Requires: samba-client >= %{version} @@ -160,8 +161,6 @@ Recommends: cron Recommends: logrotate %endif Summary: A SMB/CIFS File, Print, and Authentication Server -License: GPL-3.0+ -Group: Productivity/Networking/Samba Source: %{samba_source_location} Source5: %{samba_source_signature_location} Source6: http://www.samba.org/samba/ftp/samba-pubkey_6568B7EA.asc @@ -251,8 +250,8 @@ Branch: %{BRANCH} %package client -Summary: Samba Client Utilities License: GPL-3.0+ +Summary: Samba Client Utilities Group: Productivity/Networking/Samba Provides: samba-gplv3-client = %{version} Provides: smbfs @@ -291,8 +290,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package core-devel -Summary: Development files shared by Samba subpackages License: GPL-3.0+ +Summary: Development files shared by Samba subpackages Group: Development/Libraries/C and C++ Conflicts: samba-devel @@ -308,8 +307,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc -Summary: Samba Documentation License: GPL-3.0+ +Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils PreReq: findutils @@ -331,9 +330,10 @@ Branch: %{BRANCH} %endif + %package libs -Summary: Samba libraries License: GPL-3.0+ +Summary: Samba libraries Group: Development/Libraries/C and C++ Requires: krb5 PreReq: /sbin/ldconfig @@ -347,8 +347,8 @@ Branch: %{BRANCH} %package pidl -Summary: Perl IDL compiler License: GPL-3.0+ +Summary: Perl IDL compiler Group: Development/Tools %if 0%{?suse_version} > 0 Requires: perl-base @@ -364,14 +364,14 @@ Branch: %{BRANCH} %package python -Summary: Samba Python libraries License: GPL-3.0+ +Summary: Samba Python libraries Group: Applications/System Requires: %{name} = %{version} +Requires: python-tevent +Requires: python-tdb Requires: pyldb Requires: pytalloc -Requires: python-tdb -Requires: python-tevent %description python The samba-python package contains the Python libraries needed by programs @@ -382,8 +382,8 @@ Branch: %{BRANCH} %package test -Summary: Testing tools for Samba servers and clients License: GPL-3.0+ +Summary: Testing tools for Samba servers and clients Group: Applications/System Requires: samba = %{version} Requires: samba-winbind = %{version} @@ -398,8 +398,8 @@ Branch: %{BRANCH} %package test-devel -Summary: Testing devel files for Samba servers and clients License: GPL-3.0+ +Summary: Testing devel files for Samba servers and clients Group: Development/Libraries/C and C++ %description test-devel @@ -411,8 +411,8 @@ Branch: %{BRANCH} %package winbind -Summary: Winbind Daemon and Tool License: GPL-3.0+ +Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} @@ -424,7 +424,6 @@ Requires: pam-config %if 0%{?suse_version} > 1030 Recommends: cron Recommends: logrotate -Recommends: samba-krb-printing Recommends: /usr/sbin/nscd %endif %if 0%{?suse_version} > 0 @@ -442,8 +441,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc0 -Summary: DCE/RPC AT scheduler service library License: GPL-3.0+ +Summary: DCE/RPC AT scheduler service library Group: System/Libraries %description -n libdcerpc-atsvc0 @@ -455,8 +454,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc-devel -Summary: Development files for the DCE/RPC ATSVC library License: GPL-3.0+ +Summary: Development files for the DCE/RPC ATSVC library Group: Development/Libraries/C and C++ Requires: libdcerpc-atsvc0 = %{version} @@ -472,8 +471,8 @@ Branch: %{BRANCH} %package -n libdcerpc-binding0 -Summary: Some samba library License: GPL-3.0+ +Summary: Some samba library Group: System/Libraries %description -n libdcerpc-binding0 @@ -483,8 +482,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr0 -Summary: Security Account Manager (SAM) Remote Protocol library License: GPL-3.0+ +Summary: Security Account Manager (SAM) Remote Protocol library Group: System/Libraries %description -n libdcerpc-samr0 @@ -494,8 +493,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr-devel -Summary: Development files for the SAMR protocol library License: GPL-3.0+ +Summary: Development files for the SAMR protocol library Group: Development/Libraries/C and C++ Requires: libdcerpc-samr0 = %{version} @@ -508,8 +507,8 @@ Branch: %{BRANCH} %package -n libdcerpc0 -Summary: Distributed Computing Environment Remote Procedure Calls library License: GPL-3.0+ +Summary: Distributed Computing Environment Remote Procedure Calls library Group: System/Libraries %description -n libdcerpc0 @@ -525,11 +524,11 @@ Branch: %{BRANCH} %package -n libdcerpc-devel -Summary: Development files for the DCE/RPC library License: GPL-3.0+ +Summary: Development files for the DCE/RPC library Group: Development/Libraries/C and C++ -Requires: libdcerpc-binding0 = %{version} Requires: libdcerpc0 = %{version} +Requires: libdcerpc-binding0 = %{version} Requires: samba-core-devel = %{version} %description -n libdcerpc-devel @@ -548,8 +547,8 @@ Branch: %{BRANCH} %package -n libgensec0 -Summary: Samba generic security library License: GPL-3.0+ +Summary: Samba generic security library Group: System/Libraries %description -n libgensec0 @@ -559,8 +558,8 @@ Branch: %{BRANCH} %package -n libgensec-devel -Summary: Development files for Samba's generic security library License: GPL-3.0+ +Summary: Development files for Samba's generic security library Group: Development/Libraries/C and C++ Requires: libgensec0 = %{version} Requires: samba-core-devel = %{version} @@ -574,8 +573,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac0 -Summary: NDR marshallers for the KRB5 PAC formats License: GPL-3.0+ +Summary: NDR marshallers for the KRB5 PAC formats Group: System/Libraries %description -n libndr-krb5pac0 @@ -585,8 +584,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac-devel -Summary: Development files for the ndr-krb5pac library License: GPL-3.0+ +Summary: Development files for the ndr-krb5pac library Group: Development/Libraries/C and C++ Requires: libndr-krb5pac0 = %{version} Requires: samba-core-devel = %{version} @@ -600,8 +599,8 @@ Branch: %{BRANCH} %package -n libndr-nbt0 -Summary: NDR marshallers for NBT formats License: GPL-3.0+ +Summary: NDR marshallers for NBT formats Group: System/Libraries %description -n libndr-nbt0 @@ -611,8 +610,8 @@ Branch: %{BRANCH} %package -n libndr-nbt-devel -Summary: Development files for the ndr-nbt library License: GPL-3.0+ +Summary: Development files for the ndr-nbt library Group: Development/Libraries/C and C++ Requires: libndr-nbt0 = %{version} Requires: samba-core-devel = %{version} @@ -626,8 +625,8 @@ Branch: %{BRANCH} %package -n libndr-standard0 -Summary: NDR marshallers for the standard set of DCE/RPC interfaces License: GPL-3.0+ +Summary: NDR marshallers for the standard set of DCE/RPC interfaces Group: System/Libraries %description -n libndr-standard0 @@ -637,8 +636,8 @@ Branch: %{BRANCH} %package -n libndr-standard-devel -Summary: Development files for the libndr-standard library License: GPL-3.0+ +Summary: Development files for the libndr-standard library Group: Development/Libraries/C and C++ Requires: libndr-standard0 = %{version} Requires: samba-core-devel = %{version} @@ -652,8 +651,8 @@ Branch: %{BRANCH} %package -n libndr0 -Summary: Network Data Representation library License: GPL-3.0+ +Summary: Network Data Representation library Group: System/Libraries %description -n libndr0 @@ -665,8 +664,8 @@ Branch: %{BRANCH} %package -n libndr-devel -Summary: Development files for the Network Data Representation library License: GPL-3.0+ +Summary: Development files for the Network Data Representation library Group: Development/Libraries/C and C++ Requires: libndr0 = %{version} Requires: samba-core-devel = %{version} @@ -683,8 +682,8 @@ Branch: %{BRANCH} %package -n libpdb0 -Summary: Samba3 password database library License: GPL-3.0+ +Summary: Samba3 password database library Group: System/Libraries %description -n libpdb0 @@ -694,11 +693,11 @@ Branch: %{BRANCH} %package -n libpdb-devel -Summary: Development files for the Samba3 password database library License: GPL-3.0+ +Summary: Development files for the Samba3 password database library Group: Development/Libraries/C and C++ -Requires: libndr-standard-devel = %{version} Requires: libpdb0 = %{version} +Requires: libndr-standard-devel = %{version} Requires: libtevent-devel %description -n libpdb-devel @@ -710,8 +709,8 @@ Branch: %{BRANCH} %package -n libregistry0 -Summary: Windows-style registry library License: GPL-3.0+ +Summary: Windows-style registry library Group: System/Libraries %description -n libregistry0 @@ -721,8 +720,8 @@ Branch: %{BRANCH} %package -n libregistry-devel -Summary: Development files for the Samba Windows-style registry library License: GPL-3.0+ +Summary: Development files for the Samba Windows-style registry library Group: Development/Libraries/C and C++ Requires: libregistry0 = %{version} Requires: samba-core-devel = %{version} @@ -736,8 +735,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials0 -Summary: Samba credential management library License: GPL-3.0+ +Summary: Samba credential management library Group: System/Libraries %description -n libsamba-credentials0 @@ -747,8 +746,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials-devel -Summary: Development files for the Samba credential management library License: GPL-3.0+ +Summary: Development files for the Samba credential management library Group: Development/Libraries/C and C++ Requires: libsamba-credentials0 = %{version} @@ -761,8 +760,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig0 -Summary: Host-wide Samba configuration library License: GPL-3.0+ +Summary: Host-wide Samba configuration library Group: System/Libraries %description -n libsamba-hostconfig0 @@ -772,8 +771,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig-devel -Summary: Development files for the host-wide Samba configuration library License: GPL-3.0+ +Summary: Development files for the host-wide Samba configuration library Group: Development/Libraries/C and C++ Requires: libsamba-hostconfig0 = %{version} Requires: samba-core-devel = %{version} @@ -787,8 +786,8 @@ Branch: %{BRANCH} %package -n libsamba-policy0 -Summary: Active Directory Group Policy library License: GPL-3.0+ +Summary: Active Directory Group Policy library Group: System/Libraries %description -n libsamba-policy0 @@ -798,8 +797,8 @@ Branch: %{BRANCH} %package -n libsamba-policy-devel -Summary: Development files for the Samba AD Group Policy library License: GPL-3.0+ +Summary: Development files for the Samba AD Group Policy library Group: Development/Libraries/C and C++ Requires: libsamba-policy0 = %{version} @@ -812,8 +811,8 @@ Branch: %{BRANCH} %package -n libsamba-util0 -Summary: Samba utility function library License: GPL-3.0+ +Summary: Samba utility function library Group: System/Libraries %description -n libsamba-util0 @@ -823,8 +822,8 @@ Branch: %{BRANCH} %package -n libsamba-util-devel -Summary: Development files for the Samba utility function library License: GPL-3.0+ +Summary: Development files for the Samba utility function library Group: Development/Libraries/C and C++ Requires: libsamba-util0 = %{version} Requires: samba-core-devel = %{version} @@ -838,8 +837,8 @@ Branch: %{BRANCH} %package -n libsamdb0 -Summary: Samba's SAM database library License: GPL-3.0+ +Summary: Samba's SAM database library Group: System/Libraries %description -n libsamdb0 @@ -849,8 +848,8 @@ Branch: %{BRANCH} %package -n libsamdb-devel -Summary: Development files for Samba's SAM database library License: GPL-3.0+ +Summary: Development files for Samba's SAM database library Group: Development/Libraries/C and C++ Requires: libsamdb0 = %{version} @@ -863,8 +862,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw0 -Summary: Samba4's raw SMB client library License: GPL-3.0+ +Summary: Samba4's raw SMB client library Group: System/Libraries %description -n libsmbclient-raw0 @@ -874,8 +873,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw-devel -Summary: Development files for Samba4's raw SMB client library License: GPL-3.0+ +Summary: Development files for Samba4's raw SMB client library Group: Development/Libraries/C and C++ Requires: libsmbclient-raw0 = %{version} Requires: samba-core-devel = %{version} @@ -889,8 +888,8 @@ Branch: %{BRANCH} %package -n libsmbconf0 -Summary: Samba3 configuration library License: GPL-3.0+ +Summary: Samba3 configuration library Group: System/Libraries %description -n libsmbconf0 @@ -902,8 +901,8 @@ Branch: %{BRANCH} %package -n libsmbconf-devel -Summary: Development files for the Samba3 configuration library License: GPL-3.0+ +Summary: Development files for the Samba3 configuration library Group: Development/Libraries/C and C++ Requires: libsmbconf0 = %{version} @@ -919,8 +918,8 @@ Branch: %{BRANCH} %package -n libsmbldap0 -Summary: Samba LDAP protocol helper function library License: GPL-3.0+ +Summary: Samba LDAP protocol helper function library Group: System/Libraries %description -n libsmbldap0 @@ -931,8 +930,8 @@ Branch: %{BRANCH} %package -n libsmbldap-devel -Summary: Development files for the smbldap library License: GPL-3.0+ +Summary: Development files for the smbldap library Group: Development/Libraries/C and C++ Requires: libsmbldap0 = %{version} Requires: libtalloc-devel @@ -950,8 +949,8 @@ Branch: %{BRANCH} %package -n libtevent-util0 -Summary: tevent <-> system status code conversion utility library License: GPL-3.0+ +Summary: tevent <-> system status code conversion utility library Group: System/Libraries %description -n libtevent-util0 @@ -963,8 +962,8 @@ Branch: %{BRANCH} %package -n libtevent-util-devel -Summary: Development files for the Samba tevent utility library License: GPL-3.0+ +Summary: Development files for the Samba tevent utility library Group: Development/Libraries/C and C++ Requires: libtevent-devel Requires: libtevent-util0 = %{version} @@ -982,12 +981,12 @@ Branch: %{BRANCH} %package -n %{libsmbclient_name} +License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif Summary: Samba Client Library -License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1001,12 +1000,12 @@ Branch: %{BRANCH} %package -n libsmbclient-devel -Summary: Libraries and Header Files to Develop Programs with smbclient Support License: GPL-3.0+ +Summary: Libraries and Header Files to Develop Programs with smbclient Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libsmbclient_name} = %{version} Requires: krb5-devel +Requires: %{libsmbclient_name} = %{version} %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1017,8 +1016,8 @@ Branch: %{BRANCH} %package -n %{libnetapi_name} -Summary: Samba netapi Library License: GPL-3.0+ +Summary: Samba netapi Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -1030,8 +1029,8 @@ Branch: %{BRANCH} %package -n libnetapi-devel -Summary: Libraries and Header Files to Develop Programs with netapi Support License: GPL-3.0+ +Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libnetapi_name} = %{version} @@ -1045,12 +1044,12 @@ Branch: %{BRANCH} %package -n %{libsmbsharemodes_name} +License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbsharemodes = %{version} Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library -License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1062,8 +1061,8 @@ Branch: %{BRANCH} %package -n libsmbsharemodes-devel -Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support License: GPL-3.0+ +Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libsmbsharemodes_name} = %{version} @@ -1077,8 +1076,8 @@ Branch: %{BRANCH} %package -n %{libwbclient_name} -Summary: Samba libwbclient Library License: LGPL-3.0+ +Summary: Samba libwbclient Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -1090,8 +1089,8 @@ Branch: %{BRANCH} %package -n libwbclient-devel -Summary: Libraries and Header Files to Develop Programs with wbclient Support License: LGPL-3.0+ +Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libwbclient_name} = %{version} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index c4f51bd..604498c 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:9df31153a6a3447e0e472b23da9c3d257e97f9eef709cb87c10c4a08eaa623b7 -size 54798 +oid sha256:a0cc11e51907c5299d7ae1cefd6768289fffa941247dfa6d9e170386d49219e4 +size 54670 From 48ea985effeacab6b5cce0898385d1aa098a618663124cff88628d5931beafa4 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Wed, 16 Apr 2014 15:05:36 +0000 Subject: [PATCH 6/8] - Create a new DBus connection for every vfs_snapper request, to ensure correct snapper UID detection; (bnc#866354). - Fix "Invalid read" in method reply_writeclose; (bnc#873658). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=403 --- patches.tar.bz2 | 4 ++-- samba.changes | 11 +++++++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 83bfe12..0b214e7 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40f370507ff6074cb26418e166e7972f0a67adabcd6d09e08f299e693e6e6b54 -size 278134 +oid sha256:81a1930ff03756652068b69829028f85cf2e6020349cf6ec33f91d5f468a8788 +size 285534 diff --git a/samba.changes b/samba.changes index bddcccd..a6897a2 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Apr 15 15:03:27 UTC 2014 - ddiss@suse.com + +- Create a new DBus connection for every vfs_snapper request, to ensure + correct snapper UID detection; (bnc#866354). + +------------------------------------------------------------------- +Tue Apr 15 10:41:04 UTC 2014 - nopower@suse.de + +- Fix "Invalid read" in method reply_writeclose; (bnc#873658). + ------------------------------------------------------------------- Fri Apr 11 12:37:48 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 0f654fe..59bd89c 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3225 +%define SOURCE_TIMESTAMP 3227 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 604498c..9b7cdf7 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:a0cc11e51907c5299d7ae1cefd6768289fffa941247dfa6d9e170386d49219e4 -size 54670 +oid sha256:a236db999abdc8fad8bbb971632522623f4fd1f70c54f9b65187b9b708c6a957 +size 54385 From 62f6ec65de0df7c81bee2389a3fcbcda741a7393f27233b48783a8e4faa41243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 17 Apr 2014 15:56:07 +0000 Subject: [PATCH 7/8] Update to 4.1.7. See WHATSNEW.txt from the main tar ball or the samba.changes file for more details. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=404 --- patches.tar.bz2 | 4 ++-- samba-4.1.6.tar.asc | 7 ------- samba-4.1.6.tar.gz | 3 --- samba-4.1.7.tar.asc | 7 +++++++ samba-4.1.7.tar.gz | 3 +++ samba.changes | 45 ++++++++++++++++++++++++++++++++++++++++++++ samba.spec | 15 +++------------ vendor-files.tar.bz2 | 4 ++-- 8 files changed, 62 insertions(+), 26 deletions(-) delete mode 100644 samba-4.1.6.tar.asc delete mode 100644 samba-4.1.6.tar.gz create mode 100644 samba-4.1.7.tar.asc create mode 100644 samba-4.1.7.tar.gz diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 0b214e7..5791099 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81a1930ff03756652068b69829028f85cf2e6020349cf6ec33f91d5f468a8788 -size 285534 +oid sha256:aefbe81c7f7752c56726fe3057f35eaa69b652b3b64167db8d1f1622ecc3edf9 +size 275745 diff --git a/samba-4.1.6.tar.asc b/samba-4.1.6.tar.asc deleted file mode 100644 index 676e3a8..0000000 --- a/samba-4.1.6.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlMe+FYACgkQbzORW2Vot+qW8gCgjsPfEKKZ6HYlyH0tErAUCTjU -wSUAnAou9AL9jlZ3C99q0KTi69Z5tkJU -=aw1W ------END PGP SIGNATURE----- diff --git a/samba-4.1.6.tar.gz b/samba-4.1.6.tar.gz deleted file mode 100644 index 8ea65f1..0000000 --- a/samba-4.1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d3b25cb70acbd75352e1a6039093689ded373f6ac755c207635416786532e6b -size 23177462 diff --git a/samba-4.1.7.tar.asc b/samba-4.1.7.tar.asc new file mode 100644 index 0000000..f2aea50 --- /dev/null +++ b/samba-4.1.7.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlNPlWYACgkQbzORW2Vot+qcJwCaAr3f56pi9qvBWCqXJJSexcCy +EHgAoLiQByNlsPcvCRlfHmIA4MeKufnh +=px79 +-----END PGP SIGNATURE----- diff --git a/samba-4.1.7.tar.gz b/samba-4.1.7.tar.gz new file mode 100644 index 0000000..5da6e5a --- /dev/null +++ b/samba-4.1.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15a0ccc2fd90166c4231574f4f1a1229769be2cc4da7af9c16304e8659529d89 +size 23187644 diff --git a/samba.changes b/samba.changes index a6897a2..beb9dce 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Thu Apr 17 15:44:30 UTC 2014 - lmuelle@suse.com + +- Update to 4.1.7. + + Make "force user" work as expected; (bso#9878). + + Fix build on AIX with IBM XL C/C++ (gettext detection issues); (bso#9911). + + Fix problem with server taking too long to respond to a + MSG_PRINTER_DRVUPGRADE message; (bso#9942). + + s3-printing: Fix obvious memory leak in printer_list_get_printer(); + (bso#9993). + + doc: Add "spoolss: architecture" parameter usage; (bso#10188). + + Make 'smbclient' support DFS shares with SMB2/3; (bso#10200). + + Make (lib)smbclient work with NetApp; (bso#10230). + + SessionLogoff on a signed connection with an outstanding notify request + crashes smbd; (bso#10344). + + dfs: Always call create_conn_struct with root privileges; (bso#10378). + + 'net ads search' on high latency networks can return a partial list with + no error indication; (bso#10387). + + max xmit > 64kb leads to segmentation fault; (bso#10422). + + Fix STATUS_NO_MEMORY response from Query File Posix Lock request; + (bso#10431). + + Increase max netbios name components; (bso#10439). + + smbd_server_connection_terminate("CTDB_SRVID_RELEASE_IP") panics from + within ctdbd_migrate() with invalid lock_order; (bso#10444). + + Fix 'wbinfo -i' with one-way trust; (bso#10458). + + samba4 services not binding on IPv6 addresses causing connection delays; + (bso#10464). + + s3-vfs: Fix stream_depot vfs module on btrfs; (bso#10467). + + Don't respond with NXDOMAIN to records that exist with another type; + (bso#10471). + + pidl: waf should have an option for the dir to install perl files and do + not glob; (bso#10472). + + s3-spoolssd: Don't register spoolssd if epmd is not running; (bso#10474). + + s3-rpc_server: Fix handling of fragmented rpc requests; (bso#10481). + + Initial FSRVP rpcclient requests fail with NT_STATUS_PIPE_NOT_AVAILABLE; + (bso#10484). + + lsa.idl: Define lsa.ForestTrustCollisionInfo and ForestTrustCollisionRecord + as public structs; (bso#10504). + + Make 'smbreadline' build with readline 6.3; (bso#10506). + + smbd: Correctly add remote users into local groups; (bso#10508). + + rpcclient FSRVP request UNCs should include a trailing backslash; + (bso#10521). + + Cleanup messages.tdb record after unclean smbd shutdown; (bso#10534). + + s3:rpc_server: Minor refactoring of process_request_pdu(). + ------------------------------------------------------------------- Tue Apr 15 15:03:27 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 59bd89c..4f32cf6 100644 --- a/samba.spec +++ b/samba.spec @@ -117,7 +117,7 @@ BuildRequires: dbus-1-devel BuildRequires: gpg-offline BuildRequires: systemd %endif -%define samba_ver 4.1.6 +%define samba_ver 4.1.7 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz @@ -144,11 +144,11 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3227 +%define SOURCE_TIMESTAMP 3228 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -Version: 4.1.6 +Version: 4.1.7 Release: 0 License: GPL-3.0+ Url: http://www.samba.org/ @@ -1271,16 +1271,7 @@ make install \ 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 - # 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 # utility scripts diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 9b7cdf7..1112f35 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:a236db999abdc8fad8bbb971632522623f4fd1f70c54f9b65187b9b708c6a957 -size 54385 +oid sha256:03bcfeb7c2ad6282581fcdb5e4db22313555eb4353bf09194099d6daa6d7479d +size 54636 From 3fe0cad748e88e2c7c80b615715b5cb54b3fa88c56f8dcb2feaa15922c0980dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 17 Apr 2014 16:27:35 +0000 Subject: [PATCH 8/8] patch tar ball: Restore series file line formating to be in line with the 4.1.6 branch. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=405 --- patches.tar.bz2 | 4 ++-- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 5791099..df67691 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aefbe81c7f7752c56726fe3057f35eaa69b652b3b64167db8d1f1622ecc3edf9 -size 275745 +oid sha256:fdc80921983d91b5a4a204c9f68b150d042c356c4f3bd251f6f57d20f7e21eee +size 275877 diff --git a/samba.spec b/samba.spec index 4f32cf6..f882957 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3228 +%define SOURCE_TIMESTAMP 3229 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 1112f35..2d7e66d 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:03bcfeb7c2ad6282581fcdb5e4db22313555eb4353bf09194099d6daa6d7479d -size 54636 +oid sha256:5acbd1809e69b784722ad4dab980223cafdfda7b6820ac855c8524edf34bd5cf +size 54613