Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (28cb12f0c4a7c246afd8853fb2ab6b6bd88d3c99)
  • Date: Mon, 19 Jul 2021 20:02:48 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

crypto/libssh2/HISTORY | 5 +++
crypto/libssh2/PRE_BUILD | 2 +
crypto/libssh2/willco007-undefine.patch | 50
++++++++++++++++++++++++++++++++
net/samba4/HISTORY | 5 ++-
net/samba4/INSTALL | 4 +-
5 files changed, 63 insertions(+), 3 deletions(-)

New commits:
commit 28cb12f0c4a7c246afd8853fb2ab6b6bd88d3c99
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

samba4: Don't continue later steps if earlier steps failed

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

libssh2: Fix configure.ac for newer autoconf versions

willco007-undefine.patch from https://github.com/libssh2/libssh2/pull/594

diff --git a/crypto/libssh2/HISTORY b/crypto/libssh2/HISTORY
index 9a5e1ba..7234cbe 100644
--- a/crypto/libssh2/HISTORY
+++ b/crypto/libssh2/HISTORY
@@ -1,3 +1,8 @@
+2021-07-19 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply willco007-undefine.patch
+ Fixes configure.ac for newer autoconf versions
+ * willco007-undefine.patch: From
https://github.com/libssh2/libssh2/pull/594
+
2019-06-20 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 1.9.0
* PRE_BUILD, libssh2-1.8.0-libgcrypt-prefix.patch: remove obsolete
patch
diff --git a/crypto/libssh2/PRE_BUILD b/crypto/libssh2/PRE_BUILD
index 607c6eb..9073f26 100755
--- a/crypto/libssh2/PRE_BUILD
+++ b/crypto/libssh2/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+message "${MESSAGE_COLOR}Fixing configure.ac for newer
autoconf...${DEFAULT_COLOR}" &&
+patch -p1 < "${SCRIPT_DIRECTORY}/willco007-undefine.patch" &&

autoreconf -fi

diff --git a/crypto/libssh2/willco007-undefine.patch
b/crypto/libssh2/willco007-undefine.patch
new file mode 100644
index 0000000..9e938e4
--- /dev/null
+++ b/crypto/libssh2/willco007-undefine.patch
@@ -0,0 +1,50 @@
+# From
https://github.com/libssh2/libssh2/commit/35ac220a4436df4ce50e990a02721369c9779ea9
+From 35ac220a4436df4ce50e990a02721369c9779ea9 Mon Sep 17 00:00:00 2001
+From: Will Cosgrove <will AT panic.com>
+Date: Wed, 26 May 2021 16:42:38 -0700
+Subject: [PATCH] configure.ac: don't undefine scoped variable (#594)
+
+* configure.ac: don't undefine scoped variable
+
+To get this script to run with Autoconf 2.71 on macOS I had to remove the
undefine of the backend for loop variable. It seems scoped to the for loop
and also isn't referenced later in the script so it seems OK to remove it.
+
+* configure.ac: remove cygwin specific CFLAGS #598
+
+Notes:
+Remove cygwin specific Win32 CFLAGS and treat the build like a posix build
+
+Credit:
+Will Cosgrove, Brian Inglis
+---
+ configure.ac | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c9696eccac..c4fc3e4e30 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,12 +36,9 @@ case "$host" in
+ CFLAGS="$CFLAGS -DLIBSSH2_WIN32"
+ LIBS="$LIBS -lws2_32"
+ ;;
+- *-cygwin)
+- CFLAGS="$CFLAGS -DLIBSSH2_WIN32"
++ *darwin*)
++ CFLAGS="$CFLAGS -DLIBSSH2_DARWIN"
+ ;;
+- *darwin*)
+- CFLAGS="$CFLAGS -DLIBSSH2_DARWIN"
+- ;;
+ *hpux*)
+ ;;
+ *osf*)
+@@ -128,8 +125,6 @@ fi
+ m4_set_foreach([crypto_backends], [backend],
+ [AM_CONDITIONAL(m4_toupper(backend), test "$found_crypto" = "backend")]
+ )
+-m4_undefine([backend])
+-
+
+ # libz
+
+
diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY
index 855a114..e86b570 100644
--- a/net/samba4/HISTORY
+++ b/net/samba4/HISTORY
@@ -1,4 +1,7 @@
-2021-07-21 Eric Sandall <sandalle AT sourcemage.org>
+2021-07-14 Eric Sandall <sandalle AT sourcemage.org>
+ * INSTALL: Don't continue later steps if earlier steps failed
+
+2021-07-13 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.14.6

2021-07-03 Thomas Orgis <sobukus AT sourcemage.org>
diff --git a/net/samba4/INSTALL b/net/samba4/INSTALL
index 4b43221..bc2b509 100755
--- a/net/samba4/INSTALL
+++ b/net/samba4/INSTALL
@@ -10,7 +10,7 @@ mkdir -m 700 -p $INSTALL_ROOT/etc/samba/private &&
if [[ ! -f $INSTALL_ROOT/etc/samba/private/smbpasswd ]]; then
touch $INSTALL_ROOT/etc/samba/private/smbpasswd &&
chmod 600 $INSTALL_ROOT/etc/samba/private/smbpasswd
-fi
+fi &&

#
# Install libwinbind if it exists
@@ -48,6 +48,6 @@ fi

if [[ -h $INSTALL_ROOT/usr/include/samba ]]; then
rm -f $INSTALL_ROOT/usr/include/samba
-fi
+fi &&

ln -sf /usr/include/samba-4.0/samba $INSTALL_ROOT/usr/include/samba



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (28cb12f0c4a7c246afd8853fb2ab6b6bd88d3c99), Eric Sandall, 07/19/2021

Archive powered by MHonArc 2.6.24.

Top of Page