[packages/fdutils] Up to 5.6
arekm
arekm at pld-linux.org
Thu May 21 15:39:57 CEST 2026
commit 30b4beb24e8c0916fad62ade8b343ed387cce442
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu May 21 15:39:40 2026 +0200
Up to 5.6
fdutils-diskd-conflict.patch | 50 ++++++++++++++++++---------------
fdutils-fno-common.patch | 13 +++++++++
fdutils-parallel-make.patch | 66 ++++++++++++++++++++++++++++++++++++++++++++
fdutils.spec | 22 ++++++++-------
4 files changed, 118 insertions(+), 33 deletions(-)
---
diff --git a/fdutils.spec b/fdutils.spec
index dc89b6d..3f78b49 100644
--- a/fdutils.spec
+++ b/fdutils.spec
@@ -2,19 +2,19 @@ Summary: Floppy utilities
Summary(pl.UTF-8): Narzędzia do dyskietek
Summary(zh_CN.UTF-8): 软盘驱动调试和配置工具
Name: fdutils
-Version: 5.5
+Version: 5.6
Release: 1
License: GPL v2+
Group: Applications/System
#Source0Download: http://fdutils.linux.lu/download.html
Source0: http://fdutils.linux.lu/%{name}-%{version}.tar.gz
-# Source0-md5: 2b8b65f52378158a4a21e455566b456d
+# Source0-md5: 85efbd7b9a4cf87687d3270ed2a7e7fd
Patch0: %{name}-info.patch
Patch1: %{name}-DESTDIR.patch
Patch2: %{name}-diskd-conflict.patch
Patch3: %{name}-nodvi.patch
-Patch4: http://fdutils.linux.lu/fdutils-5.5-20060227.diff.gz
-# Patch4-md5: e13410bc193053eee2cab4b837407865
+Patch4: %{name}-parallel-make.patch
+Patch5: %{name}-fno-common.patch
URL: http://fdutils.linux.lu/
BuildRequires: autoconf
BuildRequires: automake
@@ -49,23 +49,25 @@ dyskietek w stacjach podłączanych przez USB służy pakiet ufiformat.
%patch -P2 -p1
%patch -P3 -p1
%patch -P4 -p1
+%patch -P5 -p1
%build
cp -f /usr/share/automake/config.* .
%{__aclocal}
%{__autoconf}
%configure
-%{__make}
+%{__make} all compile-doc
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir}
-%{__make} install \
+%{__make} install install-doc \
DESTDIR=$RPM_BUILD_ROOT
# in man-pages
rm $RPM_BUILD_ROOT%{_mandir}/man4/fd.4
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%clean
rm -rf $RPM_BUILD_ROOT
@@ -83,18 +85,18 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/MAKEFLOPPIES
%attr(755,root,root) %{_bindir}/diskseekd
%attr(755,root,root) %{_bindir}/fddiskd
-%attr(755,root,root) %{_bindir}/fdlist
+%{_bindir}/fdlist
%attr(755,root,root) %{_bindir}/fdmount
-%attr(755,root,root) %{_bindir}/fdmountd
+%{_bindir}/fdmountd
%attr(755,root,root) %{_bindir}/fdrawcmd
-%attr(755,root,root) %{_bindir}/fdumount
+%{_bindir}/fdumount
%attr(755,root,root) %{_bindir}/floppycontrol
%attr(755,root,root) %{_bindir}/floppymeter
%attr(755,root,root) %{_bindir}/getfdprm
%attr(755,root,root) %{_bindir}/setfdprm
%attr(755,root,root) %{_bindir}/superformat
%attr(755,root,root) %{_bindir}/xdfcopy
-%attr(755,root,root) %{_bindir}/xdfformat
+%{_bindir}/xdfformat
%{_mandir}/man1/makefloppies.1*
%{_mandir}/man1/diskseekd.1*
%{_mandir}/man1/fddiskd.1*
diff --git a/fdutils-diskd-conflict.patch b/fdutils-diskd-conflict.patch
index ecfb64f..945aa74 100644
--- a/fdutils-diskd-conflict.patch
+++ b/fdutils-diskd-conflict.patch
@@ -1,15 +1,15 @@
-diff -Nur fdutils-5.4.orig/doc/cmdname fdutils-5.4/doc/cmdname
---- fdutils-5.4.orig/doc/cmdname Sat Apr 19 18:28:16 1997
-+++ fdutils-5.4/doc/cmdname Thu Aug 22 22:10:14 2002
+diff -urN fdutils-5.6-clean/doc/cmdname fdutils-5.6-patched/doc/cmdname
+--- fdutils-5.6-clean/doc/cmdname 2021-01-27 21:39:40.000000000 +0100
++++ fdutils-5.6-patched/doc/cmdname 2026-05-21 01:29:45.268435727 +0200
@@ -1,4 +1,4 @@
-diskd - disk daemon; wait for disk to be inserted
+fddiskd - disk daemon; wait for disk to be inserted
diskseek, diskseekd - disk seek daemon; simulates Messy Dos' drive cleaning effect
fd - floppy disk device
fdmount - Floppy disk mount utility
-diff -Nur fdutils-5.4.orig/doc/commands.texi fdutils-5.4/doc/commands.texi
---- fdutils-5.4.orig/doc/commands.texi Thu Apr 24 23:38:57 1997
-+++ fdutils-5.4/doc/commands.texi Thu Aug 22 22:11:31 2002
+diff -urN fdutils-5.6-clean/doc/commands.texi fdutils-5.6-patched/doc/commands.texi
+--- fdutils-5.6-clean/doc/commands.texi 2021-01-27 21:39:40.000000000 +0100
++++ fdutils-5.6-patched/doc/commands.texi 2026-05-21 01:29:45.268635566 +0200
@@ -7,7 +7,7 @@
line parameters that each of them accepts.
@@ -19,18 +19,19 @@ diff -Nur fdutils-5.4.orig/doc/commands.texi fdutils-5.4/doc/commands.texi
* diskseekd:: seeks the drive from time to time to shake of the
dust
* fdmount:: automatically mounts and unmounts floppy disks
---- fdutils-5.5/doc/diskd.1.orig 2005-03-03 22:55:18.000000000 +0100
-+++ fdutils-5.5/doc/diskd.1 2008-02-09 16:01:43.668973107 +0100
+diff -urN fdutils-5.6-clean/doc/diskd.1 fdutils-5.6-patched/doc/diskd.1
+--- fdutils-5.6-clean/doc/diskd.1 2021-01-27 21:40:43.000000000 +0100
++++ fdutils-5.6-patched/doc/diskd.1 2026-05-21 01:29:45.272885685 +0200
@@ -1,6 +1,6 @@
--.TH diskd 1 "03Mar05" fdutils-5.5
-+.TH fddiskd 1 "03Mar05" fdutils-5.5
+-.TH diskd 1 "27Jan21" fdutils-5.6
++.TH fddiskd 1 "27Jan21" fdutils-5.6
.SH Name
-diskd - disk daemon; wait for disk to be inserted
+fddiskd - disk daemon; wait for disk to be inserted
'\" t
.de TQ
.br
-@@ -70,15 +70,15 @@ The texinfo doc looks most pretty when p
+@@ -70,15 +70,15 @@
the info version certain examples are difficult to read due to the
quoting conventions used in info.
.SH Description
@@ -49,8 +50,9 @@ diff -Nur fdutils-5.4.orig/doc/commands.texi fdutils-5.4/doc/commands.texi
.fi
.in -0.3i
.ft R
---- fdutils-5.5/doc/diskd.texi.orig 2003-07-12 21:17:07.000000000 +0200
-+++ fdutils-5.5/doc/diskd.texi 2008-02-09 16:02:23.727255898 +0100
+diff -urN fdutils-5.6-clean/doc/diskd.texi fdutils-5.6-patched/doc/diskd.texi
+--- fdutils-5.6-clean/doc/diskd.texi 2003-07-12 21:17:07.000000000 +0200
++++ fdutils-5.6-patched/doc/diskd.texi 2026-05-21 01:29:45.269108761 +0200
@@ -1,11 +1,11 @@
- at node diskd, diskseekd, Commands, Commands
- at section diskd
@@ -68,18 +70,19 @@ diff -Nur fdutils-5.4.orig/doc/commands.texi fdutils-5.4/doc/commands.texi
@end example
Diskd waits for a disk to be inserted into a given @var{drive}, and then
-diff -Nur fdutils-5.4.orig/doc/diskseekd.texi fdutils-5.4/doc/diskseekd.texi
---- fdutils-5.4.orig/doc/diskseekd.texi Sat Mar 1 17:29:47 1997
-+++ fdutils-5.4/doc/diskseekd.texi Thu Aug 22 22:11:43 2002
+diff -urN fdutils-5.6-clean/doc/diskseekd.texi fdutils-5.6-patched/doc/diskseekd.texi
+--- fdutils-5.6-clean/doc/diskseekd.texi 2002-05-02 23:03:31.000000000 +0200
++++ fdutils-5.6-patched/doc/diskseekd.texi 2026-05-21 01:29:45.269258237 +0200
@@ -1,4 +1,4 @@
- at node diskseekd, fdmount, diskd, Commands
+ at node diskseekd, fdmount, fddiskd, Commands
@section diskseekd
@pindex diskseekd
@cindex dust (shaking it off from a drive)
---- fdutils-5.5/doc/Makefile.in.orig 2008-02-09 16:03:41.655696787 +0100
-+++ fdutils-5.5/doc/Makefile.in 2008-02-09 16:06:24.444973619 +0100
-@@ -18,7 +18,7 @@
+diff -urN fdutils-5.6-clean/doc/Makefile.in fdutils-5.6-patched/doc/Makefile.in
+--- fdutils-5.6-clean/doc/Makefile.in 2026-05-21 01:29:45.259285222 +0200
++++ fdutils-5.6-patched/doc/Makefile.in 2026-05-21 01:29:45.269435824 +0200
+@@ -19,7 +19,7 @@
mandir4 = $(mandir)/man4
mandir8 = $(mandir)/man8
@@ -88,7 +91,7 @@ diff -Nur fdutils-5.4.orig/doc/diskseekd.texi fdutils-5.4/doc/diskseekd.texi
floppycontrol.1 makefloppies.1 xdfcopy.1 fdmount.1 \
floppymeter.1 setfdprm.1
-@@ -108,6 +108,7 @@ install-man:
+@@ -110,6 +110,7 @@
install -c -m $(MANPERM) \
$(srcdir)/$$i $(DESTDIR)$(mandir1)/$$i; \
done
@@ -96,9 +99,10 @@ diff -Nur fdutils-5.4.orig/doc/diskseekd.texi fdutils-5.4/doc/diskseekd.texi
for i in $(MANPAGES4); do \
install -c -m $(MANPERM) \
---- fdutils-5.5/src/Makefile.in.orig 2008-02-09 15:58:25.773695697 +0100
-+++ fdutils-5.5/src/Makefile.in 2008-02-09 16:07:22.144261714 +0100
-@@ -122,7 +122,7 @@
+diff -urN fdutils-5.6-clean/src/Makefile.in fdutils-5.6-patched/src/Makefile.in
+--- fdutils-5.6-clean/src/Makefile.in 2026-05-21 01:29:45.259552553 +0200
++++ fdutils-5.6-patched/src/Makefile.in 2026-05-21 01:29:45.269613559 +0200
+@@ -124,7 +124,7 @@
install-bin: all
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
$(INSTALL) -c -m $(PERM) $(srcdir)/MAKEFLOPPIES $(DESTDIR)$(bindir)
diff --git a/fdutils-fno-common.patch b/fdutils-fno-common.patch
new file mode 100644
index 0000000..1352e31
--- /dev/null
+++ b/fdutils-fno-common.patch
@@ -0,0 +1,13 @@
+diff -urN w/src/superformat.h wp/src/superformat.h
+--- w/src/superformat.h 2008-10-27 20:17:54.000000000 +0100
++++ wp/src/superformat.h 2026-05-21 01:32:36.566097477 +0200
+@@ -97,7 +97,7 @@
+ void compute_track0_sequence(struct params *fd);
+ int calc_skews(struct params *fd0, struct params *fd, int n);
+ extern int verbosity;
+-int header_size;
+-int index_size;
++extern int header_size;
++extern int index_size;
+
+ #endif
diff --git a/fdutils-parallel-make.patch b/fdutils-parallel-make.patch
new file mode 100644
index 0000000..09e102d
--- /dev/null
+++ b/fdutils-parallel-make.patch
@@ -0,0 +1,66 @@
+Fix parallel-make races in fdutils build and install.
+
+Three problems make `make -jN` unsafe:
+ 1) `libfdutils.a: libfdutils.a($(LIBFILES))` uses GNU make's
+ archive-member rule, which invokes one `ar` per member and races
+ ("file format not recognized"). Build the archive with one `ar`
+ call.
+ 2) `fdrawcmd` links with `-lfdutils` but doesn't list `libfdutils.a`
+ as a prerequisite, so the linker can run before the archive
+ exists. Add the missing dep.
+ 3) `mkinstalldirs` does a `test -d ; mkdir` check that races with
+ concurrent submakes installing into the same parent directory
+ (BUILDROOT/usr, BUILDROOT/usr/share). Use `mkdir -p` instead.
+
+diff -urN mp/mkinstalldirs mq/mkinstalldirs
+--- mp/mkinstalldirs 2002-05-02 23:03:31.000000000 +0200
++++ mq/mkinstalldirs 2026-05-21 01:35:48.216219023 +0200
+@@ -7,25 +7,7 @@
+
+ errstatus=0
+
+-for file in ${1+"$@"} ; do
+- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+- shift
+-
+- pathcomp=
+- for d in ${1+"$@"} ; do
+- pathcomp="$pathcomp$d"
+- case "$pathcomp" in
+- -* ) pathcomp=./$pathcomp ;;
+- esac
+-
+- if test ! -d "$pathcomp"; then
+- echo "mkdir $pathcomp" 1>&2
+- mkdir "$pathcomp" || errstatus=$?
+- fi
+-
+- pathcomp="$pathcomp/"
+- done
+-done
++mkdir -p ${1+"$@"} || errstatus=$?
+
+ exit $errstatus
+
+diff -urN mp/src/Makefile.in mq/src/Makefile.in
+--- mp/src/Makefile.in 2021-01-27 21:04:11.000000000 +0100
++++ mq/src/Makefile.in 2026-05-21 01:36:00.799552357 +0200
+@@ -67,7 +67,8 @@
+ lex.%.c: %.lex
+ lex -P$* $<
+
+-libfdutils.a: libfdutils.a($(LIBFILES))
++libfdutils.a: $(LIBFILES)
++ $(AR) rc $@ $(LIBFILES)
+ ranlib libfdutils.a
+
+ floppycontrol.o getfdprm setfdprm: /usr/include/linux/fd.h
+@@ -95,7 +96,7 @@
+ floppymeter: floppymeter.o libfdutils.a
+ ${CC} ${LDFLAFS} -o $@ $< $(LIBS)
+
+-fdrawcmd: fdrawcmd.o
++fdrawcmd: fdrawcmd.o libfdutils.a
+ ${CC} $(LDFLAGS) -o $@ $< $(LIBS)
+
+ getfdprm: getfdprm.o libfdutils.a
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fdutils.git/commitdiff/30b4beb24e8c0916fad62ade8b343ed387cce442
More information about the pld-cvs-commit
mailing list