diff --git a/.gitattributes b/.gitattributes index 7c21431..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,5 +21,3 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text -## Specific LFS patterns -samba-4.1.13.tar filter=lfs diff=lfs merge=lfs -text diff --git a/patches.tar.bz2 b/patches.tar.bz2 index afde2ffc..8042db9 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38c78e4cec4f893b87bfdcb10075b624ea43a1a622413ab2af01e1ce6f28054f -size 319985 +oid sha256:d7d3f56cc44af42a42faa5534ac6947a7771daa2054b8ef8fa815309e33ab886 +size 320076 diff --git a/samba-4.1.13.tar b/samba-4.1.13.tar deleted file mode 100644 index 3a1faaf..0000000 --- a/samba-4.1.13.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:115e08afab224ae1bb04148b49ba7ec712a02395d8d8d8a5f67d08a06bbc0a75 -size 95242240 diff --git a/samba-4.1.13.tar.gz b/samba-4.1.13.tar.gz new file mode 100644 index 0000000..d21e613 --- /dev/null +++ b/samba-4.1.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:737907f4ed3a71f6ec12638387aff7cda4764f8c2eb18deeca16e2fb7ed66c9f +size 19523732 diff --git a/samba.changes b/samba.changes index f982ddf..b2ecd14 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/samba.spec b/samba.spec index d7b9c9d..ce4cc11 100644 --- a/samba.spec +++ b/samba.spec @@ -145,7 +145,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3325 +%define SOURCE_TIMESTAMP 3327 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -162,13 +162,7 @@ Recommends: logrotate Summary: A SMB/CIFS File, Print, and Authentication Server License: GPL-3.0+ Group: Productivity/Networking/Samba -# Unfortunately upstream is mindboggingly stupid here by gpg signing the -# uncompressed tarball, but not publishing the uncompressed tarball but -# only a compressed one. so we need to unpack it manually so that -# gpg verification works, but then we can't have download verification - -# %{samba_source_location} -Source: samba-%{version}%{samba_ver_suffix}.tar +Source: %{samba_source_location} Source5: %{samba_source_signature_location} Source6: samba.keyring Source1: vendor-files.tar.bz2 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 71a28f5..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:573c67e5bed3ecdef1fc5bed84ac5f52dabb64b709d098203fccf0dba7be70cc -size 54371 +oid sha256:03c8e00d7a7be9fc59940cdb8756e49dc9aaf421566e42b8f11b2e9ccc7e83fa +size 54487