diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 888522e..8042db9 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41bb1cf5ba56dc5f1206657e136d6313da9bb96cd8efd5ef3765ea1eb61ed578 -size 317995 +oid sha256:d7d3f56cc44af42a42faa5534ac6947a7771daa2054b8ef8fa815309e33ab886 +size 320076 diff --git a/samba.changes b/samba.changes index 00e43f4..b2ecd14 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Nov 6 13:41:46 UTC 2014 - lmuelle@suse.com + +- Use the upstream tar ball, as signature verification is now able to handle + compressed archives. + +------------------------------------------------------------------- +Wed Nov 5 13:02:57 CET 2014 - nopower@suse.de + +- Fix leak when closing file descriptor returned from dirfd; (bso#10918). + +------------------------------------------------------------------- +Tue Oct 28 16:13:45 UTC 2014 - lmuelle@suse.com + +- Remove dependency on gpg-offline as signature checking is implemented in the + source validator. + ------------------------------------------------------------------- Sat Oct 25 13:47:41 UTC 2014 - lmuelle@suse.com diff --git a/samba-pubkey_6568B7EA.asc b/samba.keyring similarity index 100% rename from samba-pubkey_6568B7EA.asc rename to samba.keyring diff --git a/samba.spec b/samba.spec index e037641..ce4cc11 100644 --- a/samba.spec +++ b/samba.spec @@ -118,7 +118,6 @@ BuildRequires: dbus-1-devel BuildRequires: libxslt-tools %endif %if 0%{?suse_version} > 1220 -BuildRequires: gpg-offline BuildRequires: systemd BuildRequires: systemd-devel %endif @@ -146,7 +145,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3312 +%define SOURCE_TIMESTAMP 3327 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -165,7 +164,7 @@ 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 +Source6: samba.keyring Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source4: baselibs.conf @@ -1105,11 +1104,6 @@ Branch: %{BRANCH} %prep -%if 0%{?suse_version} > 1220 -gzip -dc %{SOURCE0} >${RPM_SOURCE_DIR}/%{name}-%{samba_ver_full}.tar -%{?gpg_verify: %gpg_verify --keyring %{SOURCE6} %{SOURCE5}} -rm ${RPM_SOURCE_DIR}/%{name}-%{samba_ver_full}.tar -%endif %setup -n samba-%{samba_ver_full} -q # patches %setup -T -D -a 2 -n samba-%{samba_ver_full} -q diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index b0f89ec..01ef58a 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:d5cbb66c5d09b5f8b6847343f953912d02eb1897926dd9888b2b71d86aacb5e9 -size 54442 +oid sha256:03c8e00d7a7be9fc59940cdb8756e49dc9aaf421566e42b8f11b2e9ccc7e83fa +size 54487