diff --git a/0001-fix-definition-error.patch b/0001-fix-definition-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..a959ca031d46abdc0ad1ccb47f30a960da024add --- /dev/null +++ b/0001-fix-definition-error.patch @@ -0,0 +1,35 @@ +From 840c310365ac278bcb352cd1e42bc59b962c0ab6 Mon Sep 17 00:00:00 2001 +From: Chunmei Xu +Date: Fri, 11 Mar 2022 19:12:53 +0800 +Subject: [PATCH] fix definition error + +Signed-off-by: Chunmei Xu +--- + src/esl.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/esl.h b/src/esl.h +index 456f748..715cd6b 100644 +--- a/src/esl.h ++++ b/src/esl.h +@@ -47,10 +47,17 @@ typedef struct { + uint8_t pad2; + } __attribute__((aligned (1))) EFI_TIME; + ++#ifndef EFI_TIME_ADJUST_DAYLIGHT + #define EFI_TIME_ADJUST_DAYLIGHT 0x01 ++#endif ++ ++#ifndef EFI_TIME_IN_DAYLIGHT + #define EFI_TIME_IN_DAYLIGHT 0x02 ++#endif + ++#ifndef EFI_UNSPECIFIED_TIMEZONE + #define EFI_UNSPECIFIED_TIMEZONE 0x07ff ++#endif + + typedef struct _EFI_CERT_BLOCK_RSA_2048_SHA256 { + efi_guid_t HashType; +-- +2.34.1 + diff --git a/dbxtool-8-ccldflags.patch b/dbxtool-8-ccldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..099f9a6fb5be397cec6538d0610d9bcefdf70e8c --- /dev/null +++ b/dbxtool-8-ccldflags.patch @@ -0,0 +1,45 @@ +From f229181c015f7353602e6b32e6ed61f9b47480ae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0abata?= +Date: Thu, 12 Apr 2018 12:58:51 +0200 +Subject: [PATCH] Respect environment CCLDFLAGS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Allow passing custom flags for the linker. + +Signed-off-by: Petr Ĺ abata +--- + Make.defaults | 2 +- + src/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index 9bfa5b2..1030be9 100644 +--- a/Make.defaults ++++ b/Make.defaults +@@ -14,7 +14,7 @@ BUILDFLAGS = $(CFLAGS) -fPIC -fshort-wchar -fno-strict-aliasing \ + --param=ssp-buffer-size=4 -fexceptions + ASFLAGS = + LDFLAGS = -nostdlib +-CCLDFLAGS = -shared ++CCLDFLAGS += -shared + INSTALL = install + COMPILER ?= + +diff --git a/src/Makefile b/src/Makefile +index 1a6277a..669bfab 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -6,7 +6,7 @@ include $(TOPDIR)/Make.defaults + PKLIBS = efivar + LIBS = popt + LDFLAGS = +-CCLDFLAGS = $(foreach pklib,$(PKLIBS), $(shell pkg-config --libs-only-L $(pklib))) ++CCLDFLAGS += $(foreach pklib,$(PKLIBS), $(shell pkg-config --libs-only-L $(pklib))) + BUILDFLAGS += $(foreach pklib,$(PKLIBS), $(shell pkg-config --cflags $(pklib))) + + TARGETS = dbxtool +-- +2.17.0 + diff --git a/dbxtool-8.tar.bz2 b/dbxtool-8.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..78e12bd2b47b79c1e1446a8dda269b6a1a78ce8e Binary files /dev/null and b/dbxtool-8.tar.bz2 differ diff --git a/dbxtool.spec b/dbxtool.spec new file mode 100644 index 0000000000000000000000000000000000000000..3a4f77b0d2c759fde25567408a490c75fd7e2c63 --- /dev/null +++ b/dbxtool.spec @@ -0,0 +1,54 @@ +%define anolis_release 1 +Name: dbxtool +Version: 8 +Release: %{anolis_release}%{?dist} +Summary: Secure Boot DBX updater +License: GPLv2 +URL: https://github.com/vathpela/dbxtool +ExclusiveArch: i386 x86_64 aarch64 +BuildRequires: gcc +BuildRequires: popt-devel git systemd +BuildRequires: efivar-devel >= 31-3 +BuildRequires: make +Requires: efivar-libs >= 33-3 +Requires(post): systemd +Requires(preun):systemd +Source0: https://github.com/vathpela/dbxtool/releases/download/dbxtool-%{version}/dbxtool-%{version}.tar.bz2 +Patch0000: %{name}-8-ccldflags.patch +Patch0001: 0001-fix-definition-error.patch + +%description +This package contains DBX updates for UEFI Secure Boot. + +%prep +%autosetup -p1 + +%build +make PREFIX=%{_prefix} LIBDIR=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" CCLDFLAGS="%{__global_ldflags}" + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}/%{_libdir} +make PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot} \ + install +rm -f %{buildroot}/%{_docdir}/%{name}/COPYING + +%post +%systemd_post dbxtool.service + +%preun +%systemd_preun dbxtool.service + +%files +%{!?_licensedir:%global license %%doc} +%license COPYING +%{_bindir}/dbxtool +%doc %{_mandir}/man1/* +%dir %{_datadir}/dbxtool/ +%{_datadir}/dbxtool/*.bin +%{_unitdir}/dbxtool.service + +%changelog +* Fri Mar 11 2022 Chunmei Xu - 8-1 +- init from upstream 8 +