Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (9cf756d84b91d8f93643545753845c568e09a320)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (9cf756d84b91d8f93643545753845c568e09a320)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (9cf756d84b91d8f93643545753845c568e09a320)
  • Date: Wed, 29 Jul 2020 19:43:07 +0000
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null |binary
devel/make/HISTORY | 9 +++++++++
devel/make/INSTALL | 3 ++-
disk/fuse/DETAILS | 4 ++--
disk/fuse/HISTORY | 6 ++++++
disk/fuse/PRE_BUILD | 7 +------
disk/fuse/init.patch | 11 -----------
editors/sed/HISTORY | 3 +++
editors/sed/INSTALL | 14 +++++++-------
smgl/castfs/DETAILS | 1 +
smgl/castfs/HISTORY | 3 +++
smgl/smgl-fhs/DETAILS | 1 +
smgl/smgl-fhs/HISTORY | 4 ++++
utils/coreutils/DETAILS | 1 +
utils/coreutils/HISTORY | 4 ++++
utils/libguestfs/DETAILS | 2 +-
utils/libguestfs/HISTORY | 3 +++
utils/memconf/DETAILS | 6 +++---
utils/memconf/HISTORY | 5 +++++
utils/memconf/INSTALL | 2 +-
utils/memconf/memconf.v3.15.pl.gz.sig |binary
utils/rhash/HISTORY | 3 +++
utils/rhash/INSTALL | 1 +
23 files changed, 61 insertions(+), 32 deletions(-)

New commits:
commit 2d8c6c94ce08aac8fc4aae52cf99d0f2dae70ef6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

smgl-fhs: Disable staged install (castfs), breaks with already existing
files under /var/

commit e000167757130130444edbba4e151b8e41f41325
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

memconf: Updated to 3.15

commit b09a08dbf9d51582e4a843bcc86d8fdcc51f25c6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

rhash: Use make_single, fails with parallel make

commit 6d489571253668990cf82be42a0d8ebaa6cc4340
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libguestfs: Updated to 1.40.2

commit 096797d350844f1dd48afacc65dfd576724ae5fd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

make: Make symlink in SOURCE_DIRECTORY then copy and preserve

Otherwise recasts without castfs break with /usr/bin/gmake already
existing.
Sorcery doesn't seem to track symlinks (made via ln) anymore, so the file
isn't removed first.
Doing an `ln -sf ...` lets the spell cast, but then /usr/bin/gmake isn't
tracked as coming from make.

commit 2604b65d7c03884364b1acc218dc910982c02a09
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

coreutils: Disabled castfs (STAGED_INSTALL), breaks when core files
(e.g. touch and mkdir) are removed.

commit 14ca6d15f48f72926a19b8271102a355c4d5a85d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

fuse: 2.9.9 refresh now prefixes libfuse- to extracted directory

SOURCE_HASH refreshed
2.9.9 needs makeconf.sh now, patch unneeded
init.patch removed, no longer needed

commit 215e806a32e7400cfaf284a2186a042d65ac606d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sed: Switch to install from cp for /bin/sed to work with castfs on
repeated casts

commit b1d9ef10dd38988eea4f7e624da72f4a9a1fc5a8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

castfs: Disabled castfs (STAGED_INSTALL) otherwise every other cast fails
on install.

