The package rpms/supermin.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/supermin.git/commit/?id=0496c3feb...
https://src.fedoraproject.org/cgit/rpms/supermin.git/commit/?id=dc9127548...
https://src.fedoraproject.org/cgit/rpms/supermin.git/commit/?id=37fd86cc2....
Change:
-%ifnarch %{no_test_arches}
+ExcludeArch: %{ix86}
+%ifnarch %{no_test_arches}
Thanks.
Full change:
============
commit ad7511ce3190410b2651ec3654952f917ae3533f
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Thu Nov 28 13:36:04 2019 +0000
Add upstream patch to fix symlinks on recent kernels (RHBZ#1770304).
diff --git a/0001-ext2-Build-symbolic-links-correctly-RHBZ-1770304.patch
b/0001-ext2-Build-symbolic-links-correctly-RHBZ-1770304.patch
new file mode 100644
index 0000000..85bc272
--- /dev/null
+++ b/0001-ext2-Build-symbolic-links-correctly-RHBZ-1770304.patch
@@ -0,0 +1,58 @@
+From 487e8c964078f823646d3b0584745ab7d0ef99ca Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones(a)redhat.com>
+Date: Tue, 26 Nov 2019 09:01:21 +0000
+Subject: [PATCH] ext2: Build symbolic links correctly (RHBZ#1770304).
+
+We created symlinks in two steps, by creating the empty inode and then
+calling ext2fs_symlink to populate it. This created broken symlinks
+where the directory name contained a / character, eg:
+
+lrwxrwxrwx 1 root root 7 Nov 26 08:43 /bin -> usr/bin
+lrwxrwxrwx 1 root root 7 Nov 26 08:43 /lib -> usr/lib
+lrwxrwxrwx 1 root root 9 Nov 26 08:43 /lib64 -> usr/lib64
+lrwxrwxrwx 1 root root 8 Nov 26 08:43 /sbin -> usr/sbin
+lrwxrwxrwx 1 root root 7 Nov 26 08:38 bin -> usr/bin
+
+This breaks with Linux >= 5.3.8, most likely because of extra
+validation now being done at the VFS layer:
+
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/fs/readdir.c?id=8a23eb804ca4f2be909e372cf5a9e7b30ae476cd
+
+It's unnecessary to create the empty inode since ext2fs_symlink can
+create the inode for us perfectly fine if we simply pass ino == 0, and
+it creates them correctly too.
+
+Thanks: Toolybird for identifying the problem and kernel patch.
+---
+ src/ext2fs-c.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/ext2fs-c.c b/src/ext2fs-c.c
+index e8ab972..8903f74 100644
+--- a/src/ext2fs-c.c
++++ b/src/ext2fs-c.c
+@@ -782,12 +782,6 @@ ext2_copy_file (struct ext2_data *data, const char *src, const char
*dest)
+ }
+ /* Create a symlink. */
+ else if (S_ISLNK (statbuf.st_mode)) {
+- ext2_ino_t ino;
+- ext2_empty_inode (data->fs, dir_ino, dirname, basename,
+- statbuf.st_mode, statbuf.st_uid, statbuf.st_gid,
+- statbuf.st_ctime, statbuf.st_atime, statbuf.st_mtime,
+- 0, 0, EXT2_FT_SYMLINK, &ino);
+-
+ char *buf = malloc (statbuf.st_size+1);
+ if (buf == NULL)
+ caml_raise_out_of_memory ();
+@@ -797,7 +791,7 @@ ext2_copy_file (struct ext2_data *data, const char *src, const char
*dest)
+ if (r > statbuf.st_size)
+ r = statbuf.st_size;
+ buf[r] = '\0';
+- ext2fs_symlink (data->fs, dir_ino, ino, dest, buf);
++ ext2fs_symlink (data->fs, dir_ino, 0, basename, buf);
+ free (buf);
+ }
+ /* Create directory. */
+--
+2.23.0
+
diff --git a/supermin.spec b/supermin.spec
index 4d0ebb4..4df1f69 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -26,7 +26,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.1.20
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv2+
%if 0%{?rhel} >= 7
@@ -51,6 +51,10 @@ Source2: libguestfs.keyring
Patch1: 0001-rpm-extend-the-Multiple_matches-exception.patch
Patch2: 0002-Print-Librpm.Multiple_matches-exceptions.patch
+# Upstream patch to fix symlinks.
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1770304
+Patch3: 0001-ext2-Build-symbolic-links-correctly-RHBZ-1770304.patch
+
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2html
BuildRequires: rpm
@@ -171,6 +175,9 @@ make check || {
%changelog
+* Thu Nov 28 2019 Richard W.M. Jones <rjones(a)redhat.com> - 5.1.20-10
+- Add upstream patch to fix symlinks on recent kernels (RHBZ#1770304).
+
* Wed Nov 27 2019 Richard W.M. Jones <rjones(a)redhat.com> - 5.1.20-9
- Use gpgverify macro instead of explicit gpgv2 command.
commit 7a88a126612115eed742860f742155c705d08997
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Nov 27 11:05:31 2019 +0000
Use gpgverify macro instead of explicit gpgv2 command.
diff --git a/supermin.spec b/supermin.spec
index fc4bb8b..4d0ebb4 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -26,7 +26,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.1.20
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2+
%if 0%{?rhel} >= 7
@@ -121,8 +121,7 @@ from supermin appliances.
%prep
%if 0%{verify_tarball_signature}
-tmphome="$(mktemp -d)"
-gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}'
--data='%{SOURCE0}'
%endif
%setup -q
%autopatch -p1
@@ -172,6 +171,9 @@ make check || {
%changelog
+* Wed Nov 27 2019 Richard W.M. Jones <rjones(a)redhat.com> - 5.1.20-9
+- Use gpgverify macro instead of explicit gpgv2 command.
+
* Wed Jul 31 2019 Richard W.M. Jones <rjones(a)redhat.com> - 5.1.20-8
- OCaml 4.08.1 (rc2) rebuild.
commit 09708b9ca8ecf0b84051c76ebe5fabe0135751ef
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Jul 31 18:39:29 2019 +0100
OCaml 4.08.1 (rc2) rebuild.
diff --git a/supermin.spec b/supermin.spec
index 18e663b..fc4bb8b 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -26,7 +26,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.1.20
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2+
%if 0%{?rhel} >= 7
@@ -172,6 +172,9 @@ make check || {
%changelog
+* Wed Jul 31 2019 Richard W.M. Jones <rjones(a)redhat.com> - 5.1.20-8
+- OCaml 4.08.1 (rc2) rebuild.
+
* Sat Jul 27 2019 Richard W.M. Jones <rjones(a)redhat.com> - 5.1.20-7
- Disable package on i686 because no kernel.
commit 0496c3feb9a7e3c221163dc66432648eda878759
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Jul 31 18:38:03 2019 +0100
Revert "Skip tests on armv7, mke2fs is broken there."
This reverts commit 37fd86cc25a5088633c531f9874793670d4fbc7d.
diff --git a/supermin.spec b/supermin.spec
index ad51634..18e663b 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -20,10 +20,6 @@
%bcond_with dietlibc
%endif
-# Architectures that cannot run the tests.
-# armv7:
https://bugzilla.redhat.com/show_bug.cgi?id=1733743
-%global no_test_arches %{arm}
-
# Whether we should verify tarball signature with GPGv2.
%global verify_tarball_signature 1
@@ -150,7 +146,6 @@ install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/
%check
-%ifnarch %{no_test_arches}
# Skip execstack test where it is known to fail.
%if 0%{?fedora} <= 20
@@ -164,7 +159,6 @@ make check || {
exit 1
}
-%endif
%files
%doc COPYING README examples/build-basic-vm.sh
commit 37fd86cc25a5088633c531f9874793670d4fbc7d
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Sun Jul 28 10:13:39 2019 +0100
Skip tests on armv7, mke2fs is broken there.
diff --git a/supermin.spec b/supermin.spec
index 18e663b..ad51634 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -20,6 +20,10 @@
%bcond_with dietlibc
%endif
+# Architectures that cannot run the tests.
+# armv7:
https://bugzilla.redhat.com/show_bug.cgi?id=1733743
+%global no_test_arches %{arm}
+
# Whether we should verify tarball signature with GPGv2.
%global verify_tarball_signature 1
@@ -146,6 +150,7 @@ install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/
%check
+%ifnarch %{no_test_arches}
# Skip execstack test where it is known to fail.
%if 0%{?fedora} <= 20
@@ -159,6 +164,7 @@ make check || {
exit 1
}
+%endif
%files
%doc COPYING README examples/build-basic-vm.sh
commit dc912754847ff7caf5d2a2ee74b1659ed1364619
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Sat Jul 27 23:57:53 2019 +0100
Disable package on i686 because no kernel.
diff --git a/supermin.spec b/supermin.spec
index 595db59..18e663b 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -26,13 +26,15 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.1.20
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
%if 0%{?rhel} >= 7
ExclusiveArch: x86_64
%endif
+ExcludeArch: %{ix86}
+
URL:
http://people.redhat.com/~rjones/supermin/
Source0:
http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
%if 0%{verify_tarball_signature}
@@ -170,6 +172,9 @@ make check || {
%changelog
+* Sat Jul 27 2019 Richard W.M. Jones <rjones(a)redhat.com> - 5.1.20-7
+- Disable package on i686 because no kernel.
+
* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.20-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit b07e68e222423d4faf4af2432f1f4ba647bafa08
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 27 00:35:39 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/supermin.spec b/supermin.spec
index c5d6bf1..595db59 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -26,7 +26,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.1.20
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
%if 0%{?rhel} >= 7
@@ -170,6 +170,9 @@ make check || {
%changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.20-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Mon Jun 10 22:13:23 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> -
5.1.20-5
- Rebuild for RPM 4.15
commit 8d2c36df46db7bc93d373ade3c30ed887a278f94
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Jun 11 00:13:23 2019 +0200
Rebuild for RPM 4.15
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/supermin.spec b/supermin.spec
index b5dd79e..c5d6bf1 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -26,7 +26,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.1.20
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
%if 0%{?rhel} >= 7
@@ -170,6 +170,9 @@ make check || {
%changelog
+* Mon Jun 10 22:13:23 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> -
5.1.20-5
+- Rebuild for RPM 4.15
+
* Mon Jun 10 15:42:06 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> -
5.1.20-4
- Rebuild for RPM 4.15
commit 13f73711adba185ddf9625a175b05d0067556c53
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jun 10 17:42:06 2019 +0200
Rebuild for RPM 4.15
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/supermin.spec b/supermin.spec
index 0526f8c..b5dd79e 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -26,7 +26,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.1.20
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
%if 0%{?rhel} >= 7
@@ -170,6 +170,9 @@ make check || {
%changelog
+* Mon Jun 10 15:42:06 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> -
5.1.20-4
+- Rebuild for RPM 4.15
+
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.20-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild