diff --git a/.gitignore b/.gitignore index ac1f5ae..8ef0c31 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ autofs-5.0.5.tar.bz2 /autofs-5.1.5.tar.gz /autofs-5.1.6.tar.gz /autofs-5.1.7.tar.gz +/autofs-5.1.7-2.tar.gz diff --git a/autofs.spec b/autofs.spec index 8661928..d147463 100644 --- a/autofs.spec +++ b/autofs.spec @@ -12,11 +12,13 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.1.7 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 License: GPLv2+ -Source: https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.gz +Source: https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-2.tar.gz +# patches 1 and 2 have been applied to the source tar to remove +# lib/mount.x as it has an incompatible license. Patch1: autofs-5.1.7-add-xdr_exports.patch Patch2: autofs-5.1.7-remove-mount_x-and-rpcgen-dependencies.patch Patch3: autofs-5.1.7-dont-use-realloc-in-host-exports-list-processing.patch @@ -148,8 +150,10 @@ echo %{version}-%{release} > .version %if %{with_fedfs} %define fedfs_configure_arg --enable-fedfs %endif -%patch1 -p1 -%patch2 -p1 +# patches 1 and 2 have been applied to the source tar to remove +# lib/mount.x as it has an incompatible license. +#%patch1 -p1 +#%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -323,6 +327,15 @@ fi %dir /etc/auto.master.d %changelog +* Tue Apr 20 2021 Ian Kent - 1:5.1.7-14 + - bz1951344 - the autofs distribution tar has a file with an incompatible + license. + - apply first two patches to distribution tar to eliminate + use of the file with the rejected license. + - update spec file to use the new sources and not apply the + first two patches (that have beeny applied to the source tar). +- Resolves: rhbz#1951344 + * Mon Apr 19 2021 Ian Kent - 1:5.1.7-13 - bz1942371 - Drop nis support from autofs - fix dandling symlink creation if nis support is not available. diff --git a/sources b/sources index 19da7f4..9d9341a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (autofs-5.1.7.tar.gz) = d29d44c67456d7b1288a88d60226c85d620118be7ac8f7b930381f2a87486014b306a0c59a27e1ea9406bfd303e0bf0c8e912bc1fe351a4729ed2c124be5d928 +SHA512 (autofs-5.1.7-2.tar.gz) = 1ec7917db3aaa60ecc586ad61b0e7f23b3c4dc9d5f5dc89a79551c5ea03efa4fa8217877b1baa470b10a9fd0d001ca4419f17b9363d5fc912f769b9bb2b4e2c4