diff --git a/devel/make/HISTORY b/devel/make/HISTORY
index 36e66ce..a9e0814 100644
--- a/devel/make/HISTORY
+++ b/devel/make/HISTORY
@@ -1,3 +1,12 @@
+2020-07-28 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Make symlink in SOURCE_DIRECTORY then copy and preserve
+ Otherwise recasts without castfs break with /usr/bin/gmake already
+ existing.
+ Sorcery doesn't seem to track symlinks (made via ln) anymore, so
the file
+ isn't removed first.
+ Doing an `ln -sf ...` lets the spell cast, but then /usr/bin/gmake
isn't
+ tracked as coming from make.
+
2020-01-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3
* PRE_BUILD patches/*: deleted
diff --git a/devel/make/INSTALL b/devel/make/INSTALL
index 23b4300..0300adf 100755
--- a/devel/make/INSTALL
+++ b/devel/make/INSTALL
@@ -1,3 +1,4 @@
make install DESTDIR=$INSTALL_ROOT &&
-ln -s make ${INSTALL_ROOT}/usr/bin/gmake &&
+ln -s make gmake &&
+cp -a gmake ${INSTALL_ROOT}/usr/bin/gmake &&
chmod a-s ${INSTALL_ROOT}/usr/bin/make
diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index e1ebc9f..e3b3337 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -2,10 +2,10 @@
SPELL=fuse
if [ "$FUSE_BRANCH" != "scm" ]; then
VERSION=2.9.9
-
SOURCE_HASH=sha512:3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
+
SOURCE_HASH=sha512:1acd51a647ec3dbf9eaafb80cec92bd8542bcbb2cf4510fc8b079b4f8aaa8f4b301e469ddefe4f1cc4ae2bf941e028077601c20d97f187cc618cea8710cbe331:WORKS_FOR_ME
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=https://github.com/libfuse/libfuse/releases/download/${SPELL}-$VERSION/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/libfuse-$SPELL-$VERSION
else
VERSION=$(get_scm_version)
SOURCE=$SPELL-git.tar.bz2
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 4ddb627..1b2fb52 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,9 @@
+2020-07-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: 2.9.9 now prefixes libfuse- to extracted directory
+ SOURCE_HASH refreshed
+ * PRE_BUILD: 2.9.9 needs makeconf.sh now, patch unneeded
+ * init.patch: No longer needed
+
2019-01-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.9.9

diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index 0545e39..ea59239 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -5,9 +5,4 @@ cd "$SOURCE_DIRECTORY" &&
# glibc-2.14 fix
sed -i "/sched/s|<|<linux/|" util/fusermount.c &&

-if [ "$FUSE_BRANCH" != "scm" ]; then
- # prevent installing fuse initscript into the wrong place
- patch -p0 < "$SPELL_DIRECTORY/init.patch"
-else
- ./makeconf.sh
-fi
+./makeconf.sh
diff --git a/disk/fuse/init.patch b/disk/fuse/init.patch
deleted file mode 100644
index 7846a18..0000000
--- a/disk/fuse/init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/Makefile.in.orig 2012-07-19 16:53:28.000000000 +0400
-+++ util/Makefile.in 2012-08-05 15:32:53.820922057 +0400
-@@ -650,8 +650,6 @@
- install-exec-local:
- $(MKDIR_P) $(DESTDIR)$(MOUNT_FUSE_PATH)
- $(INSTALL_PROGRAM) $(builddir)/mount.fuse
$(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
-- $(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
-- $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
- @if test -x /usr/sbin/update-rc.d; then \
- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 .
|| true"; \
- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . ||
true; \
diff --git a/editors/sed/HISTORY b/editors/sed/HISTORY
index e83745b..fd15963 100644
--- a/editors/sed/HISTORY
+++ b/editors/sed/HISTORY
@@ -1,3 +1,6 @@
+2020-07-18 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Switch to install from cp for /bin/sed to work with castfs
on repeated casts
+
2020-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.8

diff --git a/editors/sed/INSTALL b/editors/sed/INSTALL
index 4018c66..117bb7b 100755
--- a/editors/sed/INSTALL
+++ b/editors/sed/INSTALL
@@ -1,7 +1,7 @@
- make install DESTDIR=$INSTALL_ROOT &&
- ### /bin/sed is "protected" but it is from an "old" install
- ### just incase it has been removed I copy it first
- ### so the cast will complete.
- if [ -f ${INSTALL_ROOT}/usr/bin/sed ] ; then
- cp -a ${INSTALL_ROOT}/usr/bin/sed $INSTALL_ROOT/bin/sed
- fi
+make install DESTDIR=$INSTALL_ROOT &&
+### /bin/sed is "protected" but it is from an "old" install
+### just incase it has been removed I copy it first
+### so the cast will complete.
+if [ -f ${INSTALL_ROOT}/usr/bin/sed ] ; then
+ install -m 0755 sed/sed $INSTALL_ROOT/bin/sed
+fi
diff --git a/smgl/castfs/DETAILS b/smgl/castfs/DETAILS
index 11c01a9..766a3e8 100755
--- a/smgl/castfs/DETAILS
+++ b/smgl/castfs/DETAILS
@@ -1,5 +1,6 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=castfs
+ STAGED_INSTALL=off
if [[ $CASTFS_BRANCH == scm ]]; then
VERSION=$(get_scm_version)
SOURCE=${SPELL}-git.tar.bz2
diff --git a/smgl/castfs/HISTORY b/smgl/castfs/HISTORY
index c028370..7bb9b6d 100644
--- a/smgl/castfs/HISTORY
+++ b/smgl/castfs/HISTORY
@@ -1,3 +1,6 @@
+2020-07-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Disabled castfs (STAGED_INSTALL) otherwise every other
cast fails on install.
+
2020-07-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, 0001-Fix-linker-error-due-to-global-symbols.patch:
fix linking error, uncovered by gcc 10
diff --git a/smgl/smgl-fhs/DETAILS b/smgl/smgl-fhs/DETAILS
index 96d1000..682adb0 100755
--- a/smgl/smgl-fhs/DETAILS
+++ b/smgl/smgl-fhs/DETAILS
@@ -2,6 +2,7 @@
VERSION=2.2.2
WEB_SITE=http://www.pathname.com/fhs/2.2/
ENTERED=20050513
+ STAGED_INSTALL="off"
GATHER_DOCS="off"
LICENSE[0]="GPL"
KEYWORDS="filesystem smgl"
diff --git a/smgl/smgl-fhs/HISTORY b/smgl/smgl-fhs/HISTORY
index 5162dd3..b1e3a52 100644
--- a/smgl/smgl-fhs/HISTORY
+++ b/smgl/smgl-fhs/HISTORY
@@ -1,3 +1,7 @@
+2020-07-28 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Disable staged install (castfs), breaks with already
existing
+ files under /var/ .
+
2009-11-26 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: Remove now trailing &&

diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index c2cacfd..83c5195 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -6,6 +6,7 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sig
+ STAGED_INSTALL=off
# SOURCE_GPG=gnu-verified.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index e74ca6c..3aca81e 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,7 @@
+2020-07-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Disabled castfs (STAGED_INSTALL), breaks
+ when core files (e.g. touch and mkdir) are removed.
+
2020-07-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* protected, REPAIR^none^protected: protect files used by sorcery

diff --git a/utils/libguestfs/DETAILS b/utils/libguestfs/DETAILS
index 84b1820..1e0948d 100755
--- a/utils/libguestfs/DETAILS
+++ b/utils/libguestfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=libguestfs
- VERSION=1.38.6
+ VERSION=1.40.2
BRANCH="$(echo ${VERSION} | cut -d. -f1,2)"
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2="${SOURCE}.sig"
diff --git a/utils/libguestfs/HISTORY b/utils/libguestfs/HISTORY
index 24fc8ad..5b658a0 100644
--- a/utils/libguestfs/HISTORY
+++ b/utils/libguestfs/HISTORY
@@ -1,3 +1,6 @@
+2020-07-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.40.2
+
2019-08-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.38.6, now compiles with current libraries
* DEPENDS: Depends on hivex (new spell)
diff --git a/utils/memconf/DETAILS b/utils/memconf/DETAILS
index 6dce6fd..408ac84 100755
--- a/utils/memconf/DETAILS
+++ b/utils/memconf/DETAILS
@@ -1,6 +1,6 @@
SPELL=memconf
- VERSION=3.09
- SOURCE=${SPELL}-v${VERSION}.pl.gz
+ VERSION=3.15
+ SOURCE=${SPELL}.v${VERSION}.pl.gz
SOURCE2=$SPELL.man
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]="${SOURCEFORGE_URL}"/${SPELL}/V${VERSION}/${SOURCE}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_URL[0]="${SOURCEFORGE_URL}"/${SPELL}/V${VERSION}/${SOURCE2}
SOURCE2_IGNORE=unversioned
LICENSE[0]=GPL
- WEB_SITE=http://myweb.cableone.net/4schmidts/memconf.html
+ WEB_SITE=https://sourceforge.net/projects/memconf/
KEYWORDS="utils"
ENTERED=20080114
SHORT="memory module reporting script"
diff --git a/utils/memconf/HISTORY b/utils/memconf/HISTORY
index f22979c..008e356 100644
--- a/utils/memconf/HISTORY
+++ b/utils/memconf/HISTORY
@@ -1,3 +1,8 @@
+2020-07-28 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.15
+ Change WEB_SITE to SourceForge, old link is dead.
+ * INSTALL: man page file name changed
+
2015-12-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 3.09
Switch SOURCE to SOURCEFORGE_URL and versioned.
diff --git a/utils/memconf/INSTALL b/utils/memconf/INSTALL
index b9e4ea3..b6a7d74 100755
--- a/utils/memconf/INSTALL
+++ b/utils/memconf/INSTALL
@@ -1,3 +1,3 @@
-install -m 0755 memconf-v${VERSION}.pl $INSTALL_ROOT/usr/sbin/memconf &&
+install -m 0755 memconf.v${VERSION}.pl $INSTALL_ROOT/usr/sbin/memconf &&
install -m 0644 $SOURCE_CACHE/$SOURCE2 \
$INSTALL_ROOT/usr/share/man/man1/memconf.1
diff --git a/utils/memconf/memconf-v3.09.pl.gz.sig
b/utils/memconf/memconf-v3.09.pl.gz.sig
deleted file mode 100644
index 76d38ae..0000000
Binary files a/utils/memconf/memconf-v3.09.pl.gz.sig and /dev/null differ
diff --git a/utils/memconf/memconf.v3.15.pl.gz.sig
b/utils/memconf/memconf.v3.15.pl.gz.sig
new file mode 100644
index 0000000..ff9386f
Binary files /dev/null and b/utils/memconf/memconf.v3.15.pl.gz.sig differ
diff --git a/utils/rhash/HISTORY b/utils/rhash/HISTORY
index 8641516..1d3008e 100644
--- a/utils/rhash/HISTORY
+++ b/utils/rhash/HISTORY
@@ -1,3 +1,6 @@
+2020-07-28 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Use make_single, fails with parallel make
+
2020-01-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.3.9

diff --git a/utils/rhash/INSTALL b/utils/rhash/INSTALL
index 3725300..4592477 100755
--- a/utils/rhash/INSTALL
+++ b/utils/rhash/INSTALL
@@ -1,2 +1,3 @@
+make_single &&
default_install &&
make PREFIX="${INSTALL_ROOT}"/usr install-lib-so-link install-lib-headers


  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (9cf756d84b91d8f93643545753845c568e09a320), Eric Sandall, 07/29/2020

Archive powered by MHonArc 2.6.24.

Top of Page