Merge pull request #73 from PawelWMS/pawelwi/adding_licenses_to_changelog

Adding missing license and spec origin info.
2020-08-25 14:42:47 -07:00 · 2020-08-25 14:42:47 -07:00 · 60d75544e7
--- a/SPECS-SIGNED/grub2-efi-binary-signed-aarch64/grub2-efi-binary-signed-aarch64.spec
+++ b/SPECS-SIGNED/grub2-efi-binary-signed-aarch64/grub2-efi-binary-signed-aarch64.spec
@ -44,4 +44,4 @@ cp %{SOURCE1} %{buildroot}/boot/efi/EFI/BOOT/grubaa64.efi

 %changelog
 * Thu Aug 13 2020 Chris Co <chrco@microsoft.com> 2.02-24
- Original version
+- Original version for CBL-Mariner.
--- a/SPECS-SIGNED/grub2-efi-binary-signed-x64/grub2-efi-binary-signed-x64.spec
+++ b/SPECS-SIGNED/grub2-efi-binary-signed-x64/grub2-efi-binary-signed-x64.spec
@ -44,4 +44,4 @@ cp %{SOURCE1} %{buildroot}/boot/efi/EFI/BOOT/grubx64.efi

 %changelog
 * Thu Aug 13 2020 Chris Co <chrco@microsoft.com> 2.02-24
- Original version
+- Original version for CBL-Mariner.
--- a/SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec
+++ b/SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec
@ -83,4 +83,4 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 *   Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.42-12
 -   Update release number
 *   Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11
-   Original version
+-   Original version for CBL-Mariner.
--- a/SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec
+++ b/SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec
@ -83,4 +83,4 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 *   Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.42-12
 -   Update release number
 *   Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11
-   Original version
+-   Original version for CBL-Mariner.
--- a/SPECS/ca-certificates/ca-certificates.spec
+++ b/SPECS/ca-certificates/ca-certificates.spec
@ -394,7 +394,7 @@ cp -f %{_datadir}/pki/ca-trust-legacy/%{legacy_disable_base_bundle} %{_datadir}/
 - Reordering (Build)Requires to increase clarity.

 * Tue May 26 2020 Paul Monson <paulmon@microsoft.com> - 2020.4.28-3
- Initial CBL-Mariner version from Fedora 27
+- Initial CBL-Mariner import from Fedora 27 (license: MIT).
 - License verified.
 - Updated Mozilla certdata.txt to latest version from the "FIREFOX_76_0_RELEASE" release.
 - Added a '-base` sub package with certificates allowing for verification of the packages repository.
--- a/SPECS/ed/ed.spec
+++ b/SPECS/ed/ed.spec
@ -55,6 +55,6 @@ make  %{?_smp_mflags} check
 -   Delete invalid ed-devel package
 -   Delete unused sha1
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.14.2-2
-   Initial import from Photon (license: dual Apache2/GPL2).
+-   Initial CBL-Mariner import from Photon (license: Apache2).
 *   Thu Sep 27 2018 Sujay G <gsujay@vmware.com> 1.14.2-1
 -   Initial build.
--- a/SPECS/hardening-check/hardening-check.spec
+++ b/SPECS/hardening-check/hardening-check.spec
@ -54,7 +54,8 @@ make

 %changelog
 * Wed May 20 2020 Henry Beberman <henry.beberman@microsoft.com> - 2.6-2
- Spec imported from Fedora.
+- Initial CBL-Mariner import from Fedora 26 (license: MIT).
+- Changed package name from 'hardening-wrapper'.

 * Fri Jun 16 2017 Björn Esser <besser82@fedoraproject.org> - 2.6-1
 - New upstream release (rhbz#1132836)
--- a/SPECS/hyperv-daemons/hyperv-daemons.spec
+++ b/SPECS/hyperv-daemons/hyperv-daemons.spec
@ -231,7 +231,7 @@ fi

 %changelog
 * Tue Jun 16 2020 Paul Monson <paulmon@microsoft.com> 5.4.42-1
- Initial version from Fedora 32 (license: MIT)
+- Initial CBL-Mariner import from Fedora 32 (license: MIT)
 - Update to match version 5.4.42 of the kernel.

 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.32.20190303git
--- a/SPECS/kexec-tools/kexec-tools.spec
+++ b/SPECS/kexec-tools/kexec-tools.spec
@ -335,7 +335,7 @@ done
 - Update configuration to fit CBL-Mariner naming and kernel configuration
 - Remove PPC/s390x parts.
 * Wed Aug 05 2020 Mateusz Malisz <mamalisz@microsoft.com> 2.0.20-15
- Initial CBL-Mariner drop from Fedora33
+- Initial CBL-Mariner import from Fedora 33 (license: MIT)
 * Wed Jul 1 2020 Kairui Song <kasong@redhat.com> - 2.0.20-14
 - s390x: enable the kexec file load by default
 - x86_64: enable the kexec file load by default
--- a/SPECS/open-vm-tools/open-vm-tools.spec
+++ b/SPECS/open-vm-tools/open-vm-tools.spec
@ -348,7 +348,7 @@ fi
 - Rename input file for run-vmblock\x2dfuse.mount to avoid problems with backslash in the name.

 * Wed Aug 05 2020 Mateusz Malisz <mamalisz@microsoft.com> 11.1.0-3
- Initial CBL-Mariner import from Fedora 32 (License: MIT)
+- Initial CBL-Mariner import from Fedora 32 (license: MIT)

 * Sun Jun 21 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.1.0-2
 - Added sdmp-fixes.patch from upstream to remove net-tools dependency
--- a/SPECS/parted/parted.spec
+++ b/SPECS/parted/parted.spec
@ -53,7 +53,7 @@ rm -rf %{buildroot}%{_infodir}/dir
 *  Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 3.2-9
 -  Added %%license line automatically
 *  Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.2-8
-  Initial import from Photon (license: dual Apache2/GPL2).
+-  Initial CBL-Mariner import from Photon (license: dual Apache2/GPL2).
 *  Tue Oct 2 2018 Michelle Wang <michellew@vmware.com> 3.2-7
 -  Add conflict toybox.
 *  Sun Sep 09 2018 Alexey Makhalov <amakhalov@vmware.com> 3.2-6
--- a/SPECS/shim-unsigned/shim-unsigned.spec
+++ b/SPECS/shim-unsigned/shim-unsigned.spec
@ -44,4 +44,4 @@ install -D -m 0744 /usr/share/shim-unsigned-aarch64/shimaa64.efi %{buildroot}/bo
 * Thu Jul 30 2020 Chris Co <chrco@microsoft.com> 15-2
 - Update aarch64 source binary path
 * Wed Jul 29 2020 Chris Co <chrco@microsoft.com> 15-1
- Original version
+- Original version for CBL-Mariner.