rhughes pushed to rpms/fwupd (main). "Disable the libsmbios requirement"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:55:41 UTC
From de12c4dc1d2c2145468b4ae2c0ef6e783bcf13d7 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard(a)hughsie.com>
Date: Nov 29 2022 16:54:08 +0000
Subject: Disable the libsmbios requirement
---
diff --git a/fwupd.spec b/fwupd.spec
index 8d688e1..04b5025 100644
--- a/fwupd.spec
+++ b/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
@@ -54,7 +49,7 @@
Summary: Firmware update daemon
Name: fwupd
Version: 1.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
URL: https://github.com/fwupd/fwupd
Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
@@ -113,11 +108,6 @@ BuildRequires: google-noto-sans-cjk-ttc-fonts
BuildRequires: tpm2-tss-devel >= 2.2.3
%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
@@ -244,11 +234,7 @@ or server machines.
-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
@@ -323,9 +309,6 @@ done
%dir %{_sysconfdir}/fwupd/bios-settings.d
%config%(noreplace)%{_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
@@ -342,9 +325,6 @@ done
%{_datadir}/bash-completion/completions/fwupdagent
%{_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
@@ -431,6 +411,9 @@ done
%endif
%changelog
+* Tue Nov 29 2022 Richard Hughes <richard(a)hughsie.com> 1.8.7-3
+- Disable the libsmbios requirement as it is now unmaintained in Fedora.
+
* Wed Nov 09 2022 Richard Hughes <richard(a)hughsie.com> 1.8.7-2
- Fix the lvfs-testing remote
https://src.fedoraproject.org/rpms/fwupd/c/de12c4dc1d2c2145468b4ae2c0ef6e...
1Â year
music pushed to rpms/woff (f36). "Patch a possible double-free bug"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:50:59 UTC
From de73f56efcab4b2afab45cd0ce57d85b4cb6813d Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Nov 29 2022 16:49:35 +0000
Subject: Patch a possible double-free bug
---
diff --git a/possible-double-free.patch b/possible-double-free.patch
new file mode 100644
index 0000000..09a5660
--- /dev/null
+++ b/possible-double-free.patch
@@ -0,0 +1,11 @@
+diff -Naur a/woff.c b/woff.c
+--- a/woff.c 2009-09-25 09:54:13.000000000 -0400
++++ b/woff.c 2022-11-29 10:09:15.091798523 -0500
+@@ -354,6 +354,7 @@
+ newHeader->privLen = 0;
+
+ free(tableOrder);
++ tableOrder = 0;
+
+ if ((status & eWOFF_warn_checksum_mismatch) != 0) {
+ /* The original font had checksum errors, so we now decode our WOFF data
diff --git a/woff.spec b/woff.spec
index c99c7a7..afb8777 100644
--- a/woff.spec
+++ b/woff.spec
@@ -18,6 +18,11 @@ Source0: %{original_url}/woff-code-latest.zip
Source1: sfnt2woff.1
Source2: woff2sfnt.1
+# It’s possible that tableOrder could be freed twice if a failure occurs. Set
+# the pointer null after freeing it to prevent this. There is no current
+# upstream to which this could be reported.
+Patch: possible-double-free.patch
+
BuildRequires: make
BuildRequires: gcc
@@ -27,7 +32,7 @@ BuildRequires: zlib-devel
Encoding and Decoding for Web Open Font Format(Woff)
%prep
-%autosetup -c
+%autosetup -c -p1
%build
https://src.fedoraproject.org/rpms/woff/c/de73f56efcab4b2afab45cd0ce57d85...
1Â year
music pushed to rpms/woff (f36). "Update License to SPDX"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:50:59 UTC
From db1660bbcc695f3cbe31e0de86ecf0ac32deaeae Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Nov 29 2022 16:49:50 +0000
Subject: Update License to SPDX
---
diff --git a/woff.spec b/woff.spec
index 186bdb6..0dfdef5 100644
--- a/woff.spec
+++ b/woff.spec
@@ -3,7 +3,7 @@ Version: 0.20091126
Release: %autorelease
Summary: Encoding and Decoding for Web Open Font Format(Woff)
-License: GPLv2+ or LGPLv2+ or MPLv1.1
+License: MPL-1.0 OR GPL-2.0-or-later OR LGPL-2.0-or-later
# Note that the URL http://people.mozilla.org/~jkew/woff/, where the original
# WOFF reference implementation sources were published, is no longer available.
# A copy of that page can be found at
https://src.fedoraproject.org/rpms/woff/c/db1660bbcc695f3cbe31e0de86ecf0a...
1Â year
music pushed to rpms/woff (f36). "Add hand-written man pages"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:50:59 UTC
From 7e3ac4966a25ccf13be7a086ca2e18c04920a87a Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Nov 29 2022 16:49:32 +0000
Subject: Add hand-written man pages
---
diff --git a/sfnt2woff.1 b/sfnt2woff.1
new file mode 100644
index 0000000..87cecb6
--- /dev/null
+++ b/sfnt2woff.1
@@ -0,0 +1,35 @@
+.TH sfnt2woff "1" "November 2020" sfnt2woff\-zopfli "User Commands"
+.SH NAME
+sfnt2woff \- package OpenType
+.I otffile
+as WOFF, creating
+.IR otffile .woff
+.SH SYNOPSIS
+sfnt2woff
+.RB [ \-v
+.IR maj . min ]
+.RB [ \-m
+.IR metadata.xml ]
+.RB [ \-p
+.IR private.dat ]
+.I otffile
+.SH DESCRIPTION
+.PP
+Packages OpenType
+.I otffile
+as WOFF, creating
+.IR otffile .woff.
+.SH OPTIONS
+.TP
+\fB\-v\fR \fImaj\fR.\fImin
+set font version number (major and minor, both integers)
+.TP
+\fB\-m\fR \fImetadata.xml
+include metadata from
+.I metadata.xml
+(not validated)
+.TP
+\fB\-p\fR \fIprivate.dat
+include private data block
+.SH "SEE ALSO"
+.BR woff2sfnt (1)
diff --git a/woff.spec b/woff.spec
index b8a94a7..c99c7a7 100644
--- a/woff.spec
+++ b/woff.spec
@@ -14,6 +14,9 @@ License: GPLv2+ or LGPLv2+ or MPLv1.1
URL: https://web.archive.org/web/20170630235618/%{original_url}
# There is no longer a working URL for this archive.
Source0: %{original_url}/woff-code-latest.zip
+# Hand-written for Fedora in groff_man(7) format based on --help output
+Source1: sfnt2woff.1
+Source2: woff2sfnt.1
BuildRequires: make
BuildRequires: gcc
@@ -36,12 +39,16 @@ Encoding and Decoding for Web Open Font Format(Woff)
# The Makefile has no install target.
install -d '%{buildroot}%{_bindir}'
install -t '%{buildroot}%{_bindir}' -p sfnt2woff woff2sfnt
+install -d '%{buildroot}%{_mandir}/man1'
+install -t '%{buildroot}%{_mandir}/man1' -p -m 0644 '%{SOURCE1}' '%{SOURCE2}'
%files
%doc woff-2009-10-03.html
%{_bindir}/sfnt2woff
%{_bindir}/woff2sfnt
+%{_mandir}/man1/sfnt2woff.1*
+%{_mandir}/man1/woff2sfnt.1*
%changelog
@@ -50,6 +57,7 @@ install -t '%{buildroot}%{_bindir}' -p sfnt2woff woff2sfnt
archive URL
- General tidying of spec file; use modern macros and install HTML format
description as documentation
+- Add hand-written man pages
* Sun Jun 05 2022 Benson Muite <benson_muite(a)emailplus.org> - 0.20091126-26
- Source URL update
diff --git a/woff2sfnt.1 b/woff2sfnt.1
new file mode 100644
index 0000000..77bdb67
--- /dev/null
+++ b/woff2sfnt.1
@@ -0,0 +1,33 @@
+.TH woff2sfnt "1" "November 2020" woff2sfnt "User Commands"
+.SH NAME
+woff2sfnt \- decode WOFF file
+.IR woff ,
+writing OpenType data to
+.B stdout
+.SH SYNOPSIS
+woff2sfnt
+.RB [ \-v \ |\ \-m \ |\ \-p ]
+.I woff
+.SH DESCRIPTION
+.PP
+Decodes WOFF file
+.IR woff ,
+writing OpenType data to
+.BR stdout .
+.SH OPTIONS
+.TP
+.B \-v
+write font version to
+.B stdout
+.TP
+.B \-m
+write WOFF metadata block to
+.B stdout
+.TP
+.B \-p
+write private data block to
+.B stdout
+.SH NOTES
+Only one of \fB\-v\fR, \fB\-m\fR, \fB\-p\fR may be used at a time.
+.SH "SEE ALSO"
+.BR sfnt2woff (1)
https://src.fedoraproject.org/rpms/woff/c/7e3ac4966a25ccf13be7a086ca2e18c...
1Â year
music pushed to rpms/woff (f36). "General tidying of spec file (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:50:59 UTC
From d88e4c62b146ac2a3ec2f50429bdf5004196c47c Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Nov 29 2022 16:49:30 +0000
Subject: General tidying of spec file
- Use modern macros
- Install HTML format description as documentation
---
diff --git a/woff.spec b/woff.spec
index 39d7f14..b8a94a7 100644
--- a/woff.spec
+++ b/woff.spec
@@ -15,33 +15,41 @@ URL: https://web.archive.org/web/20170630235618/%{original_url}
# There is no longer a working URL for this archive.
Source0: %{original_url}/woff-code-latest.zip
-BuildRequires: make
-BuildRequires: zlib-devel
+BuildRequires: make
BuildRequires: gcc
+BuildRequires: zlib-devel
+
%description
Encoding and Decoding for Web Open Font Format(Woff)
%prep
-%autosetup -c
+%autosetup -c
+
%build
-make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
+%set_build_flags
+%make_build CFLAGS="${CFLAGS}"
%install
-mkdir -m 755 -p $RPM_BUILD_ROOT/%{_bindir}
-install -m755 sfnt2woff woff2sfnt $RPM_BUILD_ROOT/%{_bindir}/
+# The Makefile has no install target.
+install -d '%{buildroot}%{_bindir}'
+install -t '%{buildroot}%{_bindir}' -p sfnt2woff woff2sfnt
+
%files
-%doc
+%doc woff-2009-10-03.html
%{_bindir}/sfnt2woff
%{_bindir}/woff2sfnt
+
%changelog
* Tue Nov 29 2022 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.20091126-26
- Clarify URL/Source situation, and do not claim to have a working source
archive URL
+- General tidying of spec file; use modern macros and install HTML format
+ description as documentation
* Sun Jun 05 2022 Benson Muite <benson_muite(a)emailplus.org> - 0.20091126-26
- Source URL update
https://src.fedoraproject.org/rpms/woff/c/d88e4c62b146ac2a3ec2f50429bdf50...
1Â year
music pushed to rpms/woff (f36). "Improved summary and description"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-11-29 16:50:59 UTC
From c53a2a2ae25bc585c03ef749e653694a2d454bd6 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Nov 29 2022 16:49:51 +0000
Subject: Improved summary and description
---
diff --git a/woff.spec b/woff.spec
index 0dfdef5..e213f93 100644
--- a/woff.spec
+++ b/woff.spec
@@ -1,7 +1,7 @@
Name: woff
Version: 0.20091126
Release: %autorelease
-Summary: Encoding and Decoding for Web Open Font Format(Woff)
+Summary: Encoding and decoding for Web Open Font Format (WOFF)
License: MPL-1.0 OR GPL-2.0-or-later OR LGPL-2.0-or-later
# Note that the URL http://people.mozilla.org/~jkew/woff/, where the original
@@ -29,7 +29,8 @@ BuildRequires: gcc
BuildRequires: zlib-devel
%description
-Encoding and Decoding for Web Open Font Format(Woff)
+Provides the sfnt2woff and woff2sfnt command-line tools for encoding and
+decoding Web Open Font Format (WOFF) files.
%prep
%autosetup -c -p1
https://src.fedoraproject.org/rpms/woff/c/c53a2a2ae25bc585c03ef749e653694...
1Â year