diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 8f81f3c..9d25948 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7f63f8b7ba2cc240d4e4a38b82d20f5a48dfea5c4ec8bb6265cc4e34929b8af -size 25569 +oid sha256:2cf4977c0614d2c7a4f97d840e54bf91e2a9dc386dac667b63c5c6f1b0637ae3 +size 25644 diff --git a/samba.changes b/samba.changes index bfaee1b..0ada73e 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 9 15:30:31 UTC 2013 - lmuelle@suse.com + +- Verify source tar ball gpg signature. + ------------------------------------------------------------------- Fri Sep 27 12:30:24 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index d6a0067..aeae2c5 100644 --- a/samba.spec +++ b/samba.spec @@ -105,12 +105,17 @@ BuildRequires: libxslt1 %if 0%{?suse_version} > 1210 BuildRequires: libxslt-tools %endif +%if %suse_version > 1220 +BuildRequires: gpg-offline +%endif %define samba_ver 4.1.0 %define samba_ver_suffix rc4 %if "%{samba_ver_suffix}" == "" %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz +%define samba_source_signature_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.asc %else %define samba_source_location http://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.gz +%define samba_source_signature_location http://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.asc %endif %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -130,7 +135,7 @@ BuildRequires: libxslt-tools %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3083 +%define SOURCE_TIMESTAMP 3085 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -152,6 +157,8 @@ Recommends: logrotate %endif Summary: A SMB/CIFS File, Print, and Authentication Server Source: %{samba_source_location} +Source5: %{samba_source_signature_location} +Source6: http://www.samba.org/samba/ftp/samba-pubkey.asc Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source4: baselibs.conf @@ -1119,6 +1126,11 @@ Branch: %{BRANCH} %prep +%if %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 e1021b1..46d2304 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:7584271f3efa9f30d2c036ba0d3460bdccd225a78f39608e639ca24e807ce23f -size 53821 +oid sha256:d443cefde1dc5f86ac9deadebf81fd051a5348d64196fcf1d59424b1d9ec4647 +size 54121