From 95be359c7d8a3e2581064ff25a7655801957357d Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 10:10:06 +0000 Subject: [PATCH] import CS fwupd-1.9.13-2.el9 --- .fwupd.metadata | 12 ++- .gitignore | 6 +- ...grate-from-v2-to-database-schema-v10.patch | 47 +++++++++ SOURCES/redhatsecureboot301.cer | Bin 839 -> 0 bytes SOURCES/redhatsecureboot503.cer | Bin 964 -> 0 bytes SOURCES/redhatsecurebootca3.cer | Bin 977 -> 0 bytes SOURCES/redhatsecurebootca5.cer | Bin 920 -> 0 bytes SPECS/fwupd.spec | 97 ++++++++---------- 8 files changed, 100 insertions(+), 62 deletions(-) create mode 100644 SOURCES/0001-Correctly-migrate-from-v2-to-database-schema-v10.patch delete mode 100644 SOURCES/redhatsecureboot301.cer delete mode 100644 SOURCES/redhatsecureboot503.cer delete mode 100644 SOURCES/redhatsecurebootca3.cer delete mode 100644 SOURCES/redhatsecurebootca5.cer diff --git a/.fwupd.metadata b/.fwupd.metadata index ecb8aee..4163793 100644 --- a/.fwupd.metadata +++ b/.fwupd.metadata @@ -8,8 +8,12 @@ cd2bbe591438fe893b4042dc03d30659c1e31756 SOURCES/DBXUpdate-20210429-x64.cab d3ae610f5b6e602feded54eae8d67ddb7c60e64f SOURCES/DBXUpdate-20220812-aa64.cab 0ac8508ef7a86959e6ab03deec256b19df29677f SOURCES/DBXUpdate-20220812-ia32.cab 60f9aa664cb7588e33ce56d621dafa9b5a71e072 SOURCES/DBXUpdate-20220812-x64.cab -1f06b0f236377e5100815d1367954c6bf263f4e4 SOURCES/DBXUpdate-20230509-aa64.cab -6fc53ba85dc791f16235e851f4693c6c49fbf38d SOURCES/DBXUpdate-20230509-ia32.cab -93470ea2546e4c794b5fd74ee4dd8e536420144e SOURCES/DBXUpdate-20230509-x64.cab -0abed3cf70b97366f77616b908af66f7b4ac6f1f SOURCES/fwupd-1.8.16.tar.xz +46a42362cd34c0d103cf534ca431508d24715e51 SOURCES/DBXUpdate-20230509-aa64.cab +23d9544ef0f9b39a76d258f6d4a4a54d8f7592b2 SOURCES/DBXUpdate-20230509-ia32.cab +bc6a604b29918d67d5fef745ad4375ca3d43d05e SOURCES/DBXUpdate-20230509-x64.cab +a8c8f0cc046ecff12e425484bc5ec1eb7fe49e90 SOURCES/fwupd-1.9.13.tar.xz 147b36f75fca288fd01d9ed4150866344d57df27 SOURCES/fwupd-efi-1.4.tar.xz +4a07b56e28741884b86da6ac91f8f9929541a1e4 SOURCES/redhatsecureboot301.cer +33e260486f5c12e47b72b90dfb779ca892f56c45 SOURCES/redhatsecureboot503.cer +cf9230e69000076727e5b784ec871d22716dc5da SOURCES/redhatsecurebootca3.cer +e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer diff --git a/.gitignore b/.gitignore index 21dbd47..2e09d35 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,9 @@ SOURCES/DBXUpdate-20220812-x64.cab SOURCES/DBXUpdate-20230509-aa64.cab SOURCES/DBXUpdate-20230509-ia32.cab SOURCES/DBXUpdate-20230509-x64.cab -SOURCES/fwupd-1.8.16.tar.xz +SOURCES/fwupd-1.9.13.tar.xz SOURCES/fwupd-efi-1.4.tar.xz +SOURCES/redhatsecureboot301.cer +SOURCES/redhatsecureboot503.cer +SOURCES/redhatsecurebootca3.cer +SOURCES/redhatsecurebootca5.cer diff --git a/SOURCES/0001-Correctly-migrate-from-v2-to-database-schema-v10.patch b/SOURCES/0001-Correctly-migrate-from-v2-to-database-schema-v10.patch new file mode 100644 index 0000000..d5b6957 --- /dev/null +++ b/SOURCES/0001-Correctly-migrate-from-v2-to-database-schema-v10.patch @@ -0,0 +1,47 @@ +From 6fc21ec8364babc2edc57d6a39ee44c1e72cc6b2 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Sun, 18 Feb 2024 10:23:03 +0000 +Subject: [PATCH] Correctly migrate from v2 to database schema v10 + +Artificially bump the schema version to v11 to ensure the migration is done. + +diff --git a/src/fu-history.c b/src/fu-history.c +index 21a4fd3e8..3be03c3a7 100644 +--- a/src/fu-history.c ++++ b/src/fu-history.c +@@ -21,7 +21,20 @@ + #include "fu-history.h" + #include "fu-security-attr-common.h" + +-#define FU_HISTORY_CURRENT_SCHEMA_VERSION 10 ++/* ++ * v1 legacy schema ++ * v2 initial schema ++ * v3 add checksum_device to history ++ * v4 add protocol to history ++ * v5 create table approved_firmware ++ * v6 create table blocked_firmware ++ * v7 create table hsi_history ++ * v8 add release_id to history ++ * v9 add appstream_id to history ++ * v10 add version_format to history ++ * v11 no changes, bumped due to bungled migration to v10 ++ */ ++#define FU_HISTORY_CURRENT_SCHEMA_VERSION 11 + + static void + fu_history_finalize(GObject *object); +@@ -466,11 +479,12 @@ fu_history_create_or_migrate(FuHistory *self, guint schema_ver, GError **error) + case 8: + if (!fu_history_migrate_database_v8(self, error)) + return FALSE; +- break; + /* fall through */ + case 9: ++ case 10: + if (!fu_history_migrate_database_v9(self, error)) + return FALSE; ++ /* no longer fall through */ + break; + default: + /* this is probably okay, but return an error if we ever delete diff --git a/SOURCES/redhatsecureboot301.cer b/SOURCES/redhatsecureboot301.cer deleted file mode 100644 index 4ff8b79e6736e566dbf39603e0887a53345aa4e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 zcmXqLVs5=#_OQj1C) zic(WD5=-=w^K%X4#CZ)(42%qc(A3<>AWEFq*xbO#zzobaj4}u^)G^S4Sf`BDy5h|A zyv)3GQtWJER6_O@BP#=Q6C*!^K@%evQxhX2!zT5vqmx`?o`(oz{$eeCezR_cLPyl% zHpefqUbuO&%O^nA}y6#9BjM%~U7Q(5kw6_YN1epR)|xb9Elg4_B`%!~|-ixmyz4P=2K zFU!Xw#v&5#_@80Rp3FS`6#W&an$HJBb(91l2O=d+v%~@6}B_2%&Mg` zDvt6_STWb-ZhXD^RgaJz3Cq5o4B43+oEZD&XVQnj{jXOGHfUJJB>qmC?A`ut>Ahpw zdM-|DZzz7Yc^I3-u|J*vqdKqQ`kIF?LJd~2r8XOg&f%Z+Yj((@r{(*;Y?_w8rSDJJ zntk_K74NJ(drfx5hIZaKImf>p{fSPd=}qfHlV8OA-0dHz$M#&#on!XF_3NjY{(Hxy zbKN4k{8NvC{Y9;Yo!51>R!)l5n2-{5CgAUe(k!NLc|1u*B2w==ttY-NzWb+N=75O& zzv2uf{%c3S9%5x`<-dQv`g=w9>l=;D-vz#WO}UeuefPU1`=|Tw9$I=mIi&>vg+x|L diff --git a/SOURCES/redhatsecureboot503.cer b/SOURCES/redhatsecureboot503.cer deleted file mode 100644 index 50e375c7461e78286033119e7b6f9d55fdb3543c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 964 zcmXqLVm@Hd#I#}oGZP~d6DPygP|MB7r^(JY;AP{~YV&CO&dbQi&B|a9ZzyIU!p0oR z!o|ZIl$xU8kyxUm;F*`KXQ*f(4-#kQk${RT1g9pK7NsgU<>!|uI6Eqs8Y&qmz)j<1 z6ca8^O-{^7Eh=#+N=?Z~EYVBO&oz(}=QT1gFf*_;G%zqQvWODrHMTG?G_-(n4bpHr zK*K-{;sAMU4hYUn&&$k9S1>g&CdwU6j7rFUXJlnyZerwTFlb`rVrpV!WSFGBlyl!b z@AvOl&N7VJBQfm-*Gb3trqyBYpMP7O)-t#1KVhSL*Xm1lv+vaB_D}D5y>Gs;>;9|c zS*nVeCj;4XQqR$0JPJB$l15Dm#Ah z*G9?ng;qBhTt7zi_9piIB1HKryy*<#h?ozG0H9pAq!Hx`|9`sDeVhoQ|+Ba2Qv zo-yfhS&G=>BcJvO?o=@Oz`Lz_kxrWF{OxXgEW`@xmVMa7-nq`c>PBzQ|M_C~MBFr9 zPrLh_iJ6gsadCw~nE?+l)MbSk8UM2|888^|fq48N9t$%QdxL=(h_4Fb^B8ckacHwK zva+%>GaJZ)#Q9jnSVS6UDoF(Enx4Ng{cq63UVh2ku$$W8v?Qy{B4HrbAaW*u>2r;Y zU7miEXYbA6p6F6GYkog++yK)hFm4zb1h29y$1xV|D)`m!I6+~4tbNet)HA$J5+1X7 z^`aP;7*9J<6!|s6!sq4b3!SQO4a7XUc(LMA*hcX#E?K3&s2<&fsu=j-COdYrFG zd%)%2@WE8TTRmd4$Nz&#rSC6shKtRebdaxGHOuddxkF-v`v-gbQf5te+s{&O)6ChW zul|Xwxt5?3lD7D>ylk9WZ60mkc^MhGSs4s`4b=@)*_cCF zn1$tnQd1N>5=#_OQj1C) zic(WD5=-=w^K%X4#CZ)(42%qc(8R>VG)kP;*xbO#zzoWzwslR6O2{5!WMyD(V&rEq zXkz4IYGPz$nC+~vi6EDouC4!V-;tv&JA zN}nf->iaHo2tM8rAb&8=Njdj{a^${=Z?aE)&k<1VH{Q3Wx7jKD-_5CYum4K4d~JV` z`ccOE*<7!m22LI4&u3g0F3h!NN?ysm?c*7~^lIfF3D-Xhnr_&uU!bJ$?ZS8WW+A0- zr9raw{Iep~On)hDAUrqc*pZy>@YoE^;z#ABPp))utMY{K9XOZuN+87Vv97^}gccFK z6&c%&T=rzVyKuJ1S>c?Rq?77kYS zv==`X%}MC|0a-81!fL?G$oL;QPJxLO7^jR3 zp{b9(0{X(lQ;+K%h_CKtxc%nd+9kH!CBia&JkgcqO9LvF9(I1~^2+p(_fBqs&+@+g zjZG)^b(y8?lr#NV`RkoR|I-BpaSiJiPBV7drX0Bbe!0fPB95K&)ygj1YM5%bK;(6L z=7Y@r2hM%A`uyr;o|A^(c{icYtu_B=WuE^MZ_<i|1QMhsQHT z4}wg*#%C!d<*ePQAKPyWoS|9R;jPUx*P-5Ksuo_~6c3tyKHzf+y+r*{_;vOAw> zmv4Wk&h*1hGe;ze)#t#BH;PsH)$e|FOmna8+@9jW!^ymRMf{q+C84h)mppfN*sxn6 NnfI|Q%N6m!6aeL$dME$@ diff --git a/SOURCES/redhatsecurebootca5.cer b/SOURCES/redhatsecurebootca5.cer deleted file mode 100644 index dfb0284954861282d1a0ce16c8c5cdc71c27659f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 920 zcmXqLVxD5q#8k6@nTe5!iIbtZm{+@~;bN2lFB_*;n@8JsUPeZ4RtAH3LoovpHs(+k zE*{>X)D#7e#1b6^&%9(kLq!95kT^4s1XNrhI5oMnC{@8JKfgr5*-^pNP{}|6ZW6NxP$#b?ru1p1aqn$3D)YB{Qqo zjCvjz?|=HkE#3AN-xTZpws*U~)f@DZ{t~uwMZy8<;F%jD%$u6!n#qYzp^Sryh{C;x9qf@!N=T4ui@b#({ zSD&^p3kNZ=9lAQ9%xdfP9doNToV+k2^LHOFD{5oE&78StJa^8n7$i2k94PWc<&xr*# z`sciS&XK#@>h!OC8{=mczNLHbADCJ+pE=-CsaDOF#s}?5Q)1qq&%R~#cz>QmiAiVx zk5XXYstAL9d+iK-w@u$FESybMIPOFY~9lmn~9nUf%vMc88@((p0B(#qL+!COmt7`j5IhPVzo{cRPw} Pd!}BnFF!b8N6JS4>O*3Z diff --git a/SPECS/fwupd.spec b/SPECS/fwupd.spec index ce20e8e..2e6f7a4 100644 --- a/SPECS/fwupd.spec +++ b/SPECS/fwupd.spec @@ -36,11 +36,6 @@ %global have_msr 1 %endif -# libsmbios is only available on x86 -%ifarch x86_64 -%global have_dell 1 -%endif - # Until we actually have seen it outside x86 %ifarch i686 x86_64 %global have_thunderbolt 1 @@ -53,14 +48,15 @@ Summary: Firmware update daemon Name: fwupd -Version: 1.8.16 -Release: 1%{?dist} +Version: 1.9.13 +Release: 2%{?dist} License: LGPLv2+ URL: https://github.com/fwupd/fwupd Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz Source2: http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.4.tar.xz Patch101: 0001-generate_binary-Add-NX-COMPAT-flag-manually-when-gen.patch +Patch102: 0001-Correctly-migrate-from-v2-to-database-schema-v10.patch Source10: http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab Source11: http://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab @@ -86,7 +82,6 @@ Source503: redhatsecureboot503.cer BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libxmlb-devel >= %{libxmlb_version} -BuildRequires: libgcab1-devel BuildRequires: libgudev1-devel BuildRequires: libgusb-devel >= %{libgusb_version} BuildRequires: libcurl-devel >= %{libcurl_version} @@ -97,7 +92,6 @@ BuildRequires: systemd >= %{systemd_version} BuildRequires: systemd-devel BuildRequires: libarchive-devel BuildRequires: gobject-introspection-devel -BuildRequires: gcab %ifarch %{valgrind_arches} BuildRequires: valgrind BuildRequires: valgrind-devel @@ -112,6 +106,8 @@ BuildRequires: git-core %if 0%{?have_flashrom} BuildRequires: flashrom-devel >= 1.2-2 %endif +BuildRequires: libdrm-devel +BuildRequires: python3-jinja2 %if 0%{?have_modem_manager} BuildRequires: ModemManager-glib-devel >= 1.10.0 @@ -132,11 +128,6 @@ BuildRequires: tpm2-tss-devel >= 2.2.3 BuildRequires: pesign >= 113-20 %endif -%if 0%{?have_dell} -BuildRequires: efivar-devel >= 33 -BuildRequires: libsmbios-devel >= 2.3.0 -%endif - Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -205,6 +196,7 @@ can be flashed using flashrom. It is probably not required on servers. %prep %setup -q +%patch102 -p1 mkdir -p subprojects/fwupd-efi tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 @@ -217,16 +209,13 @@ cd - %meson \ -Ddocs=disabled \ -Dlvfs=disabled \ + -Dlaunchd=disabled \ + -Dpassim=disabled \ %if 0%{?enable_tests} -Dtests=true \ %else -Dtests=false \ %endif -%if 0%{?enable_dummy} - -Dplugin_dummy=true \ -%else - -Dplugin_dummy=false \ -%endif %if 0%{?have_flashrom} -Dplugin_flashrom=enabled \ %else @@ -260,17 +249,13 @@ cd - -Dplugin_uefi_pk=disabled \ -Dplugin_tpm=disabled \ %endif -%if 0%{?have_dell} - -Dplugin_dell=enabled \ -%else - -Dplugin_dell=disabled \ -%endif %if 0%{?have_modem_manager} -Dplugin_modem_manager=enabled \ %else -Dplugin_modem_manager=disabled \ %endif -Dman=true \ + -Dsystemd_unit_user="" \ -Dcompat_cli=true \ -Dbluez=disabled \ -Dcbor=disabled \ @@ -319,7 +304,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/fwupd %find_lang %{name} %post -%systemd_post fwupd.service +%systemd_post fwupd.service fwupd-refresh.timer # change vendor-installed remotes to use the default keyring type for fn in /etc/fwupd/remotes.d/*.conf; do @@ -329,23 +314,16 @@ for fn in /etc/fwupd/remotes.d/*.conf; do done %preun -%systemd_preun fwupd.service +%systemd_preun fwupd.service fwupd-refresh.timer %postun -%systemd_postun_with_restart fwupd.service +%systemd_postun_with_restart fwupd.service fwupd-refresh.timer %systemd_postun_with_restart pesign.service %files -f %{name}.lang %doc README.md %license COPYING -%config(noreplace)%{_sysconfdir}/fwupd/daemon.conf -%if 0%{?have_uefi} -%config(noreplace)%{_sysconfdir}/fwupd/uefi_capsule.conf -%endif -%config(noreplace)%{_sysconfdir}/fwupd/redfish.conf -%if 0%{?have_thunderbolt} -%config(noreplace)%{_sysconfdir}/fwupd/thunderbolt.conf -%endif +%config(noreplace)%{_sysconfdir}/fwupd/fwupd.conf %dir %{_libexecdir}/fwupd %{_libexecdir}/fwupd/fwupd %ifarch i686 x86_64 @@ -360,9 +338,7 @@ done %{_bindir}/fwupdate %endif %{_bindir}/dfu-tool -%if 0%{?have_uefi} %{_bindir}/dbxtool -%endif %{_bindir}/fwupdmgr %{_bindir}/fwupdtool %{_bindir}/fwupdagent @@ -370,27 +346,19 @@ done %dir %{_sysconfdir}/fwupd/bios-settings.d %{_sysconfdir}/fwupd/bios-settings.d/README.md %dir %{_sysconfdir}/fwupd/remotes.d -%if 0%{?have_dell} -%config(noreplace)%{_sysconfdir}/fwupd/remotes.d/dell-esrt.conf -%endif %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/lvfs.conf %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/lvfs-testing.conf -%config(noreplace)%{_sysconfdir}/fwupd/remotes.d/vendor.conf %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/vendor-directory.conf %config(noreplace)%{_sysconfdir}/pki/fwupd %{_sysconfdir}/pki/fwupd-metadata %if 0%{?have_msr} /usr/lib/modules-load.d/fwupd-msr.conf -%config(noreplace)%{_sysconfdir}/fwupd/msr.conf %endif %{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf %{_datadir}/bash-completion/completions/fwupdmgr %{_datadir}/bash-completion/completions/fwupdtool %{_datadir}/fish/vendor_completions.d/fwupdmgr.fish %{_datadir}/fwupd/metainfo/org.freedesktop.fwupd*.metainfo.xml -%if 0%{?have_dell} -%{_datadir}/fwupd/remotes.d/dell-esrt/metadata.xml -%endif %{_datadir}/fwupd/remotes.d/vendor/firmware/README.md %{_datadir}/dbus-1/interfaces/org.freedesktop.fwupd.xml %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy @@ -410,16 +378,9 @@ done %{_datadir}/dbxtool/DBXUpdate-20230509-aa64.cab %{_datadir}/dbxtool/DBXUpdate-20230509-ia32.cab %{_datadir}/dbxtool/DBXUpdate-20230509-x64.cab -%{_mandir}/man1/fwupdtool.1* -%{_mandir}/man1/fwupdagent.1* -%{_mandir}/man1/dfu-tool.1* -%if 0%{?have_uefi} -%{_mandir}/man1/dbxtool.* -%endif -%{_mandir}/man1/fwupdmgr.1* -%if 0%{?have_uefi} -%{_mandir}/man1/fwupdate.1* -%endif +%{_mandir}/man1/* +%{_mandir}/man5/* +%{_mandir}/man8/* %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg %{_datadir}/fwupd/firmware_packager.py @@ -430,7 +391,6 @@ done %{_unitdir}/fwupd.service %{_unitdir}/fwupd-refresh.service %{_unitdir}/fwupd-refresh.timer -%{_presetdir}/fwupd-refresh.preset %{_unitdir}/system-update.target.wants/ %dir %{_localstatedir}/lib/fwupd %dir %{_localstatedir}/cache/fwupd @@ -477,6 +437,9 @@ done %{_datadir}/installed-tests/fwupd/fwupd-tests.xml %{_datadir}/installed-tests/fwupd/*.test %{_datadir}/installed-tests/fwupd/*.cab +%{_datadir}/installed-tests/fwupd/fakedevice124.jcat +%{_datadir}/installed-tests/fwupd/fakedevice124.bin +%{_datadir}/installed-tests/fwupd/fakedevice124.metainfo.xml %{_datadir}/installed-tests/fwupd/*.sh %{_datadir}/installed-tests/fwupd/*.zip %if 0%{?have_uefi} @@ -486,10 +449,30 @@ done %{_datadir}/installed-tests/fwupd/sys_vendor %{_libexecdir}/installed-tests/fwupd/* %dir %{_sysconfdir}/fwupd/remotes.d -%config(noreplace)%{_sysconfdir}/fwupd/remotes.d/fwupd-tests.conf +%{_datadir}/fwupd/remotes.d/fwupd-tests.conf %endif %changelog +* Mon Feb 19 2024 Richard Hughes 1.9.13-2 +- Fix upgrade from fwupd < v1.9.5 +- Resolves: #RHEL-15328 + +* Thu Feb 15 2024 Richard Hughes 1.9.13-1 +- Update to latest stable upstream version. +- Resolves: #RHEL-15328 + +* Wed Jan 24 2024 Richard Hughes 1.9.12-1 +- Update to latest stable upstream version. +- Resolves: #RHEL-15328 + +* Wed Jan 03 2024 Richard Hughes 1.9.11-1 +- Update to latest stable upstream version. +- Resolves: #RHEL-15328 + +* Mon Dec 04 2023 Richard Hughes 1.9.10-1 +- Update to latest stable upstream version. +- Resolves: #RHEL-15328 + * Fri Jun 09 2023 Richard Hughes 1.8.16-1 - Update to latest stable upstream version. - Resolves: rhbz#2209944