From fd8b7f6a840bb3638d5347d71a1991929429f7babafe577240cf7c25f22409db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 28 Oct 2014 16:02:47 +0000 Subject: [PATCH 1/2] 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/tdb?expand=0&rev=56 --- .gitattributes | 2 ++ tdb-1.3.1.tar | 3 +++ tdb-1.3.1.tar.gz | 3 --- tdb.changes | 6 ++++++ ...ribution-pubkey_13084025.asc => tdb.keyring | 0 tdb.spec | 18 ++++++++---------- 6 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 tdb-1.3.1.tar delete mode 100644 tdb-1.3.1.tar.gz rename samba-library-distribution-pubkey_13084025.asc => tdb.keyring (100%) diff --git a/.gitattributes b/.gitattributes index 9b03811..71d5dbe 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 +tdb-1.3.1.tar filter=lfs diff=lfs merge=lfs -text diff --git a/tdb-1.3.1.tar b/tdb-1.3.1.tar new file mode 100644 index 0000000..56338ed --- /dev/null +++ b/tdb-1.3.1.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c2307e537b498b11db1949354558d8995eb398968979d4971e6d7e1611a23cb +size 2201600 diff --git a/tdb-1.3.1.tar.gz b/tdb-1.3.1.tar.gz deleted file mode 100644 index c2961dd..0000000 --- a/tdb-1.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff29985ae880c3906ddd7609664a94c64bfe87b2b2210250e3fdee532ca2ece3 -size 480898 diff --git a/tdb.changes b/tdb.changes index 893eae7..29381c2 100644 --- a/tdb.changes +++ b/tdb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 28 15:43:31 UTC 2014 - lmuelle@suse.com + +- Remove dependency on gpg-offline as signature checking is implemented in the + source validator. + ------------------------------------------------------------------- Tue Sep 23 17:02:44 UTC 2014 - lmuelle@suse.com diff --git a/samba-library-distribution-pubkey_13084025.asc b/tdb.keyring similarity index 100% rename from samba-library-distribution-pubkey_13084025.asc rename to tdb.keyring diff --git a/tdb.spec b/tdb.spec index a6cb50d..d864dd7 100644 --- a/tdb.spec +++ b/tdb.spec @@ -26,9 +26,6 @@ Name: tdb %endif BuildRequires: autoconf BuildRequires: docbook-xsl-stylesheets -%if 0%{?suse_version} > 1220 -BuildRequires: gpg-offline -%endif BuildRequires: libxslt %if 0%{?suse_version} > 1020 BuildRequires: pkg-config @@ -42,9 +39,15 @@ Release: 0 Summary: Samba Trivial Database License: GPL-3.0+ Group: System/Libraries -Source: http://download.samba.org/pub/tdb/tdb-%{version}.tar.gz +# 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 + +# http://download.samba.org/pub/tdb/tdb-%{version}.tar.gz +Source: tdb-%{version}.tar Source1: http://download.samba.org/pub/tdb/tdb-%{version}.tar.asc -Source2: samba-library-distribution-pubkey_13084025.asc +Source2: tdb.keyring Source4: baselibs.conf Patch0: ignore-tdb1-run-transaction-expand.diff Patch1: build_pie.patch @@ -116,11 +119,6 @@ This package contains the python bindings for the Tdb library. %prep -%if 0%{?suse_version} > 1220 -gzip -dc %{SOURCE0} >${RPM_SOURCE_DIR}/%{name}-%{version}.tar -%{?gpg_verify: %gpg_verify --keyring %{SOURCE2} %{SOURCE1}} -rm ${RPM_SOURCE_DIR}/%{name}-%{version}.tar -%endif %setup -n tdb-%{version} -q %ifarch ppc ppc64 ppc64le %patch0 -p1 From b28b3c889235013d744dfb622776cd5adb4bba810b2fa621eae55abefc247176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 6 Nov 2014 13:32:51 +0000 Subject: [PATCH 2/2] 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/tdb?expand=0&rev=57 --- .gitattributes | 2 -- tdb-1.3.1.tar | 3 --- tdb-1.3.1.tar.gz | 3 +++ tdb.changes | 6 ++++++ tdb.spec | 8 +------- 5 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 tdb-1.3.1.tar create mode 100644 tdb-1.3.1.tar.gz diff --git a/.gitattributes b/.gitattributes index 71d5dbe..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 -tdb-1.3.1.tar filter=lfs diff=lfs merge=lfs -text diff --git a/tdb-1.3.1.tar b/tdb-1.3.1.tar deleted file mode 100644 index 56338ed..0000000 --- a/tdb-1.3.1.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c2307e537b498b11db1949354558d8995eb398968979d4971e6d7e1611a23cb -size 2201600 diff --git a/tdb-1.3.1.tar.gz b/tdb-1.3.1.tar.gz new file mode 100644 index 0000000..c2961dd --- /dev/null +++ b/tdb-1.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff29985ae880c3906ddd7609664a94c64bfe87b2b2210250e3fdee532ca2ece3 +size 480898 diff --git a/tdb.changes b/tdb.changes index 29381c2..2b3a289 100644 --- a/tdb.changes +++ b/tdb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 6 13:28:53 UTC 2014 - lmuelle@suse.com + +- Use the upstream tar ball, as signature verification is now able to handle + compressed archives. + ------------------------------------------------------------------- Tue Oct 28 15:43:31 UTC 2014 - lmuelle@suse.com diff --git a/tdb.spec b/tdb.spec index d864dd7..a7943dd 100644 --- a/tdb.spec +++ b/tdb.spec @@ -39,13 +39,7 @@ Release: 0 Summary: Samba Trivial Database License: GPL-3.0+ Group: System/Libraries -# 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 - -# http://download.samba.org/pub/tdb/tdb-%{version}.tar.gz -Source: tdb-%{version}.tar +Source: http://download.samba.org/pub/tdb/tdb-%{version}.tar.gz Source1: http://download.samba.org/pub/tdb/tdb-%{version}.tar.asc Source2: tdb.keyring Source4: baselibs.conf