From 04944c9993f1cc0ac054ec7df95cee750ae5ac92 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Fri, 21 Jan 2022 11:26:39 -0800 Subject: [PATCH] [main extended] Enable libguestfs (#1970) * Remove libreport support from mdadm * Conditionally pull in perl-Sys-Virt test deps * Fix dependency resolution for ocaml-ctypes * Upgrade to latest ocaml-gettext * Fix ocaml-ounit build * Upgrade ocaml-base to latest * Upgrade ocaml-migrate-parsetree to latest * Upgrade ocaml-stdio to 0.15.0 * Upgrade ocaml-parsexp to 0.15.0 * Upgrade ocaml-ppxlib to 0.24.0 * Upgrade ocaml-sexplib to 0.15.0 * Upgrade ocaml-sexplib0 to 0.15.0 * Upgrade supermin to 5.2.1 * Fixup libguestfs patches and configuration --- .gitignore | 1 + .../libguestfs/libguestfs-1.44.0.tar.gz.sig | 17 --- .../libguestfs/libguestfs-config-rpm.patch | 44 ++++++ .../libguestfs-ocaml413compat.patch | 32 +++++ .../libguestfs/libguestfs.signatures.json | 4 +- SPECS-EXTENDED/libguestfs/libguestfs.spec | 129 +++++++----------- SPECS-EXTENDED/libguestfs/yum.conf.in | 1 - SPECS-EXTENDED/mdadm/mdadm.spec | 84 +++++++----- .../ocaml-base-ocaml413compat.patch | 26 ++++ .../ocaml-base/ocaml-base.signatures.json | 2 +- SPECS-EXTENDED/ocaml-base/ocaml-base.spec | 13 +- SPECS-EXTENDED/ocaml-ctypes/ocaml-ctypes.spec | 17 ++- .../ocaml-gettext.signatures.json | 2 +- .../ocaml-gettext/ocaml-gettext.spec | 106 ++++++-------- .../ocaml-migrate-parsetree.signatures.json | 2 +- .../ocaml-migrate-parsetree.spec | 11 +- SPECS-EXTENDED/ocaml-ounit/ocaml-ounit.spec | 27 ++-- .../ocaml-ounit/remove-thread-kill.patch | 13 ++ .../ocaml-parsexp.signatures.json | 2 +- .../ocaml-parsexp/ocaml-parsexp.spec | 14 +- .../ocaml-ppxlib-stdlib-shims.patch | 78 ++++++++--- .../ocaml-ppxlib/ocaml-ppxlib.signatures.json | 2 +- SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib.spec | 16 ++- .../ocaml-sexplib.signatures.json | 2 +- .../ocaml-sexplib/ocaml-sexplib.spec | 8 +- .../ocaml-sexplib0.signatures.json | 2 +- .../ocaml-sexplib0/ocaml-sexplib0.spec | 9 +- .../ocaml-stdio/ocaml-stdio.signatures.json | 2 +- SPECS-EXTENDED/ocaml-stdio/ocaml-stdio.spec | 10 +- .../perl-Sys-Virt/perl-Sys-Virt.spec | 14 +- ...min-Fix-IBM-Virtual-SCSI-driver-name.patch | 29 ---- .../supermin/supermin-5.2.0.tar.gz.sig | 17 --- .../supermin/supermin-mariner.patch | 117 ++++++++++++++++ .../supermin/supermin.signatures.json | 6 +- SPECS-EXTENDED/supermin/supermin.spec | 64 +++------ cgmanifest.json | 42 +++--- 36 files changed, 560 insertions(+), 405 deletions(-) delete mode 100644 SPECS-EXTENDED/libguestfs/libguestfs-1.44.0.tar.gz.sig create mode 100644 SPECS-EXTENDED/libguestfs/libguestfs-config-rpm.patch create mode 100644 SPECS-EXTENDED/libguestfs/libguestfs-ocaml413compat.patch create mode 100644 SPECS-EXTENDED/ocaml-base/ocaml-base-ocaml413compat.patch create mode 100644 SPECS-EXTENDED/ocaml-ounit/remove-thread-kill.patch delete mode 100644 SPECS-EXTENDED/supermin/0001-supermin-Fix-IBM-Virtual-SCSI-driver-name.patch delete mode 100644 SPECS-EXTENDED/supermin/supermin-5.2.0.tar.gz.sig create mode 100644 SPECS-EXTENDED/supermin/supermin-mariner.patch diff --git a/.gitignore b/.gitignore index 1ece7b7c281..43c64855551 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ SPECS/**/*.msp SPECS/**/*.rar SPECS/**/*.rpm SPECS/**/*.tar +SPECS/**/*.tbz SPECS/**/*.tgz SPECS/**/*.txz SPECS/**/*.xar diff --git a/SPECS-EXTENDED/libguestfs/libguestfs-1.44.0.tar.gz.sig b/SPECS-EXTENDED/libguestfs/libguestfs-1.44.0.tar.gz.sig deleted file mode 100644 index 131c279b53e..00000000000 --- a/SPECS-EXTENDED/libguestfs/libguestfs-1.44.0.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAl/1jrcRHHJpY2hAYW5u -ZXhpYS5vcmcACgkQkXOPc+G3aKCBcQ/+JwE8JTm3PdTPGoKxCqSgAOirbqE4ZvMY -p/3y5mexagcWXx6X2Y+u6dlybS06jFR8TkbjdE3VAhhJo0C8l1vfvUTWKVDZoBhG -3jZ6e+exff3VEUY4nFIVvYPNP+/J1BCiexMO0/2f1MDKwnJ73je9GlzwPEpdqPj/ -jSxaAy1G/rA5qV5rWQd4n5S9m8zRnf1lnM7YI7I0PunC2Wt/U6BZidL/FVVWVBxV -DGKTIy7GgWnfGWdqJ+Wi9o9QCJH/9FGTP35xonyQEM/7GI+jLz+a9g2xgvv584Ni -FF0Gqywrp5QFd13Nj3MPM7MXjGjUY5vB964k3mgE4fH91CnVvisRWfUCCo+c/9wG -odS0YTrveWJpm0oYU2tL3AjahRclskAxXEIxx9kbnWMUTrpXG0r8G4+vE+estCjb -mbyK5FQh2KASqNgmeopjK9DAEwD7SfPyHmPQ07Q76Pgl8X+FfBX2uyXBjaR5IJJJ -qVVamdVtPilqwWqQ8hGkKE0qVKqZHGCOJ8+AkQjHjUtSVegT6zHmCG/bM4im1dGV -r9fv6oQ7kWViz8mBluoETWr5sd2AfLOdLS8A42JaOnU7ASJUX/9eN0Y9u4BYC9P3 -l+QXikyq6T/4iC+tADOYGBr9uNitksLwSSUYScpnN+4AY+M+qjXTBq38MEHmwcgK -5mwscgQefcY= -=UrAA ------END PGP SIGNATURE----- diff --git a/SPECS-EXTENDED/libguestfs/libguestfs-config-rpm.patch b/SPECS-EXTENDED/libguestfs/libguestfs-config-rpm.patch new file mode 100644 index 00000000000..ce8513df66e --- /dev/null +++ b/SPECS-EXTENDED/libguestfs/libguestfs-config-rpm.patch @@ -0,0 +1,44 @@ +From 3950979b8f49a743ac976551b16284340539d6df Mon Sep 17 00:00:00 2001 +From: Alexandre Iooss +Date: Fri, 27 Aug 2021 16:47:24 +0200 +Subject: [PATCH] build: Define HAVE_RPM, HAVE_DPKG and HAVE_PACMAN + +When using option `--with-distro`, `HAVE_RPM`, `HAVE_DPKG` and +`HAVE_PACMAN` are not defined and make the configure phase fail. +This makes sure that these conditionals are always defined. + +(cherry picked from commit 210959cc344d6a4a1e3afa26d276b130651def74) +--- + m4/guestfs-appliance.m4 | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4 +index 8b9ddcb5d..66aea5f98 100644 +--- a/m4/guestfs-appliance.m4 ++++ b/m4/guestfs-appliance.m4 +@@ -114,16 +114,16 @@ AC_ARG_WITH([distro], + AC_MSG_ERROR([/etc/os-release not available, please specify the distro using --with-distro=DISTRO]) + fi + ] +- AM_CONDITIONAL([HAVE_RPM], +- [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true], +- [*], [false])]) +- AM_CONDITIONAL([HAVE_DPKG], +- [AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true], +- [*], [false])]) +- AM_CONDITIONAL([HAVE_PACMAN], +- [AS_CASE([$DISTRO], [ARCHLINUX | FRUGALWARE ], [true], +- [*], [false])]) + ) ++AM_CONDITIONAL([HAVE_RPM], ++ [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true], ++ [*], [false])]) ++AM_CONDITIONAL([HAVE_DPKG], ++ [AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true], ++ [*], [false])]) ++AM_CONDITIONAL([HAVE_PACMAN], ++ [AS_CASE([$DISTRO], [ARCHLINUX | FRUGALWARE ], [true], ++ [*], [false])]) + AC_SUBST([DISTRO]) + + dnl Add extra packages to the appliance. diff --git a/SPECS-EXTENDED/libguestfs/libguestfs-ocaml413compat.patch b/SPECS-EXTENDED/libguestfs/libguestfs-ocaml413compat.patch new file mode 100644 index 00000000000..c48c721c87a --- /dev/null +++ b/SPECS-EXTENDED/libguestfs/libguestfs-ocaml413compat.patch @@ -0,0 +1,32 @@ +From cc4ecbe236914f9b391ecf3815008547472632f8 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 2 Mar 2021 10:39:15 +0000 +Subject: [PATCH] mlstdutils/std_utils.ml: Fix for OCaml 4.12. + +We were using a default function from somewhere called "compare" +instead of the actual function (Pervasives.compare / Stdlib.compare). +Since the wrong default function was used it had a different type from +what we expected: + +File "std_utils.ml", line 312, characters 36-37: +312 | | (y, y') :: _ when cmp x y = 0 -> y' + ^ +Error: This expression has type int but an expression was expected of type + 'weak1 list -> int +--- + common/mlstdutils/std_utils.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/mlstdutils/std_utils.ml b/common/mlstdutils/std_utils.ml +index 4237ea5..8847717 100644 +--- a/common/mlstdutils/std_utils.ml ++++ b/common/mlstdutils/std_utils.ml +@@ -307,7 +307,7 @@ module List = struct + | x::xs, y::ys, z::zs -> (x, y, z) :: combine3 xs ys zs + | _ -> invalid_arg "combine3" + +- let rec assoc_lbl ?(cmp = compare) ~default x = function ++ let rec assoc_lbl ?(cmp = Pervasives.compare) ~default x = function + | [] -> default + | (y, y') :: _ when cmp x y = 0 -> y' + | _ :: ys -> assoc_lbl ~cmp ~default x ys diff --git a/SPECS-EXTENDED/libguestfs/libguestfs.signatures.json b/SPECS-EXTENDED/libguestfs/libguestfs.signatures.json index 4a88c5cd513..b1d2a41da85 100644 --- a/SPECS-EXTENDED/libguestfs/libguestfs.signatures.json +++ b/SPECS-EXTENDED/libguestfs/libguestfs.signatures.json @@ -4,6 +4,6 @@ "copy-patches.sh": "9e0112d9b85f80f48697ffefbb6cc3a1eda527ea5ff065f48e08440dfba573e8", "guestfish.sh": "5efae0e6b38c7a137265bc1f3988dc9734a99a08a87ffbcfa1715aefe3982d29", "libguestfs-1.44.0.tar.gz": "0ec7b44a4c50e928583c56099da31ceb9680766043bd7d468f3ca7b741c55d21", - "yum.conf.in": "b391659cc5cd6ce3b48613429aaec4fab26543fb0b185d03597613475cd34755" + "yum.conf.in": "2ca1e0ea6814436211715f14975e211263db10f09fca1fdef51c5aa3fe52a357" } -} \ No newline at end of file +} diff --git a/SPECS-EXTENDED/libguestfs/libguestfs.spec b/SPECS-EXTENDED/libguestfs/libguestfs.spec index b9d4a7e4844..f97b9b72530 100644 --- a/SPECS-EXTENDED/libguestfs/libguestfs.spec +++ b/SPECS-EXTENDED/libguestfs/libguestfs.spec @@ -36,12 +36,14 @@ Distribution: Mariner # Unbreak the linker. %undefine _strict_symbol_defs_build -%bcond_with applicances +%bcond_without applicances +%bcond_with php +%bcond_with inspect-icons Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.44.0 -Release: 2%{?dist} +Release: 4%{?dist} License: LGPLv2+ # Source and patches. @@ -60,6 +62,10 @@ Source6: yum.conf.in # Maintainer script which helps with handling patches. Source8: copy-patches.sh +# Upstream patches not present in 1.44.0 +Patch0: libguestfs-ocaml413compat.patch +Patch1: libguestfs-config-rpm.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel %endif @@ -99,7 +105,9 @@ BuildRequires: xz-devel BuildRequires: zip BuildRequires: unzip BuildRequires: systemd-units +%if %{with inspect-icons} BuildRequires: netpbm-progs +%endif BuildRequires: icoutils BuildRequires: libvirt-daemon-kvm >= 5.3.0 BuildRequires: perl(Expect) @@ -144,7 +152,9 @@ BuildRequires: rubygem(json) BuildRequires: rubygem(rdoc) BuildRequires: rubygem(test-unit) BuildRequires: rubygem(irb) +%if %{with php} BuildRequires: php-devel +%endif BuildRequires: gobject-introspection-devel #BuildRequires: gjs BuildRequires: vala @@ -187,11 +197,9 @@ BuildRequires: genisoimage BuildRequires: gfs2-utils BuildRequires: grep BuildRequires: gzip -BuildRequires: hfsplus-tools BuildRequires: hivex BuildRequires: iproute BuildRequires: iputils -BuildRequires: jfsutils BuildRequires: kernel BuildRequires: kmod BuildRequires: kpartx @@ -205,7 +213,6 @@ BuildRequires: lsscsi BuildRequires: lvm2 BuildRequires: lzop BuildRequires: mdadm -BuildRequires: nilfs-utils BuildRequires: ntfs-3g ntfsprogs ntfs-3g-system-compression BuildRequires: openssh-clients BuildRequires: parted @@ -215,7 +222,6 @@ BuildRequires: policycoreutils BuildRequires: procps BuildRequires: psmisc BuildRequires: qemu-img -BuildRequires: reiserfs-utils BuildRequires: rsync BuildRequires: scrub BuildRequires: sed @@ -323,11 +329,7 @@ For enhanced features, install: libguestfs-forensics adds filesystem forensics support libguestfs-gfs2 adds Global Filesystem (GFS2) support - libguestfs-hfsplus adds HFS+ (Mac filesystem) support libguestfs-inspect-icons adds support for inspecting guest icons - libguestfs-jfs adds JFS support - libguestfs-nilfs adds NILFS v2 support - libguestfs-reiserfs adds ReiserFS support libguestfs-rescue enhances virt-rescue shell with more tools libguestfs-rsync rsync to/from guest filesystems libguestfs-ufs adds UFS (BSD) support @@ -347,7 +349,9 @@ Language bindings: lua-guestfs Lua bindings ocaml-libguestfs-devel OCaml bindings perl-Sys-Guestfs Perl bindings +%if %{with php} php-libguestfs PHP bindings +%endif python3-libguestfs Python 3 bindings ruby-libguestfs Ruby bindings libguestfs-vala Vala language bindings @@ -385,47 +389,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description gfs2 This adds GFS2 support to %{name}. Install it if you want to process -disk images containing GFS2. - - -%package hfsplus -Summary: HFS+ support for %{name} -License: LGPLv2+ -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description hfsplus -This adds HFS+ support to %{name}. Install it if you want to process -disk images containing HFS+ / Mac OS Extended filesystems. - - -%package jfs -Summary: JFS support for %{name} -License: LGPLv2+ -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description jfs -This adds JFS support to %{name}. Install it if you want to process -disk images containing JFS. - - -%package nilfs -Summary: NILFS support for %{name} -License: LGPLv2+ -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description nilfs -This adds NILFS v2 support to %{name}. Install it if you want to process -disk images containing NILFS v2. - - -%package reiserfs -Summary: ReiserFS support for %{name} -License: LGPLv2+ -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description reiserfs -This adds ReiserFS support to %{name}. Install it if you want to process -disk images containing ReiserFS. +disk images containing GFS2.Exiting due to strict setting %package rescue @@ -480,6 +444,7 @@ disk images containing ZFS. %endif +%if %{with inspect-icons} %package inspect-icons Summary: Additional dependencies for inspecting guest icons License: LGPLv2+ @@ -497,6 +462,7 @@ inspect non-Linux guests and display icons from them. The only reason this is a separate package is to avoid core libguestfs having to depend on Perl. See https://bugzilla.redhat.com/1194158 +%endif %package tools-c @@ -701,7 +667,7 @@ Provides: ruby(guestfs) = %{version} %description -n ruby-%{name} ruby-%{name} contains Ruby bindings for %{name}. - +%if %{with php} %package -n php-%{name} Summary: PHP bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -710,7 +676,7 @@ Requires: php(api) = %{php_core_api} %description -n php-%{name} php-%{name} contains PHP bindings for %{name}. - +%endif %package -n lua-guestfs Summary: Lua bindings for %{name} @@ -809,13 +775,24 @@ fi mv README README.orig sed 's/@VERSION@/%{version}/g' < %{SOURCE4} > README +mkdir cachedir repo +find /var/cache/{dnf,tdnf} -type f -name '*.rpm' -print0 | \ + xargs -0 -n 1 cp -t repo +createrepo_c repo +sed -e "s|@PWD@|$(pwd)|" %{SOURCE6} > yum.conf + %build +# "--with-distro=REDHAT" is used to indicate Mariner is "Fedora-like" in package naming %{configure} \ PYTHON=%{__python3} \ + --with-distro=REDHAT \ + --with-supermin-packager-config=$(pwd)/yum.conf \ --with-default-backend=libvirt \ --with-qemu="qemu-system-%{_build_arch} qemu" \ +%if %{without php} --disable-php \ +%endif %ifnarch %{golang_arches} --disable-golang \ %endif @@ -912,16 +889,11 @@ function move_to } move_to curl zz-packages-dib -move_to debootstrap zz-packages-dib move_to kpartx zz-packages-dib move_to qemu-img zz-packages-dib move_to which zz-packages-dib move_to sleuthkit zz-packages-forensics move_to gfs2-utils zz-packages-gfs2 -move_to hfsplus-tools zz-packages-hfsplus -move_to jfsutils zz-packages-jfs -move_to nilfs-utils zz-packages-nilfs -move_to reiserfs-utils zz-packages-reiserfs move_to iputils zz-packages-rescue move_to lsof zz-packages-rescue move_to openssh-clients zz-packages-rescue @@ -934,10 +906,6 @@ move_to xfsprogs zz-packages-xfs move_to zfs-fuse zz-packages-zfs %endif -# On Fedora you need kernel-modules-extra to be able to mount -# UFS (BSD) filesystems. -echo "kernel-modules-extra" > zz-packages-ufs - popd %endif @@ -1008,18 +976,6 @@ rm ocaml/html/.gitignore %files gfs2 %{_libdir}/guestfs/supermin.d/zz-packages-gfs2 -%files hfsplus -%{_libdir}/guestfs/supermin.d/zz-packages-hfsplus - -%files jfs -%{_libdir}/guestfs/supermin.d/zz-packages-jfs - -%files nilfs -%{_libdir}/guestfs/supermin.d/zz-packages-nilfs - -%files reiserfs -%{_libdir}/guestfs/supermin.d/zz-packages-reiserfs - %files rsync %{_libdir}/guestfs/supermin.d/zz-packages-rsync @@ -1039,8 +995,10 @@ rm ocaml/html/.gitignore %endif +%if %{with inspect-icons} %files inspect-icons # no files +%endif %files tools-c %doc README @@ -1173,13 +1131,13 @@ rm ocaml/html/.gitignore %{ruby_vendorarchdir}/_guestfs.so %{_mandir}/man3/guestfs-ruby.3* -# Temporarily disabled by Fedora -#%files -n php-%{name} -#%doc php/README-PHP -#%dir %{_sysconfdir}/php.d -#%{_sysconfdir}/php.d/guestfs_php.ini -#%{_libdir}/php/modules/guestfs_php.so - +%if %{with php} +%files -n php-%{name} +%doc php/README-PHP +%dir %{_sysconfdir}/php.d +%{_sysconfdir}/php.d/guestfs_php.ini +%{_libdir}/php/modules/guestfs_php.so +%endif %files -n lua-guestfs %doc lua/examples/*.lua @@ -1230,6 +1188,15 @@ rm ocaml/html/.gitignore %changelog +* Thu Jan 20 2022 Thomas Crain - 1.44.0-3 +- Remove Fedora-specific comments/macros +- Remove link to highjacked upstream bug tracker +- Conditionally include PHP deps (off by default) +- Patch ocaml support, RPM config support +- Disable inspect-icons support by default (we don't have ghostscript) +- Remove reiserfs, nilfs, jfs, hfsplus completely +- License verified + * Thu Sep 30 2021 Thomas Crain - 1.44.0-2 - Initial CBL-Mariner import from Fedora 33 (license: MIT). - Remove epoch diff --git a/SPECS-EXTENDED/libguestfs/yum.conf.in b/SPECS-EXTENDED/libguestfs/yum.conf.in index d5e30d0b78c..da3ce07ea95 100644 --- a/SPECS-EXTENDED/libguestfs/yum.conf.in +++ b/SPECS-EXTENDED/libguestfs/yum.conf.in @@ -12,6 +12,5 @@ modulesdir=@PWD@/modules [local] name=local baseurl=file://@PWD@/repo -failovermethod=priority enabled=1 gpgcheck=0 diff --git a/SPECS-EXTENDED/mdadm/mdadm.spec b/SPECS-EXTENDED/mdadm/mdadm.spec index 74ff38cc20e..6a8c5889994 100644 --- a/SPECS-EXTENDED/mdadm/mdadm.spec +++ b/SPECS-EXTENDED/mdadm/mdadm.spec @@ -1,37 +1,39 @@ -Name: mdadm -Version: 4.1 -#define subversion rc2 -Release: 6%{?dist} -Summary: The mdadm program controls Linux md devices (software RAID arrays) +%bcond_with libreport +Summary: The mdadm program controls Linux md devices (software RAID arrays) +Name: mdadm +Version: 4.1 +Release: 7%{?dist} +License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner -URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ -License: GPLv2+ - -Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}%{?subversion:-%{subversion}}.tar.xz -Source1: raid-check -Source2: mdadm.rules -Source3: mdadm-raid-check-sysconfig -Source4: mdmonitor.service -Source5: mdadm.conf -Source6: mdadm_event.conf -Source7: raid-check.timer -Source8: raid-check.service - +URL: https://www.kernel.org/pub/linux/utils/raid/mdadm/ +Source0: http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz +Source1: raid-check +Source2: mdadm.rules +Source3: mdadm-raid-check-sysconfig +Source4: mdmonitor.service +Source5: mdadm.conf +Source6: mdadm_event.conf +Source7: raid-check.timer +Source8: raid-check.service # Build without -Werror. From Debian. -Patch00: https://sources.debian.org/data/main/m/mdadm/4.1-2/debian/patches/debian-no-Werror.diff#/mdadm-4.1-no-Werror.patch - +Patch00: https://sources.debian.org/data/main/m/mdadm/4.1-2/debian/patches/debian-no-Werror.diff#/mdadm-4.1-no-Werror.patch # Fedora customization patches -Patch97: mdadm-3.3-udev.patch -Patch98: mdadm-2.5.2-static.patch - -BuildRequires: systemd-rpm-macros binutils-devel gcc -Requires: libreport-filesystem -Requires(post): systemd coreutils +Patch97: mdadm-3.3-udev.patch +Patch98: mdadm-2.5.2-static.patch +BuildRequires: binutils-devel +BuildRequires: gcc +BuildRequires: systemd-rpm-macros +Requires(post): coreutils +Requires(post): systemd +Requires(postun): coreutils +Requires(postun): systemd Requires(preun): systemd -Requires(postun): systemd coreutils +%if %{with libreport} +Requires: libreport-filesystem +%endif -%description +%description The mdadm program is used to create, manage, and monitor Linux MD (software RAID) devices. As such, it provides similar functionality to the raidtools package. However, mdadm is a single program, and it can perform @@ -42,10 +44,10 @@ file can be used to help with some common tasks. %autosetup -p1 -n %{name}-%{version}%{?subversion:_%{subversion}} %build -make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon +make %{?_smp_mflags} CXFLAGS="%{optflags}" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon %install -make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=%{_sbindir} SYSTEMD_DIR=%{_unitdir} UDEVDIR=/usr/lib/udev/ install install-systemd +make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=%{_sbindir} SYSTEMD_DIR=%{_unitdir} UDEVDIR=%{_libdir}/udev/ install install-systemd install -Dp -m 755 %{SOURCE1} %{buildroot}%{_sbindir}/raid-check install -Dp -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/65-md-incremental.rules install -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/raid-check @@ -64,8 +66,10 @@ mkdir -p %{buildroot}%{_localstatedir}/run/ install -d -m 0710 %{buildroot}/run/%{name}/ # abrt -mkdir -p %{buildroot}/etc/libreport/events.d -install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d +%if %{with libreport} +mkdir -p %{buildroot}%{_sysconfdir}/libreport/events.d +install -m644 %{SOURCE6} %{buildroot}%{_sysconfdir}/libreport/events.d +%endif %post %systemd_post mdmonitor.service raid-check.timer @@ -83,13 +87,20 @@ install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d %{_sbindir}/* %{_unitdir}/* %{_mandir}/man*/md* -/usr/lib/systemd/system-shutdown/* +%{_libdir}/systemd/system-shutdown/* %config(noreplace) %{_sysconfdir}/sysconfig/* %dir /run/%{name}/ %config(noreplace) %{_tmpfilesdir}/%{name}.conf -/etc/libreport/events.d/* +%if %{with libreport} +%{_sysconfdir}/libreport/events.d/* +%endif %changelog +* Tue Jan 18 2022 Thomas Crain - 4.1-7 +- Disable usage of libreport by default +- License verified +- Lint spec + * Thu Oct 14 2021 Pawel Winogrodzki - 4.1-6 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Converting the 'Release' tag to the '[number].[distribution]' format. @@ -150,7 +161,7 @@ install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d * Mon Jul 09 2018 Xiao Ni 4.1-rc1-1 - Update to latest upstream version 4.1-rc1 - Resolves bz1556591 - + * Wed Jul 4 2018 Peter Robinson 4.0-7 - Cleanup spec, use %%licenece, drop old sys-v migration bits @@ -215,6 +226,7 @@ install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d * Tue Aug 26 2014 Jes Sorensen - 3.3.2-1 - Upgrade to mdadm-3.3.2 - Resolves bz1132847 + * Sun Aug 17 2014 Fedora Release Engineering - 3.3.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -831,7 +843,7 @@ install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d * Thu Apr 17 2008 Bill Nottingham - 2.6.4-4 - make /dev/md if necessary in incremental mode (#429604) - open RAID devices with O_EXCL to avoid racing against other --incremental processes (#433932) - + * Fri Feb 1 2008 Bill Nottingham - 2.6.4-3 - add a udev rules file for device assembly (#429604) diff --git a/SPECS-EXTENDED/ocaml-base/ocaml-base-ocaml413compat.patch b/SPECS-EXTENDED/ocaml-base/ocaml-base-ocaml413compat.patch new file mode 100644 index 00000000000..bf1a8bfb81e --- /dev/null +++ b/SPECS-EXTENDED/ocaml-base/ocaml-base-ocaml413compat.patch @@ -0,0 +1,26 @@ +--- a/shadow-stdlib/gen/mapper.mll 2021-11-19 11:05:01.000000000 -0700 ++++ b/shadow-stdlib/gen/mapper.mll 2021-11-23 15:17:54.018455142 -0700 +@@ -110,10 +110,13 @@ let val_replacement = function + | "abs" -> No_equivalent + | "abs_float" -> No_equivalent + | "acos" -> Repl "Float.acos" ++ | "acosh" -> Repl "Float.acosh" + | "asin" -> Repl "Float.asin" ++ | "asinh" -> Repl "Float.asinh" + | "at_exit" -> No_equivalent + | "atan" -> Repl "Float.atan" + | "atan2" -> Repl "Float.atan2" ++ | "atanh" -> Repl "Float.atanh" + | "bool_of_string" -> Repl "Bool.of_string" + | "bool_of_string_opt" -> No_equivalent + | "ceil" -> Repl "Float.round_up" +--- a/src/dune 2021-11-19 11:05:01.000000000 -0700 ++++ b/src/dune 2021-11-23 15:29:54.579266675 -0700 +@@ -9,6 +9,7 @@ + + (library (name base) (public_name base) + (libraries base_internalhash_types caml sexplib0 shadow_stdlib) ++ (flags :standard -w -55) + (c_flags :standard -D_LARGEFILE64_SOURCE (:include mpopcnt.sexp)) + (c_names exn_stubs int_math_stubs hash_stubs am_testing) + (preprocess no_preprocessing) diff --git a/SPECS-EXTENDED/ocaml-base/ocaml-base.signatures.json b/SPECS-EXTENDED/ocaml-base/ocaml-base.signatures.json index bedcd9221dd..6f1ce6d8942 100644 --- a/SPECS-EXTENDED/ocaml-base/ocaml-base.signatures.json +++ b/SPECS-EXTENDED/ocaml-base/ocaml-base.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "base-0.14.1.tar.gz": "8926852cded78899337f1e0b8777c0cd7d4e52604f982c7c1611a9290ceb608d" + "base-0.15.0.tar.gz": "9c2cdcd9ef565d444e261f43270377228c9d01e71ab2e78edb00956912c710aa" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/ocaml-base/ocaml-base.spec b/SPECS-EXTENDED/ocaml-base/ocaml-base.spec index 590b7ef94c7..d5cea467838 100644 --- a/SPECS-EXTENDED/ocaml-base/ocaml-base.spec +++ b/SPECS-EXTENDED/ocaml-base/ocaml-base.spec @@ -8,17 +8,17 @@ Distribution: Mariner %global srcname base Name: ocaml-%{srcname} -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Jane Street standard library for OCaml License: MIT URL: https://opensource.janestreet.com/base/ Source0: https://github.com/janestreet/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz - +Patch0: %{name}-ocaml413compat.patch BuildRequires: ocaml >= 4.07.0 BuildRequires: ocaml-dune-devel >= 2.0.0 -BuildRequires: ocaml-sexplib0-devel >= 0.14 +BuildRequires: ocaml-sexplib0-devel >= 0.15 %description Base is a standard library for OCaml. It provides a standard set of @@ -116,6 +116,11 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ %{_libdir}/ocaml/%{srcname}/*/*.mli %changelog +* Tue Jan 18 2022 Thomas Crain - 0.15.0-1 +- Upgrade to latest upstream version +- Add patch for OCaml 4.13.0 compatibility +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 0.14.1-2 - Initial CBL-Mariner import from Fedora 34 (license: MIT). diff --git a/SPECS-EXTENDED/ocaml-ctypes/ocaml-ctypes.spec b/SPECS-EXTENDED/ocaml-ctypes/ocaml-ctypes.spec index cd03d00713d..30853d0359f 100644 --- a/SPECS-EXTENDED/ocaml-ctypes/ocaml-ctypes.spec +++ b/SPECS-EXTENDED/ocaml-ctypes/ocaml-ctypes.spec @@ -1,12 +1,9 @@ Vendor: Microsoft Corporation Distribution: Mariner -# Enable building and running the tests -# This is disabled by default, because ocaml-lwt requires this package to build. -%bcond_with test Name: ocaml-ctypes Version: 0.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Combinators for binding to C libraries without writing any C License: MIT @@ -19,9 +16,9 @@ BuildRequires: ocaml-bigarray-compat-devel BuildRequires: ocaml-findlib BuildRequires: ocaml-integers-devel >= 0.3.0 BuildRequires: ocaml-ocamldoc -BuildRequires: pkgconfig(libffi) +BuildRequires: libffi-devel -%if %{with test} +%if %{with_check} BuildRequires: pkgconfig(ncurses) BuildRequires: ocaml-bisect-ppx-devel BuildRequires: ocaml-lwt-devel >= 3.2.0 @@ -60,7 +57,7 @@ The %{name}-doc package contains developer documentation for %prep %autosetup -# Use Fedora flags +# Use Mariner flags sed -e 's|-fPIC -Wall -g|-fPIC %{build_cflags}|' \ -e 's|-link -static-libgcc|%{build_ldflags}|' \ -i Makefile.rules @@ -95,10 +92,8 @@ mkdir -p $DESTDIR/ctypes-foreign cp -p ctypes-foreign.opam $DESTDIR/ctypes-foreign/opam cp -p ctypes.opam $DESTDIR/ctypes/opam -%if %{with test} %check make test -%endif %files %license LICENSE @@ -130,6 +125,10 @@ make test %doc *.html *.css %changelog +* Tue Jan 18 2022 Thomas Crain - 0.18.0-3 +- Use direct libffi-devel BR instead of pkgconfig(libffi) due to improper provides +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 0.18.0-2 - Initial CBL-Mariner import from Fedora 34 (license: MIT). diff --git a/SPECS-EXTENDED/ocaml-gettext/ocaml-gettext.signatures.json b/SPECS-EXTENDED/ocaml-gettext/ocaml-gettext.signatures.json index 76cbc5e828d..2594d7ba90c 100644 --- a/SPECS-EXTENDED/ocaml-gettext/ocaml-gettext.signatures.json +++ b/SPECS-EXTENDED/ocaml-gettext/ocaml-gettext.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "ocaml-gettext-0.3.8-3aecf8e5350f.tar.gz": "007dc792d564257f10a4f62695f97547c9ffe22f6c3aa01c7d5747a84c3fc369" + "gettext-v0.4.2.tbz": "8b672c7c521b8ac753c6a90925243cdd367dd5202e7c1e5d1a2507b11ad5d6a7" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/ocaml-gettext/ocaml-gettext.spec b/SPECS-EXTENDED/ocaml-gettext/ocaml-gettext.spec index 25594440ea1..172dca9e7e7 100644 --- a/SPECS-EXTENDED/ocaml-gettext/ocaml-gettext.spec +++ b/SPECS-EXTENDED/ocaml-gettext/ocaml-gettext.spec @@ -1,46 +1,33 @@ -Vendor: Microsoft Corporation -Distribution: Mariner %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) - +%global __ocaml_requires_opts -i Asttypes -i Parsetree +%global __ocaml_provides_opts -i Pr_gettext +Summary: OCaml library for i18n Name: ocaml-gettext -Version: 0.3.8 +Version: 0.4.2 Release: 1%{?dist} -Summary: OCaml library for i18n - License: LGPLv2+ with exceptions +Vendor: Microsoft Corporation +Distribution: Mariner URL: https://github.com/gildor478/ocaml-gettext - -#Source0: https://github.com/gildor478/%{name}/archive/%{version}.tar.gz -# Temporarily using a preview of 0.3.8 built from git: -# git archive --format=tar --prefix=ocaml-gettext-0.3.8/ 3aecf8e5350f | gzip > ocaml-gettext-0.3.8-3aecf8e5350f.tar.gz -Source0: ocaml-gettext-0.3.8-3aecf8e5350f.tar.gz - +Source0: https://github.com/gildor478/ocaml-gettext/releases/download/v%{version}/gettext-v%{version}.tbz +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: chrpath +BuildRequires: docbook-style-xsl +BuildRequires: libxml2 +BuildRequires: libxslt BuildRequires: ocaml >= 4.00.1 -BuildRequires: ocaml-findlib-devel >= 1.3.3-3 +BuildRequires: ocaml-camomile-data +BuildRequires: ocaml-camomile-devel >= 0.8.6-3 BuildRequires: ocaml-compiler-libs -BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-fileutils-devel >= 0.4.4-4 +BuildRequires: ocaml-cppo BuildRequires: ocaml-dune-devel -BuildRequires: docbook-style-xsl -BuildRequires: libxslt -BuildRequires: libxml2 -BuildRequires: chrpath -BuildRequires: autoconf -%if !0%{?rhel} +BuildRequires: ocaml-fileutils-devel >= 0.4.4-4 +BuildRequires: ocaml-findlib-devel >= 1.3.3-3 +BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ounit-devel -BuildRequires: ocaml-camomile-devel >= 0.8.6-3 -BuildRequires: ocaml-camomile-data -%endif -BuildRequires: autoconf, automake - -%if !0%{?rhel} # ocaml-gettext program needs camomile data files Requires: ocaml-camomile-data -%endif - -%global __ocaml_requires_opts -i Asttypes -i Parsetree -%global __ocaml_provides_opts -i Pr_gettext - %description Ocaml-gettext provides support for internationalization of Ocaml @@ -53,47 +40,36 @@ Constraints : * provides a way to automatically extract translatable strings from Ocaml source code. - %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} - # BZ 446919. Requires: ocaml-fileutils-devel >= 0.4.0 - %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. - -%if !0%{?rhel} %package camomile Summary: Parts of %{name} which depend on Camomile Requires: %{name} = %{version}-%{release} - %description camomile The %{name}-camomile package contains the parts of %{name} which depend on Camomile. - %package camomile-devel Summary: Development files for %{name}-camomile -Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-camomile = %{version}-%{release} - +Requires: %{name}-devel = %{version}-%{release} %description camomile-devel The %{name}-camomile-devel package contains libraries and signature files for developing applications that use %{name}-camomile. -%endif - %prep -%setup -q -#autopatch -p1 +%autosetup -n gettext-v%{version} # Remove dependency on batteries. sed -i -e 's/batteries//' test/dune @@ -110,20 +86,19 @@ make build %install -mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml -mkdir -p $RPM_BUILD_ROOT%{_bindir} -dune install --destdir=$RPM_BUILD_ROOT +mkdir -p %{buildroot}%{_libdir}/ocaml +mkdir -p %{buildroot}%{_bindir} +dune install --destdir=%{buildroot} # Remove this, we will use our own rules for documentation. -rm -rf $RPM_BUILD_ROOT/usr/doc +rm -rf %{buildroot}%{_prefix}/doc %files -%doc COPYING +%license LICENSE.txt %{_libdir}/ocaml/gettext %{_libdir}/ocaml/gettext-stub -%if %opt -%exclude %{_libdir}/ocaml/gettext/*.a +%if %{opt} %exclude %{_libdir}/ocaml/gettext/*.cmxa %exclude %{_libdir}/ocaml/gettext/*/*.a %exclude %{_libdir}/ocaml/gettext/*/*.cmxa @@ -137,12 +112,9 @@ rm -rf $RPM_BUILD_ROOT/usr/doc %exclude %{_libdir}/ocaml/gettext-stub/*.ml %{_libdir}/ocaml/stublibs/*.so - %files devel -%doc README.md CHANGELOG THANKS TODO.md -# %doc build/share/doc/html/* -%if %opt -%{_libdir}/ocaml/gettext/*.a +%doc README.md CHANGES.md THANKS TODO.md +%if %{opt} %{_libdir}/ocaml/gettext/*.cmxa %{_libdir}/ocaml/gettext/*/*.a %{_libdir}/ocaml/gettext/*/*.cmxa @@ -156,32 +128,36 @@ rm -rf $RPM_BUILD_ROOT/usr/doc %{_libdir}/ocaml/gettext-stub/*.ml %{_bindir}/ocaml-gettext %{_bindir}/ocaml-xgettext +%{_mandir}/man1/ocaml-gettext.1* +%{_mandir}/man1/ocaml-xgettext.1* +%{_mandir}/man5/ocaml-gettext.5* - -%if !0%{?rhel} %files camomile -%doc COPYING +%license LICENSE.txt %{_libdir}/ocaml/gettext-camomile -%if %opt +%if %{opt} %exclude %{_libdir}/ocaml/gettext-camomile/*.a %exclude %{_libdir}/ocaml/gettext-camomile/*.cmxa %exclude %{_libdir}/ocaml/gettext-camomile/*.cmx %endif %exclude %{_libdir}/ocaml/gettext-camomile/*.mli - %files camomile-devel %doc README.md -%if %opt +%if %{opt} %{_libdir}/ocaml/gettext-camomile/*.a %{_libdir}/ocaml/gettext-camomile/*.cmxa %{_libdir}/ocaml/gettext-camomile/*.cmx %endif %{_libdir}/ocaml/gettext-camomile/*.mli -%endif - %changelog +* Tue Jan 18 2022 Thomas Crain - 0.4.2-1 +- Upgrade to latest upstream version +- Remove RHEL distro check macros +- Lint spec +- License verified + * Thu Oct 14 2021 Pawel Winogrodzki - 0.3.8-1 - Switching to using full number for the 'Release' tag. - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/ocaml-migrate-parsetree/ocaml-migrate-parsetree.signatures.json b/SPECS-EXTENDED/ocaml-migrate-parsetree/ocaml-migrate-parsetree.signatures.json index 68256fa704f..426893f89d4 100644 --- a/SPECS-EXTENDED/ocaml-migrate-parsetree/ocaml-migrate-parsetree.signatures.json +++ b/SPECS-EXTENDED/ocaml-migrate-parsetree/ocaml-migrate-parsetree.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "ocaml-migrate-parsetree-2.1.0.tar.gz": "526e72f4bcbbe4dfb9d775338784b255a8200ae5244529329112028c6f981776" + "ocaml-migrate-parsetree-2.3.0.tbz": "108126b247f190e04c8afd3d72ced0b63ffdf73c3f801f09be5db0cd7280bf0a" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/ocaml-migrate-parsetree/ocaml-migrate-parsetree.spec b/SPECS-EXTENDED/ocaml-migrate-parsetree/ocaml-migrate-parsetree.spec index 814eabf9950..81200892703 100644 --- a/SPECS-EXTENDED/ocaml-migrate-parsetree/ocaml-migrate-parsetree.spec +++ b/SPECS-EXTENDED/ocaml-migrate-parsetree/ocaml-migrate-parsetree.spec @@ -1,13 +1,13 @@ Vendor: Microsoft Corporation Distribution: Mariner Name: ocaml-migrate-parsetree -Version: 2.1.0 -Release: 2%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: Convert OCaml parsetrees between different major versions License: LGPLv2+ with exceptions URL: https://github.com/ocaml-ppx/ocaml-migrate-parsetree -Source0: https://github.com/ocaml-ppx/ocaml-migrate-parsetree/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v%{version}/%{name}-%{version}.tbz BuildRequires: ocaml BuildRequires: ocaml-dune @@ -68,7 +68,6 @@ dune runtest %files devel %doc README.md CHANGES.md -%license LICENSE.md %ifarch %{ocaml_native_compiler} %{_libdir}/ocaml/*/{,*/}*.a %{_libdir}/ocaml/*/{,*/}*.cmxa @@ -81,6 +80,10 @@ dune runtest %changelog +* Tue Jan 18 2022 Thomas Crain - 2.3.0-1 +- Upgrade to latest upstream version +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 2.1.0-2 - Initial CBL-Mariner import from Fedora 34 (license: MIT). diff --git a/SPECS-EXTENDED/ocaml-ounit/ocaml-ounit.spec b/SPECS-EXTENDED/ocaml-ounit/ocaml-ounit.spec index d04f8e25be6..20ebaf20c75 100644 --- a/SPECS-EXTENDED/ocaml-ounit/ocaml-ounit.spec +++ b/SPECS-EXTENDED/ocaml-ounit/ocaml-ounit.spec @@ -13,7 +13,7 @@ Distribution: Mariner Name: ocaml-%{srcname} Version: 2.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Unit test framework for OCaml License: MIT @@ -23,6 +23,9 @@ Source0: %{url}/releases/download/v%{version}/%{srcname}-v%{version}.tbz # compatibility package for older OCaml installations. Patch it out instead. # Upstream does not want this patch until stdlib-shims is obsolete. Patch0: %{name}-stdlib-shims.patch +# Enable ocaml 4.13 compatibility. Source: Fedora 35 +# https://src.fedoraproject.org/rpms/ocaml-ounit/blob/f35/f/ounit-v2.2.4-remove-Thread-kill.patch +Patch1: remove-thread-kill.patch BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-dune >= 1.11.0 @@ -50,29 +53,24 @@ unit-tests for OCaml code. It is loosely based on HUnit, a unit testing framework for Haskell. It is similar to JUnit, and other xUnit testing frameworks. - %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} Provides: %{name}2-devel = %{version}-%{release} - %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. - %package lwt Summary: Helper functions for building Lwt tests using OUnit Requires: %{name} = %{version}-%{release} Provides: %{name}2-lwt = %{version}-%{release} - %description lwt This package contains helper functions for building Lwt tests using OUnit. - %package lwt-devel Summary: Development files for %{name}-lwt Requires: %{name}-devel = %{version}-%{release} @@ -80,36 +78,29 @@ Requires: %{name}-lwt = %{version}-%{release} Requires: ocaml-lwt-devel%{?_isa} Provides: %{name}2-lwt-devel = %{version}-%{release} - %description lwt-devel The %{name}-lwt-devel package contains libraries and signature files for developing applications that use %{name}-lwt. - %package doc Summary: Documentation for %{name} BuildArch: noarch - %description doc Documentation for %{name}. - %prep %autosetup -n %{srcname}-v%{version} -p1 - %build dune build %{?_smp_mflags} %if %{with doc} dune build %{?_smp_mflags} @doc %endif - %check dune runtest - %install dune install --destdir=%{buildroot} @@ -126,7 +117,6 @@ rm -fr %{buildroot}%{_prefix}/doc find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ %endif - %files %doc CHANGES.md README.md %license LICENSE.txt @@ -146,7 +136,6 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ %{_libdir}/ocaml/%{srcname}2/*/*.cmxs %endif - %files devel %{_libdir}/ocaml/%{srcname}/dune-package %{_libdir}/ocaml/%{srcname}/opam @@ -169,7 +158,6 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ %{_libdir}/ocaml/%{srcname}2/*/*.ml %{_libdir}/ocaml/%{srcname}2/*/*.mli - %files lwt %dir %{_libdir}/ocaml/%{srcname}-lwt/ %dir %{_libdir}/ocaml/%{srcname}2-lwt/ @@ -181,7 +169,6 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmxs %endif - %files lwt-devel %{_libdir}/ocaml/%{srcname}-lwt/dune-package %{_libdir}/ocaml/%{srcname}-lwt/opam @@ -195,7 +182,6 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmt %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.ml - %if %{with doc} %files doc %doc _build/default/_doc/_html/ @@ -204,8 +190,11 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ %license LICENSE.txt %endif - %changelog +* Tue Jan 18 2022 Thomas Crain - 2.2.2-5 +- Take Fedora patch (license: MIT) to fix building with OCaml 4.13.0 +- License verified + * Thu Oct 14 2021 Pawel Winogrodzki - 2.2.2-4 - Switching to using full number for the 'Release' tag. - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/ocaml-ounit/remove-thread-kill.patch b/SPECS-EXTENDED/ocaml-ounit/remove-thread-kill.patch new file mode 100644 index 00000000000..1180fe4ee15 --- /dev/null +++ b/SPECS-EXTENDED/ocaml-ounit/remove-thread-kill.patch @@ -0,0 +1,13 @@ +--- ounit-v2.2.4.old/src/lib/ounit2/threads/oUnitRunnerThreads.ml 2021-03-01 21:14:43.656815139 +0000 ++++ ounit-v2.2.4/src/lib/ounit2/threads/oUnitRunnerThreads.ml 2020-12-19 23:59:04.000000000 +0000 +@@ -143,8 +143,8 @@ + Mutex.lock worker_finished_mutex + done; + if not !worker_finished then begin +- (* This will fail... because probably not implemented. *) +- Thread.kill thread; ++ (* This will fail... because probably not implemented. ++ Thread.kill thread; *) + worker_finished := true; + Condition.broadcast worker_finished_cond + end; diff --git a/SPECS-EXTENDED/ocaml-parsexp/ocaml-parsexp.signatures.json b/SPECS-EXTENDED/ocaml-parsexp/ocaml-parsexp.signatures.json index 331d801857f..4ddab35b2b2 100644 --- a/SPECS-EXTENDED/ocaml-parsexp/ocaml-parsexp.signatures.json +++ b/SPECS-EXTENDED/ocaml-parsexp/ocaml-parsexp.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "parsexp-0.14.0.tar.gz": "6ede506ea367a96b2f128dbc676199d055f547adb4d96605bac624f10d62b256" + "parsexp-0.15.0.tar.gz": "0be4737dcc3fb459d5eabfa436330de9945e5c1dcb5a101c51415e17c7aa1fb1" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/ocaml-parsexp/ocaml-parsexp.spec b/SPECS-EXTENDED/ocaml-parsexp/ocaml-parsexp.spec index dac83ed3740..0a7cd2abaa1 100644 --- a/SPECS-EXTENDED/ocaml-parsexp/ocaml-parsexp.spec +++ b/SPECS-EXTENDED/ocaml-parsexp/ocaml-parsexp.spec @@ -7,18 +7,18 @@ Distribution: Mariner %global srcname parsexp Name: ocaml-%{srcname} -Version: 0.14.0 -Release: 9%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: S-expression parsing library License: MIT URL: https://github.com/janestreet/parsexp Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz -BuildRequires: ocaml >= 4.04.2 -BuildRequires: ocaml-base-devel >= 0.14 +BuildRequires: ocaml >= 4.08.0 +BuildRequires: ocaml-base-devel >= 0.15 BuildRequires: ocaml-dune >= 2.0.0 -BuildRequires: ocaml-sexplib0-devel >= 0.14 +BuildRequires: ocaml-sexplib0-devel >= 0.15 %description This library provides generic parsers for parsing S-expressions from @@ -95,6 +95,10 @@ dune runtest %{_libdir}/ocaml/%{srcname}/*.mli %changelog +* Tue Jan 18 2022 Thomas Crain - 0.15.0-1 +- Upgrade to latest version +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 0.14.0-9 - Initial CBL-Mariner import from Fedora 34 (license: MIT). diff --git a/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib-stdlib-shims.patch b/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib-stdlib-shims.patch index 83e606e0bd0..30b3477cb52 100644 --- a/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib-stdlib-shims.patch +++ b/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib-stdlib-shims.patch @@ -1,41 +1,77 @@ ---- a/ast/dune 2021-02-09 09:29:49.858496156 -0700 -+++ b/ast/dune 2021-02-09 09:29:57.847485450 -0700 -@@ -6,7 +6,7 @@ +--- a/ast/dune 2021-08-31 06:52:05.000000000 -0600 ++++ b/ast/dune 2021-09-01 09:24:02.193068151 -0600 +@@ -5,7 +5,7 @@ + (library (name ppxlib_ast) (public_name ppxlib.ast) - (libraries ocaml-compiler-libs.shadow ocaml-compiler-libs.common -- compiler-libs.common ocaml-migrate-parsetree stdlib-shims) -+ compiler-libs.common ocaml-migrate-parsetree) +- (libraries astlib stdlib-shims) ++ (libraries astlib) (flags - (:standard -open Ocaml_shadow -safe-string) + (:standard -safe-string) -w ---- a/dune-project 2021-02-04 09:27:47.000000000 -0700 -+++ b/dune-project 2021-02-09 09:29:43.423504783 -0700 +--- a/dune-project 2021-08-31 06:52:05.000000000 -0600 ++++ b/dune-project 2021-09-01 09:25:13.279201740 -0600 @@ -20,7 +20,6 @@ - (ocaml-migrate-parsetree (>= 2.1.0)) + (ocaml-compiler-libs (>= v0.11.0)) (ppx_derivers (>= 1.0)) - sexplib0 + (sexplib0 (>= v0.12)) - stdlib-shims (ocamlfind :with-test) (re (and :with-test (>= 1.9.0))) (cinaps (and :with-test (>= v0.12.1))) ---- a/ppxlib.opam 2021-02-09 09:28:26.394608169 -0700 -+++ b/ppxlib.opam 2021-02-09 09:28:49.502577143 -0700 -@@ -26,7 +26,6 @@ depends: [ - "ocaml-migrate-parsetree" {>= "2.1.0"} +--- a/metaquot_lifters/dune 2021-08-31 06:52:05.000000000 -0600 ++++ b/metaquot_lifters/dune 2021-09-01 09:25:29.440232074 -0600 +@@ -3,4 +3,4 @@ + (public_name ppxlib.metaquot_lifters) + (flags + (:standard -safe-string)) +- (libraries ppxlib ppxlib_traverse_builtins stdppx stdlib-shims)) ++ (libraries ppxlib ppxlib_traverse_builtins stdppx)) +--- a/ppxlib.opam 2021-08-31 06:52:05.000000000 -0600 ++++ b/ppxlib.opam 2021-09-01 09:24:15.993094078 -0600 +@@ -25,7 +25,6 @@ depends: [ + "ocaml-compiler-libs" {>= "v0.11.0"} "ppx_derivers" {>= "1.0"} - "sexplib0" + "sexplib0" {>= "v0.12"} - "stdlib-shims" "ocamlfind" {with-test} "re" {with-test & >= "1.9.0"} "cinaps" {with-test & >= "v0.12.1"} ---- a/stdppx/dune 2021-02-09 09:28:26.394608169 -0700 -+++ b/stdppx/dune 2021-02-09 09:29:05.478555696 -0700 +--- a/src/dune 2021-08-31 06:52:05.000000000 -0600 ++++ b/src/dune 2021-09-01 09:24:44.977148546 -0600 +@@ -9,7 +9,6 @@ + ppx_derivers + ppxlib_traverse_builtins + stdppx +- stdlib-shims + sexplib0) + (flags + (:standard -safe-string)) +--- a/src/gen/dune 2021-08-31 06:52:05.000000000 -0600 ++++ b/src/gen/dune 2021-09-01 09:24:57.866172770 -0600 +@@ -2,4 +2,4 @@ + (names gen_ast_pattern gen_ast_builder) + (flags + (:standard -safe-string)) +- (libraries ppxlib_ast astlib ppxlib_traverse_builtins stdppx stdlib-shims)) ++ (libraries ppxlib_ast astlib ppxlib_traverse_builtins stdppx)) +--- a/stdppx/dune 2021-08-31 06:52:05.000000000 -0600 ++++ b/stdppx/dune 2021-09-01 09:24:34.025127963 -0600 @@ -1,6 +1,6 @@ (library (name stdppx) (public_name ppxlib.stdppx) -- (libraries ocaml-compiler-libs.shadow sexplib0 stdlib-shims) -+ (libraries ocaml-compiler-libs.shadow sexplib0) +- (libraries sexplib0 stdlib-shims) ++ (libraries sexplib0) + (flags + (:standard -safe-string))) +--- a/traverse/dune 2021-08-31 06:52:05.000000000 -0600 ++++ b/traverse/dune 2021-09-01 09:23:48.745042886 -0600 +@@ -4,6 +4,6 @@ + (kind ppx_deriver) (flags - (:standard -open Ocaml_shadow -safe-string))) + (:standard -safe-string)) +- (libraries ppxlib ppxlib_ast ppxlib_traverse_builtins stdppx stdlib-shims) ++ (libraries ppxlib ppxlib_ast ppxlib_traverse_builtins stdppx) + (preprocess + (pps ppxlib_metaquot))) diff --git a/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib.signatures.json b/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib.signatures.json index 89eb41d5730..b7fa937af07 100644 --- a/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib.signatures.json +++ b/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "ppxlib-0.22.0.tar.gz": "826f859c760901d437dc63bc490422f49befac8c3d2a620dc547a7d5c5147b20" + "ppxlib-0.24.0.tbz": "7766027c2ecd0f5b3b460e9212a70709c6744278113eb91f317c56c41e7a90c8" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib.spec b/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib.spec index 88807011e58..0b14114c70f 100644 --- a/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib.spec +++ b/SPECS-EXTENDED/ocaml-ppxlib/ocaml-ppxlib.spec @@ -11,13 +11,13 @@ Distribution: Mariner %bcond_with doc Name: ocaml-%{srcname} -Version: 0.22.0 -Release: 3%{?dist} +Version: 0.24.0 +Release: 1%{?dist} Summary: Base library and tools for ppx rewriters License: MIT -URL: https://github.com/ocaml-ppx/%{srcname} -Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +URL: https://github.com/ocaml-ppx/ppxlib +Source0: https://github.com/ocaml-ppx/ppxlib/releases/download/%{version}/%{srcname}-%{version}.tbz # Fedora does not have, and does not need, stdlib-shims Patch0: %{name}-stdlib-shims.patch @@ -53,7 +53,7 @@ projects. It features: %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = 1:%{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: ocaml-compiler-libs-janestreet-devel%{?_isa} Requires: ocaml-migrate-parsetree-devel%{?_isa} Requires: ocaml-ppx-derivers-devel%{?_isa} @@ -166,7 +166,11 @@ dune runtest %endif %changelog -* Thu Dec 2 2021 Muhammad Falak - 0.22.0-3 +* Tue Jan 18 2022 Thomas Crain - 0.24.0-1 +- Upgrade to latest version +- License verified + +* Thu Dec 2 2021 Muhammad Falak - 0.22.0-3 - Remove epoch. * Fri Oct 15 2021 Pawel Winogrodzki - 1:0.22.0-2 diff --git a/SPECS-EXTENDED/ocaml-sexplib/ocaml-sexplib.signatures.json b/SPECS-EXTENDED/ocaml-sexplib/ocaml-sexplib.signatures.json index 50cc77c44a7..f96c7d4ac5b 100644 --- a/SPECS-EXTENDED/ocaml-sexplib/ocaml-sexplib.signatures.json +++ b/SPECS-EXTENDED/ocaml-sexplib/ocaml-sexplib.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "sexplib-0.14.0.tar.gz": "ad75ab155e2b4e2fec63fb178ef25a0a5a7de3834b939db95f38287dfd21cc68" + "sexplib-0.15.0.tar.gz": "4a1e558b71e327784081d6e68a21577e3089a16740a1c8077b2b2129549f5b0c" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/ocaml-sexplib/ocaml-sexplib.spec b/SPECS-EXTENDED/ocaml-sexplib/ocaml-sexplib.spec index 0e8edc84e0e..d0e9cda33a3 100644 --- a/SPECS-EXTENDED/ocaml-sexplib/ocaml-sexplib.spec +++ b/SPECS-EXTENDED/ocaml-sexplib/ocaml-sexplib.spec @@ -9,8 +9,8 @@ Distribution: Mariner %global srcname sexplib Name: ocaml-%{srcname} -Version: 0.14.0 -Release: 7%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Automated S-expression conversion # The project as a whole is MIT, but code in the src subdirectory is BSD. @@ -125,6 +125,10 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod 0755 {} \+ %endif %changelog +* Tue Jan 18 2022 Thomas Crain - 0.15.0-1 +- Upgrade to latest version +- License verified + * Thu Dec 2 2021 Muhammad Falak - 0.14.0-7 - Remove epoch. diff --git a/SPECS-EXTENDED/ocaml-sexplib0/ocaml-sexplib0.signatures.json b/SPECS-EXTENDED/ocaml-sexplib0/ocaml-sexplib0.signatures.json index c39167c339b..545a24ea662 100644 --- a/SPECS-EXTENDED/ocaml-sexplib0/ocaml-sexplib0.signatures.json +++ b/SPECS-EXTENDED/ocaml-sexplib0/ocaml-sexplib0.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "sexplib0-0.14.0.tar.gz": "1e2d1c27015809d816d1c707abfbc61f6b55830dedec01de8152d10ab7d6a19e" + "sexplib0-0.15.0.tar.gz": "abcc3469355468e1ce8dd2b4665a6add3c66facd74f09f4fdd0844115bc725ff" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/ocaml-sexplib0/ocaml-sexplib0.spec b/SPECS-EXTENDED/ocaml-sexplib0/ocaml-sexplib0.spec index c78ee01ca01..edd973419c5 100644 --- a/SPECS-EXTENDED/ocaml-sexplib0/ocaml-sexplib0.spec +++ b/SPECS-EXTENDED/ocaml-sexplib0/ocaml-sexplib0.spec @@ -7,12 +7,12 @@ Distribution: Mariner %global srcname sexplib0 Name: ocaml-%{srcname} -Version: 0.14.0 -Release: 8%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Definition of S-expressions and some base converters License: MIT -URL: https://github.com/janestreet/%{srcname} +URL: https://github.com/janestreet/sexplib0 Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz BuildRequires: ocaml >= 4.04.2 @@ -75,6 +75,9 @@ chmod a+x %{buildroot}%{_libdir}/ocaml/%{srcname}/%{srcname}.cmxs %{_libdir}/ocaml/%{srcname}/*.mli %changelog +* Tue Jan 18 2022 Thomas Crain - 0.15.0-1 +- Upgrade to latest version +- License verified * Fri Oct 15 2021 Pawel Winogrodzki - 0.14.0-8 - Initial CBL-Mariner import from Fedora 34 (license: MIT). diff --git a/SPECS-EXTENDED/ocaml-stdio/ocaml-stdio.signatures.json b/SPECS-EXTENDED/ocaml-stdio/ocaml-stdio.signatures.json index ebd12715b0f..bd8647b870d 100644 --- a/SPECS-EXTENDED/ocaml-stdio/ocaml-stdio.signatures.json +++ b/SPECS-EXTENDED/ocaml-stdio/ocaml-stdio.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "stdio-0.14.0.tar.gz": "1685cb86b29b07075ba6028431cf4e3f687c071d89996a6437442db2dfe1b0b2" + "stdio-0.15.0.tar.gz": "7fa9b91d9045cb2c8d6588f8bd01d9893456ab2bfeb9a99499ab887d9947f5b4" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/ocaml-stdio/ocaml-stdio.spec b/SPECS-EXTENDED/ocaml-stdio/ocaml-stdio.spec index c153a08e9b5..4d916ef7646 100644 --- a/SPECS-EXTENDED/ocaml-stdio/ocaml-stdio.spec +++ b/SPECS-EXTENDED/ocaml-stdio/ocaml-stdio.spec @@ -9,8 +9,8 @@ Distribution: Mariner %global srcname stdio Name: ocaml-%{srcname} -Version: 0.14.0 -Release: 10%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Jane Street Standard I/O library for OCaml License: MIT @@ -76,7 +76,7 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ %endif %files -%doc CHANGES.md README.org +%doc CHANGES.md %license LICENSE.md %dir %{_libdir}/ocaml/%{srcname}/ %{_libdir}/ocaml/%{srcname}/META @@ -107,6 +107,10 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ %endif %changelog +* Tue Jan 18 2022 Thomas Crain - 0.15.0-1 +- Upgrade to latest version +- License verified + * Mon Aug 09 2021 Thomas Crain - 0.14.0-10 - Initial CBL-Mariner import from Fedora 34 (license: MIT). - Remove docs circular dependencies diff --git a/SPECS-EXTENDED/perl-Sys-Virt/perl-Sys-Virt.spec b/SPECS-EXTENDED/perl-Sys-Virt/perl-Sys-Virt.spec index be88241ccba..ceaa2f437f2 100644 --- a/SPECS-EXTENDED/perl-Sys-Virt/perl-Sys-Virt.spec +++ b/SPECS-EXTENDED/perl-Sys-Virt/perl-Sys-Virt.spec @@ -2,7 +2,7 @@ Vendor: Microsoft Corporation Distribution: Mariner Name: perl-Sys-Virt Version: 6.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Represent and manage a libvirt hypervisor connection License: GPLv2+ or Artistic URL: https://metacpan.org/release/Sys-Virt @@ -14,10 +14,8 @@ BuildRequires: gcc BuildRequires: libvirt-devel >= %{version} BuildRequires: make BuildRequires: perl-devel - BuildRequires: perl-generators BuildRequires: perl-interpreter - BuildRequires: perl(ExtUtils::CBuilder) BuildRequires: perl(Module::Build) BuildRequires: sed @@ -26,6 +24,7 @@ BuildRequires: perl(overload) BuildRequires: perl(strict) BuildRequires: perl(warnings) BuildRequires: perl(XSLoader) +%if %{with_check} # Tests only BuildRequires: perl(base) BuildRequires: perl(Sys::Hostname) @@ -37,7 +36,7 @@ BuildRequires: perl(XML::XPath::XMLParser) BuildRequires: perl(Test::CPAN::Changes) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) >= 1.00 -BuildRequires: git +%endif Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version)) %description @@ -46,7 +45,7 @@ machine management APIs. This allows machines running within arbitrary virtualization containers to be managed with a consistent API. %prep -%autosetup -S git -n Sys-Virt-v%{version} +%autosetup -n Sys-Virt-v%{version} %build @@ -68,8 +67,11 @@ perl Build.PL installdirs=vendor %{perl_vendorarch}/Sys* %{_mandir}/man3/* - %changelog +* Tue Jan 18 2022 Thomas Crain - 6.1.0-3 +- Only pull in test dependencies during check builds +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 6.1.0-2 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/supermin/0001-supermin-Fix-IBM-Virtual-SCSI-driver-name.patch b/SPECS-EXTENDED/supermin/0001-supermin-Fix-IBM-Virtual-SCSI-driver-name.patch deleted file mode 100644 index 583fabc26f4..00000000000 --- a/SPECS-EXTENDED/supermin/0001-supermin-Fix-IBM-Virtual-SCSI-driver-name.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3f831d30d87658d362e9b4f25fa569937fa1c23f Mon Sep 17 00:00:00 2001 -From: Gustavo Luiz Duarte -Date: Tue, 31 Mar 2020 23:11:44 -0300 -Subject: [PATCH] supermin: Fix IBM Virtual SCSI driver name - -The driver was renamed from ibmvscsic to ibmvscsi on kernel 3.7. -See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9965c2f19be470c452357ae4f6304467cdeada55 - -The old name is kept so supermin works with recent kernels as well as kernel -version older than 3.7. ---- - src/format_ext2_initrd.ml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/format_ext2_initrd.ml b/src/format_ext2_initrd.ml -index b67bb55..38977e6 100644 ---- a/src/format_ext2_initrd.ml -+++ b/src/format_ext2_initrd.ml -@@ -44,6 +44,7 @@ let kmods = [ - "crc*.ko*"; - "libcrc*.ko*"; - "ibmvscsic.ko*"; -+ "ibmvscsi.ko*"; - "libnvdimm.ko*"; - "nd_pmem.ko*"; - "nd_btt.ko*"; --- -2.24.1 - diff --git a/SPECS-EXTENDED/supermin/supermin-5.2.0.tar.gz.sig b/SPECS-EXTENDED/supermin/supermin-5.2.0.tar.gz.sig deleted file mode 100644 index e0c2c429cfe..00000000000 --- a/SPECS-EXTENDED/supermin/supermin-5.2.0.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAl5nbmMRHHJpY2hAYW5u -ZXhpYS5vcmcACgkQkXOPc+G3aKAXIw/8D+GUgBRpbiV/+mqYIhkNdtyEfqKEiqKl -scZVCiRxlwElyjYs6azmNrLMArqjwjJuwalzXp7NbYe06ddFaEgvy/0i124cPUdk -Q8Z1aQ6ktLNSJgoQCpCOaTRiEDF/Zsy3itqXXk8n+XPfaGs1GEieEaxUcXQP6X9h -huLqIDC6zwhyUK11u4cagmxGuSyuUIEkFVNCbSuDGxmuIf/qUtj5o/LQG4aE1SRw -iQAk3mGs0ipa1nfpBAdTnted/KscPLbOgzBU3Dg02QeeUZKG67pm/Fl/MMaRB4HM -rhbko0M/jSkn8zB6ggF0U3kcy16EVc6ANMvXvuD5MC4op5iIretj2Y2tcbYpfT4f -aOpfquq/scXvVugoK77CzxCBLKWkTglPTPGXT1T4i0dh4t8jl4wvqi1IykriKNAc -FIukM3ZHU460M78oWr0pWtr1qyuXeKE4IjV6PiUh2wr2YEmiy1d4Rf7M9hKV4ACs -Dm1ONnrMcAN0W6brkfr8Vo/3ud3gXlJjEY7HRk9GzPs3lZk6d+MtDxe25qLQmM3Y -+KbVsi937gUi4lB27GfZTBxEhqw6OQZegQW/DD6kB6UARVrG/n4TPQe25KgIkZ0w -iTj2qs3MQfx+zAGwFO7ihFLd8kGmEMryn+wldPKbK2Li5m5oMEByQVi+jhIt+cSr -jj8ls0NuDHU= -=LLM6 ------END PGP SIGNATURE----- diff --git a/SPECS-EXTENDED/supermin/supermin-mariner.patch b/SPECS-EXTENDED/supermin/supermin-mariner.patch new file mode 100644 index 00000000000..b38b08030f9 --- /dev/null +++ b/SPECS-EXTENDED/supermin/supermin-mariner.patch @@ -0,0 +1,117 @@ +From f4a3020f202d67ad5682304e7710bfc14f1320eb Mon Sep 17 00:00:00 2001 +From: Thomas Crain +Date: Wed, 19 Jan 2022 21:36:29 -0800 +Subject: [PATCH] Add Mariner support to supermin + +--- + src/ph_rpm.ml | 18 +++++++++++++++++- + tests/test-harder.sh | 32 ++++++++++++++++++++++++++++++++ + 2 files changed, 49 insertions(+), 1 deletion(-) + +diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml +index 549bd9a..760c815 100644 +--- a/src/ph_rpm.ml ++++ b/src/ph_rpm.ml +@@ -65,6 +65,12 @@ let ibm_powerkvm_detect () = + (stat "/etc/ibm_powerkvm-release").st_kind = S_REG + with Unix_error _ -> false + ++let mariner_detect () = ++ Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () && ++ Config.dnf <> "no" && ++ Os_release.get_id () = "mariner" || ++ try (stat "/etc/mariner-release").st_kind = S_REG with Unix_error _ -> false ++ + let settings = ref no_settings + let rpm_major, rpm_minor, rpm_arch = ref 0, ref 0, ref "" + let zypper_major, zypper_minor, zypper_patch = ref 0, ref 0, ref 0 +@@ -450,6 +456,10 @@ and mageia_download_all_packages pkgs dir = + + rpm_unpack tdir dir + ++and mariner_download_all_packages pkgs dir = ++ let tdir = !settings.tmpdir // string_random8 () in ++ download_all_packages_with_dnf pkgs dir tdir ++ + and download_all_packages_with_urpmi pkgs dir tdir = + let rpms = List.map rpm_package_name (PackageSet.elements pkgs) in + +@@ -544,4 +554,10 @@ let () = + ph_detect = openmandriva_detect; + ph_download_package = PHDownloadAllPackages openmandriva_download_all_packages; + } in +- register_package_handler "openmandriva" "rpm" openmandriva ++ register_package_handler "openmandriva" "rpm" openmandriva; ++ let mariner = { ++ fedora with ++ ph_detect = mariner_detect; ++ ph_download_package = PHDownloadAllPackages mariner_download_all_packages; ++ } in ++ register_package_handler "mariner" "rpm" mariner +diff --git a/tests/test-harder.sh b/tests/test-harder.sh +index aceef21..223cae9 100755 +--- a/tests/test-harder.sh ++++ b/tests/test-harder.sh +@@ -32,6 +32,7 @@ if [ -f /etc/os-release ]; then + opensuse*|sled|sles) distro=suse ;; + ubuntu) distro=debian ;; + openmandriva) distro=openmandriva ;; ++ mariner) distro=mariner ;; + esac + elif [ -f /etc/arch-release ]; then + distro=arch +@@ -45,6 +46,8 @@ elif [ -f /etc/SuSE-release ]; then + distro=suse + elif [ -f /etc/ibm_powerkvm-release ]; then + distro=ibm-powerkvm ++elif [ -f /etc/mariner-release ]; then ++ distro=mariner + else + exit 77 + fi +@@ -67,6 +70,8 @@ case $distro in + # installed. (See commit fb40baade8e3441b73ce6fd10a32fbbfe49cc4da) + pkgs="augeas hivex rpm" + ;; ++ mariner) ++ pkgs="augeas hivex tar" + redhat) + # Choose tar because it has an epoch > 0 and is commonly + # installed. (See commit fb40baade8e3441b73ce6fd10a32fbbfe49cc4da) +@@ -157,6 +162,33 @@ case $distro in + exit 1 + fi + ;; ++ mariner) ++ if [ ! -x $d2/usr/bin/augtool ]; then ++ echo "$0: $distro: augtool binary not installed in chroot" ++ ls -lR $d2 ++ exit 1 ++ fi ++ if [ "$(find $d2/usr/lib* -name libaugeas.so.0 | wc -l)" -lt 1 ]; then ++ echo "$0: $distro: augeas library not installed in chroot" ++ ls -lR $d2 ++ exit 1 ++ fi ++ if [ ! -x $d2/usr/bin/hivexget ]; then ++ echo "$0: $distro: hivexget binary not installed in chroot" ++ ls -lR $d2 ++ exit 1 ++ fi ++ if [ "$(find $d2/usr/lib* -name libhivex.so.0 | wc -l)" -lt 1 ]; then ++ echo "$0: $distro: hivex library not installed in chroot" ++ ls -lR $d2 ++ exit 1 ++ fi ++ if [ ! -x $d2/bin/tar ]; then ++ echo "$0: $distro: tar binary not installed in chroot" ++ ls -lR $d2 ++ exit 1 ++ fi ++ ;; + openmandriva) + if [ ! -x $d2/usr/bin/augtool ]; then + echo "$0: $distro: augtool binary not installed in chroot" +-- +2.25.1 + diff --git a/SPECS-EXTENDED/supermin/supermin.signatures.json b/SPECS-EXTENDED/supermin/supermin.signatures.json index 18fcf05fbc6..53bef4a2acc 100644 --- a/SPECS-EXTENDED/supermin/supermin.signatures.json +++ b/SPECS-EXTENDED/supermin/supermin.signatures.json @@ -1,9 +1,7 @@ { "Signatures": { - "libguestfs.keyring": "de74373a15bd572ad74f276ee063d2cefa915470863829c0dda6af488d6315d8", - "supermin-5.2.0.tar.gz": "fac7e128198b9b05afca99041fa9d5256cc80c1e3cd97eb3130a794b185cf107", - "supermin-5.2.0.tar.gz.sig": "93b88f63070a759b0304d93ebdc38b00044e3aa47fee281e8f6592f542c11e26", + "supermin-5.2.1.tar.gz": "c45d8479b6da8ea55ca2c4b82b2c8bc7c2e6f724cf59c980df1dec93fb578ffb", "supermin-find-requires": "2adbf0ddcd86bde7151679abb8876ba769807c2cfc92306cfecab976cdfc4935", "supermin.attr": "6046070fd8ddb5452292a9e21fe5c8235ac12f1993f7d64f828c099bf22493c6" } -} \ No newline at end of file +} diff --git a/SPECS-EXTENDED/supermin/supermin.spec b/SPECS-EXTENDED/supermin/supermin.spec index bf8a02934d5..089a04edc6b 100644 --- a/SPECS-EXTENDED/supermin/supermin.spec +++ b/SPECS-EXTENDED/supermin/supermin.spec @@ -15,40 +15,19 @@ Distribution: Mariner # # See also: # https://github.com/libguestfs/supermin/commit/9bb57e1a8d0f3b57eb09f65dd574f702b67e1c2f - -%ifarch aarch64 %{arm} %{ix86} %{power} s390x x86_64 %bcond_without dietlibc -%else -%bcond_with dietlibc -%endif - -# Whether we should verify tarball signature with GPGv2. -%global verify_tarball_signature %{nil} # The source directory. %global source_directory 5.2-stable Summary: Tool for creating supermin appliances Name: supermin -Version: 5.2.0 -Release: 3%{?dist} +Version: 5.2.1 +Release: 1%{?dist} License: GPLv2+ - -%if 0%{?rhel} >= 7 -ExclusiveArch: x86_64 -%endif - -ExcludeArch: %{ix86} - -URL: http://people.redhat.com/~rjones/supermin/ -Source0: http://download.libguestfs.org/supermin/%{source_directory}/%{name}-%{version}.tar.gz -Source1: http://download.libguestfs.org/supermin/%{source_directory}/%{name}-%{version}.tar.gz.sig -# Keyring used to verify tarball signature. -Source2: libguestfs.keyring - -# Fix: ppc64le: ibmvscsi driver missing from supermin appliance. -# Upstream patch, fixes RHBZ#1819019 -Patch1: 0001-supermin-Fix-IBM-Virtual-SCSI-driver-name.patch +URL: https://github.com/libguestfs/supermin +Source0: https://download.libguestfs.org/supermin/%{source_directory}/%{name}-%{version}.tar.gz +Patch0: %{name}-mariner.patch BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2html @@ -65,20 +44,18 @@ BuildRequires: dietlibc-devel BuildRequires: glibc-static %endif BuildRequires: ocaml, ocaml-findlib-devel -%if 0%{verify_tarball_signature} -BuildRequires: gnupg2 -%endif # These are required only to run the tests. We could patch out the # tests to not require these packages. +%if %{with_check} BuildRequires: augeas hivex kernel tar +%endif # For complicated reasons, this is required so that # /bin/kernel-install puts the kernel directly into /boot, instead of -# into a /boot/ subdirectory (in Fedora >= 23). Read the +# into a /boot/ subdirectory. Read the # kernel-install script to understand why. BuildRequires: grubby -# https://bugzilla.redhat.com/show_bug.cgi?id=1331012 BuildRequires: systemd-udev Requires: rpm @@ -119,12 +96,7 @@ from supermin appliances. %prep -%if 0%{verify_tarball_signature} -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%endif -%setup -q -%autopatch -p1 - +%autosetup -p1 %build %configure --disable-network-tests @@ -136,36 +108,34 @@ make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install +%make_install mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/ install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/ install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/ - %check - - - - make check || { cat tests/test-suite.log exit 1 } - %files -%doc COPYING README examples/build-basic-vm.sh +%license COPYING +%doc README examples/build-basic-vm.sh %{_bindir}/supermin %{_mandir}/man1/supermin.1* - %files devel %{_rpmconfigdir}/fileattrs/supermin.attr %{_rpmconfigdir}/supermin-find-requires - %changelog +* Tue Jan 18 2022 Thomas Crain - 5.2.1-1 +- Upgrade to latest upstream stable release +- Enable full mariner support via patch +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 5.2.0-3 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/cgmanifest.json b/cgmanifest.json index 6134fd9c093..0a81132d5c2 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -14973,8 +14973,8 @@ "type": "other", "other": { "name": "ocaml-base", - "version": "0.14.1", - "downloadUrl": "https://github.com/janestreet/base/archive/v0.14.1/base-0.14.1.tar.gz" + "version": "0.15.0", + "downloadUrl": "https://github.com/janestreet/base/archive/v0.15.0/base-0.15.0.tar.gz" } } }, @@ -15168,6 +15168,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "ocaml-gettext", + "version": "0.4.2", + "downloadUrl": "https://github.com/gildor478/ocaml-gettext/releases/download/v0.4.2/gettext-v0.4.2.tbz" + } + } + }, { "component": { "type": "other", @@ -15233,8 +15243,8 @@ "type": "other", "other": { "name": "ocaml-migrate-parsetree", - "version": "2.1.0", - "downloadUrl": "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/archive/v2.1.0/ocaml-migrate-parsetree-2.1.0.tar.gz" + "version": "2.3.0", + "downloadUrl": "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v2.3.0/ocaml-migrate-parsetree-2.3.0.tbz" } } }, @@ -15303,8 +15313,8 @@ "type": "other", "other": { "name": "ocaml-parsexp", - "version": "0.14.0", - "downloadUrl": "https://github.com/janestreet/parsexp/archive/v0.14.0/parsexp-0.14.0.tar.gz" + "version": "0.15.0", + "downloadUrl": "https://github.com/janestreet/parsexp/archive/v0.15.0/parsexp-0.15.0.tar.gz" } } }, @@ -15323,8 +15333,8 @@ "type": "other", "other": { "name": "ocaml-ppxlib", - "version": "0.22.0", - "downloadUrl": "https://github.com/ocaml-ppx/ppxlib/archive/0.22.0/ppxlib-0.22.0.tar.gz" + "version": "0.24.0", + "downloadUrl": "https://github.com/ocaml-ppx/ppxlib/releases/download/0.24.0/ppxlib-0.24.0.tbz" } } }, @@ -15373,8 +15383,8 @@ "type": "other", "other": { "name": "ocaml-sexplib", - "version": "0.14.0", - "downloadUrl": "https://github.com/janestreet/sexplib/archive/v0.14.0/sexplib-0.14.0.tar.gz" + "version": "0.15.0", + "downloadUrl": "https://github.com/janestreet/sexplib/archive/v0.15.0/sexplib-0.15.0.tar.gz" } } }, @@ -15383,8 +15393,8 @@ "type": "other", "other": { "name": "ocaml-sexplib0", - "version": "0.14.0", - "downloadUrl": "https://github.com/janestreet/sexplib0/archive/v0.14.0/sexplib0-0.14.0.tar.gz" + "version": "0.15.0", + "downloadUrl": "https://github.com/janestreet/sexplib0/archive/v0.15.0/sexplib0-0.15.0.tar.gz" } } }, @@ -15393,8 +15403,8 @@ "type": "other", "other": { "name": "ocaml-stdio", - "version": "0.14.0", - "downloadUrl": "https://github.com/janestreet/stdio/archive/v0.14.0/stdio-0.14.0.tar.gz" + "version": "0.15.0", + "downloadUrl": "https://github.com/janestreet/stdio/archive/v0.15.0/stdio-0.15.0.tar.gz" } } }, @@ -27757,8 +27767,8 @@ "type": "other", "other": { "name": "supermin", - "version": "5.2.0", - "downloadUrl": "http://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.0.tar.gz" + "version": "5.2.1", + "downloadUrl": "http://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.1.tar.gz" } } },