Compare commits

...
Sign in to create a new pull request.

21 commits

Author SHA1 Message Date
Zbigniew Jędrzejewski-Szmek
65b17bc69e Use %_sbindir for the binary
This effectively moves the binary to /usr/bin/
on any recent Fedora system.
2025-10-22 09:27:17 +02:00
Fedora Release Engineering
755823fbb1 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 20:54:42 +00:00
Fedora Release Engineering
37f46a5ada Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 19:04:04 +00:00
Jaroslav Kysela
28b45e2a79 Use /usr/sbin directory 2024-12-18 11:42:37 +01:00
Fedora Release Engineering
f2cd3ded56 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 23:50:42 +00:00
Software Management Team
ba7df3e1f2 Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:46 +02:00
Fedora Release Engineering
bf5281c382 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 12:13:12 +00:00
Fedora Release Engineering
842216ec5c Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 19:58:47 +00:00
Jaroslav Kysela
0dc3e3277f SPDX license 2023-09-07 16:16:47 +02:00
Fedora Release Engineering
2e7b74bcd0 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 20:28:06 +00:00
Fedora Release Engineering
dea97a460e Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 04:04:51 +00:00
Fedora Release Engineering
63e4bb9589 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 03:48:50 +00:00
Fedora Release Engineering
7bc929d8da - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 03:36:21 +00:00
Fedora Release Engineering
a79cce463f - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 23:31:48 +00:00
Fedora Release Engineering
30e9110fa7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 06:05:07 +00:00
Charles R. Anderson
aa39989582 BuildRequires make 2020-12-08 15:58:44 -05:00
Charles R. Anderson
6719e23cab Merge PR#2: Make annocheck pass, pass -pie to linker, use make_build macro 2020-12-08 15:48:09 -05:00
Timm Bäder
77c33a5523 spec: Pass -pie via LDFLAGS
This makes the clang build succeed.
2020-11-03 16:14:29 +01:00
Timm Bäder
9cc177f438 spec: Use %{make_build} macro 2020-11-03 16:13:39 +01:00
Timm Bäder
730a21a590 Add LDFLAGS to linking
Add the usual LDFLAGS when linking.
2020-11-03 16:10:53 +01:00
Timm Bäder
ec0ec05211 Remove cflags-ldflags patch
This patch added the CFLAGS to linking as well, which breaks and
annocheck complains:

Hardened: fxload: FAIL: Compiled without using either the -Wall or -Wformat-security options. Run with -v to see where.

A later patch will add the LDFLAGS back at the same place
2020-11-03 16:03:04 +01:00
3 changed files with 74 additions and 28 deletions

View file

@ -1,12 +0,0 @@
diff -up fxload-2008_10_13/Makefile.cflags fxload-2008_10_13/Makefile
--- fxload-2008_10_13/Makefile.cflags 2008-10-13 17:44:04.000000000 -0400
+++ fxload-2008_10_13/Makefile 2018-02-25 23:11:02.416103160 -0500
@@ -39,7 +39,7 @@ release: rpms
# object files
$(PROG): $(FILES_OBJ)
- $(CC) -o $(PROG) $(FILES_OBJ)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(FILES_OBJ)
%.o: %.c
$(CC) -c $(CFLAGS) $< -o $@

12
fxload-ldflags.patch Normal file
View file

@ -0,0 +1,12 @@
diff -ruN fxload-2008_10_13.orig/Makefile fxload-2008_10_13/Makefile
--- fxload-2008_10_13.orig/Makefile 2008-10-13 23:44:04.000000000 +0200
+++ fxload-2008_10_13/Makefile 2020-11-03 16:05:41.516974652 +0100
@@ -39,7 +39,7 @@
# object files
$(PROG): $(FILES_OBJ)
- $(CC) -o $(PROG) $(FILES_OBJ)
+ $(CC) $(LDFLAGS) -o $(PROG) $(FILES_OBJ)
%.o: %.c
$(CC) -c $(CFLAGS) $< -o $@

View file

@ -1,9 +1,9 @@
Name: fxload
Version: 2008_10_13
Release: 16%{?dist}
Release: 33%{?dist}
Summary: A helper program to download firmware into FX and FX2 EZ-USB devices
License: GPLv2+
License: GPL-2.0-or-later
URL: http://linux-hotplug.sourceforge.net/
Source0: fxload-%{version}-noa3load.tar.gz
# The above file is derived from:
@ -15,39 +15,85 @@ Source0: fxload-%{version}-noa3load.tar.gz
# ./fxload-generate-tarball.sh 2008_10_13
Source1: fxload-generate-tarball.sh
Patch0: fxload-noa3load.patch
Patch1: fxload-cflags-ldflags.patch
Patch1: fxload-ldflags.patch
BuildRequires: gcc kernel-headers
BuildRequires: gcc kernel-headers make
Requires: udev
Conflicts: hotplug-gtk hotplug
%description
%description
This program is conveniently able to download firmware into FX and FX2
EZ-USB devices, as well as the original AnchorChips EZ-USB. It is
intended to be invoked by udev scripts when the unprogrammed device
appears on the bus.
%prep
%setup -q
%patch0 -p1 -b .fxload-noa3load
%patch1 -p1 -b .cflags
%setup -q
%patch -P0 -p1 -b .fxload-noa3load
%patch -P1 -p1 -b .ldflags
%build
make CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
%build
%{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS -pie"
%install
mkdir -p -m 755 %{buildroot}/sbin
install -m 755 fxload %{buildroot}/sbin
mkdir -p -m 755 %{buildroot}/%{_mandir}/man8/
install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/
install -m 755 -Dt %{buildroot}%{_sbindir}/ fxload
install -m 644 -Dt %{buildroot}%{_mandir}/man8/ fxload.8
%files
%doc COPYING
%doc README.txt
%attr(0755, root, root) /sbin/fxload
%{_mandir}/*/*
%{_sbindir}/fxload
%{_mandir}/man8/fxload.8*
%changelog
* Wed Oct 22 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2008_10_13-33
- Use %%_sbindir for the binary (rhbz#2405414)
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Dec 18 2024 Jaroslav Kysela <perex@perex.cz> - 2008_10_13-29
- use /usr/sbin directory
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Sep 7 2023 Jaroslav Kysela <perex@perex.cz> - 2008_10_13-25
- SPDX license
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 08 2020 Charles R. Anderson <cra@alum.wpi.edu> - 2008_10_13-18
- BR: make
* Tue Dec 08 2020 Charles R. Anderson <cra@alum.wpi.edu> - 2008_10_13-17
- Merge PR#2: Make annocheck pass, pass -pie to linker, use make_build macro
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild