Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (baec351276b4f0584571c5c0c2fc1c0e169f973a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (baec351276b4f0584571c5c0c2fc1c0e169f973a)
  • Date: Fri, 1 Jul 2022 18:18:03 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

dev/null
|binary
disk/fdutils/DETAILS
| 4 -
disk/fdutils/HISTORY
| 10 ++-
disk/fdutils/PRE_BUILD
| 3

disk/fdutils/patches/0001-Fix-declarations-of-header_size-and-index_size.patch
| 31 +++++++++
disk/fdutils/patches/0001-Fix-inclusion-of-signal.h.patch
| 27 ++++++++
disk/fdutils/patches/0001-Mark-lock_mtab-and-unlock_mtab-as-unit-local.patch
| 33 ++++++++++
7 files changed, 105 insertions(+), 3 deletions(-)

New commits:
commit baec351276b4f0584571c5c0c2fc1c0e169f973a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fdutils 5.6

diff --git a/disk/fdutils/DETAILS b/disk/fdutils/DETAILS
index 1c8be4c..48cb3a2 100755
--- a/disk/fdutils/DETAILS
+++ b/disk/fdutils/DETAILS
@@ -1,9 +1,9 @@
SPELL=fdutils
- VERSION=5.5
+ VERSION=5.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://fdutils.linux.lu/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:5b8c4b4f08657f7dd8bcbddddb5943df30386731c59be8fccd7da40504569c2fab48697d91937f0f50c19a51f84f2a191803139a93fafa10f8a3003cbd75faab
WEB_SITE=http://fdutils.linux.lu/
LICENSE[0]=GPL
ENTERED=20020106
diff --git a/disk/fdutils/HISTORY b/disk/fdutils/HISTORY
index 7e0322e..b4adaa6 100644
--- a/disk/fdutils/HISTORY
+++ b/disk/fdutils/HISTORY
@@ -1,3 +1,12 @@
+2022-07-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 5.6
+ * PRE_BUILD,
+ patches/0001-Fix-declarations-of-header_size-and-index_size.patch:
+ fixed build against GCC 10+
+ * patches/0001-Fix-inclusion-of-signal.h.patch,
+ patches/0001-Mark-lock_mtab-and-unlock_mtab-as-unit-local.patch:
+ added improvements for correctness
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

@@ -38,4 +47,3 @@

2002-05-29 Eric Sandall <sandalle AT sourcemage.org>
* Tested and works with gcc3
-
diff --git a/disk/fdutils/PRE_BUILD b/disk/fdutils/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/disk/fdutils/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/disk/fdutils/fdutils-5.5.tar.gz.sig
b/disk/fdutils/fdutils-5.5.tar.gz.sig
deleted file mode 100644
index b23af46..0000000
Binary files a/disk/fdutils/fdutils-5.5.tar.gz.sig and /dev/null differ
diff --git
a/disk/fdutils/patches/0001-Fix-declarations-of-header_size-and-index_size.patch

b/disk/fdutils/patches/0001-Fix-declarations-of-header_size-and-index_size.patch
new file mode 100644
index 0000000..51aa439
--- /dev/null
+++
b/disk/fdutils/patches/0001-Fix-declarations-of-header_size-and-index_size.patch
@@ -0,0 +1,31 @@
+From 79afd2c07962b24f76b52b19709ca991939f1156 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 01 Jul 2022 16:08:04 +0200
+Subject: [PATCH] Fix declarations of header_size and index_size
+
+Convert definitions in the header file into declarations, since both are
+already defined in superformat.c.
+
+This is required by GCC 10+, as it makes the -fno-common flag default,
+causing the definitions to not merge.
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Upstream-Status: Pending
+---
+ src/superformat.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/superformat.h b/src/superformat.h
+index b4b0687e6edf..c8f43a0c38a5 100644
+--- a/src/superformat.h
++++ b/src/superformat.h
+@@ -97,7 +97,7 @@ int compute_all_sequences(struct params *fd,
+ 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/disk/fdutils/patches/0001-Fix-inclusion-of-signal.h.patch
b/disk/fdutils/patches/0001-Fix-inclusion-of-signal.h.patch
new file mode 100644
index 0000000..fcfd54b
--- /dev/null
+++ b/disk/fdutils/patches/0001-Fix-inclusion-of-signal.h.patch
@@ -0,0 +1,27 @@
+From 50d47d840a6d34bf7994bcaf11bf0e2e94c0583d Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 01 Jul 2022 16:08:05 +0200
+Subject: [PATCH] Fix inclusion of signal.h
+
+POSIX.1-1988 already specifies it as <signal.h>, <sys/signal.h> is an
+artifact of non-conformance.
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Upstream-Status: Pending
+---
+ src/diskseekd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/diskseekd.c b/src/diskseekd.c
+index 324d091e9f89..cde35e8ff019 100644
+--- a/src/diskseekd.c
++++ b/src/diskseekd.c
+@@ -16,7 +16,7 @@
+ #include <sys/stat.h>
+ #include <linux/major.h>
+ #include "enh_options.h"
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <errno.h>
+
+ int eioctl(int fd, int command,void * param, char *emsg)
diff --git
a/disk/fdutils/patches/0001-Mark-lock_mtab-and-unlock_mtab-as-unit-local.patch

b/disk/fdutils/patches/0001-Mark-lock_mtab-and-unlock_mtab-as-unit-local.patch
new file mode 100644
index 0000000..67941d1
--- /dev/null
+++
b/disk/fdutils/patches/0001-Mark-lock_mtab-and-unlock_mtab-as-unit-local.patch
@@ -0,0 +1,33 @@
+From 49f7fe8ff8bf8017247d9ceb737a4673aeeb9ee2 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 01 Jul 2022 16:08:06 +0200
+Subject: [PATCH] Mark lock_mtab and unlock_mtab as unit-local
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Upstream-Status: Pending
+---
+ src/fdmount.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/fdmount.c b/src/fdmount.c
+index b2d1ea082f5e..095c51387d8c 100644
+--- a/src/fdmount.c
++++ b/src/fdmount.c
+@@ -357,7 +357,7 @@ void save_mtab() {
+ mtab_changed=0;
+ }
+
+-inline void lock_mtab() {
++static inline void lock_mtab() {
+ int fd;
+ if((fd = open(lock_filename, O_WRONLY | O_CREAT | O_EXCL, 0744)) < 0) {
+ die("Cannot create lock file %s: %s",lock_filename,strerror(errno));
+@@ -366,7 +366,7 @@ inline void lock_mtab() {
+ locked=1;
+ }
+
+-inline void unlock_mtab() {
++static inline void unlock_mtab() {
+ unlink(lock_filename);
+ locked=0;
+ }



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (baec351276b4f0584571c5c0c2fc1c0e169f973a), Ismael Luceno, 07/01/2022

Archive powered by MHonArc 2.6.24.

Top of Page