From 3d62dde8a7a2355fcbd88b9b95e78ae1a57c734cda4c715f407dcb637466a980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 28 Oct 2014 16:52:54 +0000 Subject: [PATCH 1/3] Remove dependency on gpg-offline as signature checking is implemented in the source validator. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=440 --- .gitattributes | 2 ++ patches.tar.bz2 | 4 ++-- samba-4.1.13.tar | 3 +++ samba-4.1.13.tar.gz | 3 --- samba.changes | 6 ++++++ samba-pubkey_6568B7EA.asc => samba.keyring | 0 samba.spec | 18 +++++++++--------- vendor-files.tar.bz2 | 4 ++-- 8 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 samba-4.1.13.tar delete mode 100644 samba-4.1.13.tar.gz rename samba-pubkey_6568B7EA.asc => samba.keyring (100%) diff --git a/.gitattributes b/.gitattributes index 9b03811..7c21431 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ *.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 888522e..0825bf6 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:616ca9b53e8784abbbaaf814103657cb14916cb051042763b9ec6836f2dbc4a8 +size 317506 diff --git a/samba-4.1.13.tar b/samba-4.1.13.tar new file mode 100644 index 0000000..3a1faaf --- /dev/null +++ b/samba-4.1.13.tar @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index d21e613..0000000 --- a/samba-4.1.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:737907f4ed3a71f6ec12638387aff7cda4764f8c2eb18deeca16e2fb7ed66c9f -size 19523732 diff --git a/samba.changes b/samba.changes index 00e43f4..63fb713 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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..da7bc9b 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 3313 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -163,9 +162,15 @@ Recommends: logrotate Summary: A SMB/CIFS File, Print, and Authentication Server License: GPL-3.0+ Group: Productivity/Networking/Samba -Source: %{samba_source_location} +# 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 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 +1110,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..bc83ea4 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:df26c4af2f42a9832ae421e909e92805844733876a433df462c4b4af1f8b41c9 +size 54359 From c3a2e1aab24eb8b58f7d895752bd687a65ad1724be8ee41e25b386002c1fa20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 5 Nov 2014 20:30:58 +0000 Subject: [PATCH 2/3] Fix leak when closing file descriptor returned from dirfd; (bso#10918). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=441 --- 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 0825bf6..afde2ffc 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:616ca9b53e8784abbbaaf814103657cb14916cb051042763b9ec6836f2dbc4a8 -size 317506 +oid sha256:38c78e4cec4f893b87bfdcb10075b624ea43a1a622413ab2af01e1ce6f28054f +size 319985 diff --git a/samba.changes b/samba.changes index 63fb713..f982ddf 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/samba.spec b/samba.spec index da7bc9b..d7b9c9d 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 3313 +%define SOURCE_TIMESTAMP 3325 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index bc83ea4..71a28f5 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:df26c4af2f42a9832ae421e909e92805844733876a433df462c4b4af1f8b41c9 -size 54359 +oid sha256:573c67e5bed3ecdef1fc5bed84ac5f52dabb64b709d098203fccf0dba7be70cc +size 54371 From 5ae7c50d28449af32471c502e6b61d464161e278e3357dfe1632882d8da200d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 6 Nov 2014 13:59:15 +0000 Subject: [PATCH 3/3] Use the upstream tar ball, as signature verification is now able to handle compressed archives. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=442 --- .gitattributes | 2 -- patches.tar.bz2 | 4 ++-- samba-4.1.13.tar | 3 --- samba-4.1.13.tar.gz | 3 +++ samba.changes | 6 ++++++ samba.spec | 10 ++-------- vendor-files.tar.bz2 | 4 ++-- 7 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 samba-4.1.13.tar create mode 100644 samba-4.1.13.tar.gz 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