Skip to Content.
Sympa Menu

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

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 (25281b37f1baf0d32ebf75fa3208e6ccc420c9ba)
  • Date: Fri, 27 Aug 2021 14:01:30 +0000

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

crypto/scrypt/DEPENDS | 6 +-----
crypto/scrypt/HISTORY | 5 +++++
crypto/scrypt/PRE_BUILD | 7 ++++---
net/ifenslave/DETAILS | 2 +-
net/ifenslave/HISTORY | 4 ++++
net/ifenslave/INSTALL | 23 +++++++++++++----------
6 files changed, 28 insertions(+), 19 deletions(-)

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

scrypt: Fix build when getconf is unavailable

commit 73b850821cf9ebda1b168342709c7fa4fe35bf9a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

scrypt: Always apply patches

commit 852fd4e01c557afc3c58bbfdced6bed3b2dc4387
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

scrypt: Remove non-existing MESON_DEPENDS

commit 4ee714d2f64c2ca3d12cbfdf5dbb212efc63e81c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ifenslave: Fix installation; PATCHLEVEL++

diff --git a/crypto/scrypt/DEPENDS b/crypto/scrypt/DEPENDS
index f9b5aa6..0257272 100755
--- a/crypto/scrypt/DEPENDS
+++ b/crypto/scrypt/DEPENDS
@@ -1,7 +1,3 @@
depends SSL &&

-optional_depends meson "" "" "to build with meson" &&
-
-if is_depends_enabled ${SPELL} meson; then
- source "${GRIMOIRE}/MESON_DEPENDS"
-fi
+optional_depends meson "" "" "to build with meson"
diff --git a/crypto/scrypt/HISTORY b/crypto/scrypt/HISTORY
index c144e0c..c239c87 100644
--- a/crypto/scrypt/HISTORY
+++ b/crypto/scrypt/HISTORY
@@ -1,3 +1,8 @@
+2021-08-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: removed non-existing MESON_DEPENDS
+ * PRE_BUILD: made to always apply patches
+ fixed build when getconf isn't available
+
2021-08-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.1

diff --git a/crypto/scrypt/PRE_BUILD b/crypto/scrypt/PRE_BUILD
index c6cab93..130bf39 100755
--- a/crypto/scrypt/PRE_BUILD
+++ b/crypto/scrypt/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-
-if is_depends_enabled ${SPELL} meson; then
- apply_patch_dir patches
+apply_patch_dir patches &&
+# XXX fixup POSIX_PATH test if getconf is unavailable
+if ! command -pv getconf >/dev/null; then
+ sedit '/^\tPOSIX_PATH=/{s@=.*@=/bin:/usr/bin@}' configure
fi
diff --git a/net/ifenslave/DETAILS b/net/ifenslave/DETAILS
index 3ea7029..6f5a996 100755
--- a/net/ifenslave/DETAILS
+++ b/net/ifenslave/DETAILS
@@ -1,6 +1,6 @@
SPELL=ifenslave
VERSION=2.7
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:c93a0e3580a7d8cca5726751903e18047aa32961a01e1f6c1d61cba903f39c45b3de6848d342f39aae99e8359f28a1e1d8548203877fb63cd142d78514682e2c
SOURCE=${SPELL}_${VERSION}.tar.xz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}"/${SPELL}-${VERSION}
diff --git a/net/ifenslave/HISTORY b/net/ifenslave/HISTORY
index ca796ae..729943b 100644
--- a/net/ifenslave/HISTORY
+++ b/net/ifenslave/HISTORY
@@ -1,3 +1,7 @@
+2021-08-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * INSTALL: fixed installation
+
2021-08-01 Florian Franzmann <bwlf AT bandrate.org>
* DEPENDS: depend on IFUPDOWN instead of ifupdown
* DETAILS: PATCHLEVEL++
diff --git a/net/ifenslave/INSTALL b/net/ifenslave/INSTALL
index 4adbd5b..afcb79b 100755
--- a/net/ifenslave/INSTALL
+++ b/net/ifenslave/INSTALL
@@ -1,17 +1,20 @@
cd "${SOURCE_DIRECTORY}" &&

# install script
-install -o root -g root -m 0755 ifenslave "${INSTALL_ROOT}"/sbin/ifenslave
&&
-install -o root -g root -m 0755 debian/ifenslave.if-post-down
"${INSTALL_ROOT}"/etc/network/if-post-down.d/ifenslave &&
-install -o root -g root -m 0755 debian/ifenslave.if-pre-up
"${INSTALL_ROOT}"/etc/network/if-pre-up.d/ifenslave &&
-install -o root -g root -m 0755 debian/ifenslave.if-up
"${INSTALL_ROOT}"/etc/network/if-up.d/ifenslave &&
+install -m555 ifenslave "${INSTALL_ROOT}"/sbin/ifenslave &&
+for i in if-post-down if-pre-up if-up; do
+ dest="$INSTALL_ROOT/etc/network/$i.d" &&
+ install -d "$dest" &&
+ install -m755 debian/ifenslave."$i" "$dest"/ifenslave || exit 1
+done &&

# install the man pages to smart places
-cp debian/*.8.gz "${INSTALL_ROOT}"/usr/share/man/man8/. &&
+mandir="$INSTALL_ROOT/usr/share/man" &&
+install -d "$mandir"/man8 &&
+install -m444 debian/*.8.gz "$mandir"/man8/ &&

# install the documentation type things
-mkdir -p "${INSTALL_ROOT}"/usr/share/doc/${SPELL} &&
-cp -va debian/examples "${INSTALL_ROOT}"/usr/share/doc/${SPELL}/. &&
-for docs in README.Debian changelog copyright; do
- install -o root -g root -m 0644 debian/${docs}
"${INSTALL_ROOT}"/usr/share/doc/${SPELL}/${docs}
-done
+docdir="$INSTALL_ROOT/usr/share/doc/$SPELL-$VERSION" &&
+install -d "$docdir/examples" &&
+install -m444 debian/examples/* "$docdir/examples/" &&
+install -m444 debian/README.Debian debian/changelog debian/copyright
"$docdir/"



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (25281b37f1baf0d32ebf75fa3208e6ccc420c9ba), Ismael Luceno, 08/27/2021

Archive powered by MHonArc 2.6.24.

Top of Page