.flashrom.metadata

@@ -1,2 +1,2 @@
-4e863c865a8204639add9532b4c8913db46a6501 SOURCES/flashrom-v1.2.tar.bz2
+d40fc43f5b2b274e1dcc0a6fad13f7af97e02725 SOURCES/6E6EF9A0BA478006E2776E4CC037BB413134D111.gpg
-2e2620053d4b22d6d295c8befb05112a678b141a SOURCES/gpgkey-58A4868B25C7CFD662FB0132A3EB95B8D9780F68.gpg
+98d1c6c3c8c2762722ed53b4b283d8cef1fea11a SOURCES/flashrom-v1.3.0.tar.bz2

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/flashrom-v1.2.tar.bz2
+SOURCES/6E6EF9A0BA478006E2776E4CC037BB413134D111.gpg
-SOURCES/gpgkey-58A4868B25C7CFD662FB0132A3EB95B8D9780F68.gpg
+SOURCES/flashrom-v1.3.0.tar.bz2

SOURCES/0001-Install-the-man-file-when-using-meson-as-a-buildsyst.patch

@@ -1,43 +0,0 @@
-From b820207aeff98b5ccf21649036259333fd0e0175 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 17 Feb 2020 09:57:01 +0000
-Subject: [PATCH] Install the man file when using meson as a buildsystem
-
-This fixes a regression with the Fedora package.
-
-Change-Id: I881bd5002a842072ce9dadea033c51a2668f9e7c
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
- meson.build | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 375089c3..df39290b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -299,6 +299,7 @@ endif
- prefix = get_option('prefix')
- sbindir = join_paths(prefix, get_option('sbindir'))
- libdir = join_paths(prefix, get_option('libdir'))
-+mandir = join_paths(prefix, get_option('mandir'))
- 
- install_headers([
-     'libflashrom.h',
-@@ -372,6 +373,14 @@ pkgg.generate(
-   description : 'library to interact with flashrom',
- )
- 
-+configure_file(
-+  input : 'flashrom.8.tmpl',
-+  output : 'flashrom.8',
-+  copy: true,
-+  install: true,
-+  install_dir: join_paths(mandir, 'man8'),
-+)
-+
- flashrom_dep = declare_dependency(
-   link_with : flashrom,
-   include_directories : include_directories('.'),
--- 
-2.24.1
-

SOURCES/0002-meson-Add-missing-config-option-for-J-Link-SPI.patch

@@ -1,47 +0,0 @@
-From: Marc Schink <dev@zapb.de>
-Date: Tue, 8 Dec 2020 22:20:50 +0100
-Subject: [PATCH] meson: Add missing config option for J-Link SPI
-
-Signed-off-by: Marc Schink <dev@zapb.de>
-Change-Id: I476c649f9db7342688560aac9ee5df056517a028
-Reviewed-on: https://review.coreboot.org/c/flashrom/+/48478
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
-
-diff --git a/meson.build b/meson.build
-index cf91ef4..878cac3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -38,6 +38,7 @@ config_ch341a_spi = get_option('config_ch341a_spi')
- config_dediprog = get_option('config_dediprog')
- config_developerbox_spi = get_option('config_developerbox_spi')
- config_digilent_spi = get_option('config_digilent_spi')
-+config_jlink_spi = get_option('config_jlink_spi')
- config_drkaiser = get_option('config_drkaiser')
- config_dummy = get_option('config_dummy')
- config_ft2232_spi = get_option('config_ft2232_spi')
-@@ -152,6 +153,11 @@ if config_digilent_spi
-   srcs += 'digilent_spi.c'
-   cargs += '-DCONFIG_DIGILENT_SPI=1'
- endif
-+if config_jlink_spi
-+  srcs += 'jlink_spi.c'
-+  cargs += '-DCONFIG_JLINK_SPI=1'
-+  deps += dependency('libjaylink')
-+endif
- if config_drkaiser
-   srcs += 'drkaiser.c'
-   cargs += '-DCONFIG_DRKAISER=1'
-diff --git a/meson_options.txt b/meson_options.txt
-index ea87311..f253f26 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -9,6 +9,7 @@ option('config_ch341a_spi', type : 'boolean', value : true, description : 'Winch
- option('config_dediprog', type : 'boolean', value : true, description : 'Dediprog SF100')
- option('config_developerbox_spi', type : 'boolean', value : true, description : 'Developerbox emergency recovery')
- option('config_digilent_spi', type : 'boolean', value : true, description : 'Digilent Development board JTAG')
-+option('config_jlink_spi', type : 'boolean', value : false, description : 'SEGGER J-Link and compatible devices')
- option('config_drkaiser', type : 'boolean', value : true, description : 'Dr. Kaiser')
- option('config_dummy', type : 'boolean', value : true, description : 'dummy tracing')
- option('config_ft2232_spi', type : 'boolean', value : true, description : 'FT2232 SPI dongles')

SOURCES/flashrom-v1.3.0.tar.bz2.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRubvmgukeABuJ3bkzAN7tBMTTREQUCY+MPrwAKCRDAN7tBMTTR
+EZX5AJ41n1UF6YaAnao6OWYfrE6nRyaL/gCeJxIgEKVf+YAROc6oe2C+jNu+6L8=
+=kICs
+-----END PGP SIGNATURE-----

SPECS/flashrom.spec

@@ -1,26 +1,33 @@
 Name:		flashrom
-Version:	1.2
+Version:	1.3.0
-Release:	10%{?dist}
+Release:	7%{?dist}
 Summary:	Simple program for reading/writing flash chips content
-License:	GPLv2
+License:	GPL-2.0-only
 URL:		https://flashrom.org
 
 Source0:	https://download.flashrom.org/releases/%{name}-v%{version}.tar.bz2
 Source1:	https://download.flashrom.org/releases/%{name}-v%{version}.tar.bz2.asc
-Source2:	gpgkey-58A4868B25C7CFD662FB0132A3EB95B8D9780F68.gpg
+# Find which key was used for signing the release:
-
+#
-# upstream already: https://review.coreboot.org/c/flashrom/+/38939
+# $ LANG=C gpg --verify flashrom-v1.3.0.tar.bz2.asc flashrom-v1.3.0.tar.bz2
-Patch0:    0001-Install-the-man-file-when-using-meson-as-a-buildsyst.patch
+# gpg: Signature made Wed Feb  8 03:57:51 2023 CET
-# upstreamed: https://review.coreboot.org/c/flashrom/+/48478
+# gpg:                using DSA key 6E6EF9A0BA478006E2776E4CC037BB413134D111
-Patch1:    0002-meson-Add-missing-config-option-for-J-Link-SPI.patch
+# gpg: Can't check signature: No public key
-
+#
-BuildRequires:	gnupg2
+# Now export the key required as follows:
+#
+# gpg --no-default-keyring --keyring ./keyring.gpg --keyserver keyserver.ubuntu.com --recv-key 6E6EF9A0BA478006E2776E4CC037BB413134D111
+# gpg --no-default-keyring --keyring ./keyring.gpg  --output 6E6EF9A0BA478006E2776E4CC037BB413134D111.gpg --export
+Source2:	6E6EF9A0BA478006E2776E4CC037BB413134D111.gpg
 BuildRequires:	gcc
+BuildRequires:	gnupg2
+%if ! 0%{?rhel}
+BuildRequires:	libftdi-devel
+BuildRequires:	libjaylink-devel
+%endif
+BuildRequires:	libusb1-devel
 BuildRequires:	meson
 BuildRequires:	pciutils-devel
-BuildRequires:	libusb-devel
-# Used for new programmers (libusb0 will eventually be removed)
-BuildRequires:	libusbx-devel
 BuildRequires:	systemd
 BuildRequires:	zlib-devel
 %ifarch %{ix86} x86_64 aarch64
@@ -49,46 +56,17 @@ Files for development with %{name}.
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1 -n %{name}-v%{version}
 # Replace GROUP="plugdev" specifiers with TAG+="uaccess"
-sed -e 's/MODE="[0-9]*", GROUP="plugdev"/TAG+="uaccess"/g' util/z60_flashrom.rules -i
+sed -e 's/MODE="[0-9]*", GROUP="plugdev"/TAG+="uaccess"/g' util/flashrom_udev.rules -i
 
 %build
-%meson \
+%meson -Dtests=disabled
-  -Dconfig_ft2232_spi=false \
-  -Dconfig_usbblaster_spi=false \
-%ifarch %{ix86} x86_64
-  -Dconfig_internal=true
-%else
-  -Dconfig_atahpt=false \
-  -Dconfig_atapromise=false \
-  -Dconfig_atavia=false \
-  -Dconfig_drkaiser=false \
-  -Dconfig_gfxnvidia=false \
-  -Dconfig_it8212=false \
-  -Dconfig_jlink_spi=false \
-  -Dconfig_nic3com=false \
-  -Dconfig_nicintel_eeprom=false \
-  -Dconfig_nicintel=false \
-  -Dconfig_nicintel_spi=false \
-  -Dconfig_nicnatsemi=false \
-  -Dconfig_nicrealtek=false \
-  -Dconfig_ogp_spi=false \
-  -Dconfig_rayer_spi=false \
-  -Dconfig_satamv=false \
-  -Dconfig_satasii=false \
-  -Dconfig_internal=false
-%endif
-
 %meson_build
 
-%if 0%{?enable_tests}
-%check
-%meson_test
-%endif
-
 %install
 %meson_install
 
-install -D -p -m 0644 util/z60_flashrom.rules %{buildroot}/%{_udevrulesdir}/60_flashrom.rules
+install -D -p -m 0644 util/flashrom_udev.rules %{buildroot}/%{_udevrulesdir}/60_flashrom.rules
+rm %{buildroot}/%{_libdir}/libflashrom.a
 
 %files
 %license COPYING
@@ -105,20 +83,38 @@ install -D -p -m 0644 util/z60_flashrom.rules %{buildroot}/%{_udevrulesdir}/60_f
 %{_libdir}/pkgconfig/flashrom.pc
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2-10
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.3.0-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for June 2024 mass rebuild
-  Related: rhbz#1991688
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Oct 21 2023 Peter Lemenkov <lemenkov@gmail.com> - 1.3.0-4
+- Check GPG signature
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Jun 18 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.3.0-2
+- Drop unused libusb-0.1 dependency
+
+* Thu Feb 09 2023 Richard Hughes <richard@hughsie.com> - 1.3.0-1
+- Update to latest upstream release
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Mon May 17 2021 Richard Hughes <richard@hughsie.com> 1.2-9
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-9
-- Disable FTDI support to remove one extra dep we are not going to support
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-- Resolves: rhbz#1961170
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.2-8
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-8
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Mon Apr 12 2021 Richard Hughes <richard@hughsie.com> 1.2-7
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
-- Disable JLink support to remove one extra dep we are not going to support
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-- Resolves: rhbz#1948597
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild