[main extended] Enable libguestfs

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 <[email protected]> - 4.1-7
+- Disable usage of libreport by default
+- License verified
+- Lint spec
+
 * Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 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 <[email protected]> 4.1-rc1-1
 - Update to latest upstream version 4.1-rc1
 - Resolves bz1556591
- 
+
 * Wed Jul  4 2018 Peter Robinson <[email protected]> 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 <[email protected]> - 3.3.2-1
 - Upgrade to mdadm-3.3.2
 - Resolves bz1132847
+
 * Sun Aug 17 2014 Fedora Release Engineering <[email protected]> - 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 <[email protected]> - 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 <[email protected]> - 2.6.4-3
 - add a udev rules file for device assembly (#429604)
 

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)

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"
  }
 }

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 <[email protected]> - 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 <[email protected]> - 0.14.1-2
 - Initial CBL-Mariner import from Fedora 34 (license: MIT).
 

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 <[email protected]> - 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 <[email protected]> - 0.18.0-2
 - Initial CBL-Mariner import from Fedora 34 (license: MIT).
 

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"
  }
 }