Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ec0ef9d1d42ae91a66004e0ec93136de20661cfb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ec0ef9d1d42ae91a66004e0ec93136de20661cfb)
  • Date: Tue, 14 Nov 2023 15:42:36 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

utils/installwatch/HISTORY | 3 +++
utils/installwatch/PRE_BUILD | 1 +
utils/installwatch/patches/0001-fixutimensat.patch | 11 +++++++++++
3 files changed, 15 insertions(+)

New commits:
commit ec0ef9d1d42ae91a66004e0ec93136de20661cfb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

installwatch: udpate to 0.9.1 and fix utimensat() wrapper

It used the wrong path resolution, not relative to indicated
directory, resulting in cp -a and friends working on the
source file (or non-existing file in the working directory)
instead of the target. That broke libmnl install, wich features
man page symlinks.

diff --git a/utils/installwatch/HISTORY b/utils/installwatch/HISTORY
index 67bb286..3b0ffbc 100644
--- a/utils/installwatch/HISTORY
+++ b/utils/installwatch/HISTORY
@@ -1,5 +1,8 @@
2023-11-14 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 0.9.1
+ * patches/0001-fixutimensat.patch: fix libmnl (and others?)
+ install by making utimensat() really relative to the
+ indicated directory

2022-09-01 Conner Clere <connerclere AT gmail.com>
* DETAILS: switch over to Lunar's version of installwatch, release
0.9.0
diff --git a/utils/installwatch/PRE_BUILD b/utils/installwatch/PRE_BUILD
index 2379fa5..127cab3 100755
--- a/utils/installwatch/PRE_BUILD
+++ b/utils/installwatch/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches &&

# due to the compatibility with stable sorcery
sed -i "s,INSTW_LOGFILE,INSTALLWATCHFILE,g" installwatch* &&
diff --git a/utils/installwatch/patches/0001-fixutimensat.patch
b/utils/installwatch/patches/0001-fixutimensat.patch
new file mode 100644
index 0000000..f0cdb20
--- /dev/null
+++ b/utils/installwatch/patches/0001-fixutimensat.patch
@@ -0,0 +1,11 @@
+--- installwatch-0.9.1/installwatch.c.orig 2023-11-14 15:41:12.481830631
+0100
++++ installwatch-0.9.1/installwatch.c 2023-11-14 16:34:43.428532947 +0100
+@@ -3463,7 +3463,7 @@
+ }
+
+ instw_new(&instw);
+- instw_setpath(&instw, pathname);
++ instw_setpathrel(&instw, dirfd, pathname);
+
+ #if DEBUG
+ instw_print(&instw);



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ec0ef9d1d42ae91a66004e0ec93136de20661cfb), Thomas Orgis, 11/14/2023

Archive powered by MHonArc 2.6.24.

Top of Page