sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0e3d508bf3da259640021747e9945de61606260a)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0e3d508bf3da259640021747e9945de61606260a)
Date: Mon, 18 Dec 2017 20:02:56 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/cifs-utils/BUILD | 29 ++++------------
net/cifs-utils/CONFIGURE | 81
++++++++++++++++++++++++++++++++++++++---------
net/cifs-utils/DEPENDS | 40 +++++++++++++++++------
net/cifs-utils/HISTORY | 6 +++
4 files changed, 110 insertions(+), 46 deletions(-)

New commits:
commit 0e3d508bf3da259640021747e9945de61606260a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cifs-utils: post-update fixes

diff --git a/net/cifs-utils/BUILD b/net/cifs-utils/BUILD
index 30a65dd..33a36c6 100755
--- a/net/cifs-utils/BUILD
+++ b/net/cifs-utils/BUILD
@@ -1,25 +1,12 @@
-if [[ "$CIFS_UPCALL" == "y" ]]; then
- OPTS="$OPTS --enable-cifsupcall"
-else
- OPTS="$OPTS --disable-cifsupcall"
-fi &&
+# requires wbclient.h from samba/libwbclient
+for opt in "--enable-cifsidmap" "--enable-cifsacl"; do
+ if list_find "$CIFS_UTILS_OPTS" "$opt"; then
+ message "${PROBLEM_COLOR}WARNING: option
${QUERY_COLOR}'$opt'${PROBLEM_COLOR} requires a non-existent spell, disabling
it...${DEFAULT_COLOR}" &&

-if [[ "$CIFS_CREDS" == "y" ]]; then
- OPTS="$OPTS --enable-cifscreds"
-else
- OPTS="$OPTS --disable-cifscreds"
-fi &&
+ list_remove CIFS_UTILS_OPTS "$opt"
+ fi
+done &&

-if [[ "$CIFS_IDMAP" == "y" ]]; then
- OPTS="$OPTS --enable-cifsidmap"
-else
- OPTS="$OPTS --disable-cifsidmap"
-fi &&
-
-if [[ "$CIFS_ACL" == "y" ]]; then
- OPTS="$OPTS --enable-cifsacl"
-else
- OPTS="$OPTS --disable-cifsacl"
-fi &&
+OPTS="${CIFS_UTILS_OPTS} ${OPTS}" &&

default_build
diff --git a/net/cifs-utils/CONFIGURE b/net/cifs-utils/CONFIGURE
index bd48272..7b35ece 100755
--- a/net/cifs-utils/CONFIGURE
+++ b/net/cifs-utils/CONFIGURE
@@ -1,15 +1,66 @@
-if spell_ok krb5; then
- config_query CIFS_UPCALL "Enable cifs.upcall utility ?" y
-else
- config_query CIFS_UPCALL "Enable cifs.upcall utility ?" n
-fi &&
-
-if spell_ok keyutils; then
- config_query CIFS_CREDS "Enable cifscreds utility ?" y &&
- config_query CIFS_IDMAP "Enable cifs.idmap utility ?" y &&
- config_query CIFS_ACL "Enable cifsacl utility ?" y
-else
- config_query CIFS_CREDS "Enable cifscreds utility ?" n &&
- config_query CIFS_IDMAP "Enable cifs.idmap utility ?" n &&
- config_query CIFS_ACL "Enable cifsacl utility ?" n
-fi
+persistent_add CIFS_UTILS_OPTS &&
+
+# backporting legacy options
+if [ -n "$CIFS_UPCALL" ]; then
+ if [ "$CIFS_UPCALL" == y ]; then
+ local opt="--enable-cifsupcall"
+ else
+ local opt="--disable-cifsupcall"
+ fi
+
+ list_add CIFS_UTILS_OPTS "$opt" &&
+
+ persistent_remove CIFS_UPCALL
+fi &&
+
+if [ -n "$CIFS_CREDS" ]; then
+ if [ "$CIFS_CREDS" == y ]; then
+ local opt="--enable-cifscreds"
+ else
+ local opt="--disable-cifscreds"
+ fi
+
+ list_add CIFS_UTILS_OPTS "$opt" &&
+
+ persistent_remove CIFS_CREDS
+fi &&
+
+if [ -n "$CIFS_IDMAP" ]; then
+ if [ "$CIFS_IDMAP" == y ]; then
+ local opt="--enable-cifsidmap"
+ else
+ local opt="--disable-cifsidmap"
+ fi
+
+ list_add CIFS_UTILS_OPTS "$opt" &&
+
+ persistent_remove CIFS_IDMAP
+fi &&
+
+if [ -n "$CIFS_ACL" ]; then
+ if [ "$CIFS_ACL" == y ]; then
+ local opt="--enable-cifsacl"
+ else
+ local opt="--disable-cifsacl"
+ fi
+
+ list_add CIFS_UTILS_OPTS "$opt" &&
+
+ persistent_remove CIFS_ACL
+fi &&
+
+config_query_option CIFS_UTILS_OPTS "Enable cifs.upcall utility (requires
${SPELL_COLOR}krb5${QUERY_COLOR})?" y \
+ "--enable-cifsupcall" \
+ "--disable-cifsupcall" &&
+
+config_query_option CIFS_UTILS_OPTS "Enable cifscreds utility?" y \
+ "--enable-cifscreds" \
+ "--disable-cifscreds" &&
+
+config_query_option CIFS_UTILS_OPTS "Enable cifs.idmap utility?" y \
+ "--enable-cifsidmap" \
+ "--disable-cifsidmap" &&
+
+config_query_option CIFS_UTILS_OPTS "Enable cifsacl utility?" y \
+ "--enable-cifsacl" \
+ "--disable-cifsacl"
diff --git a/net/cifs-utils/DEPENDS b/net/cifs-utils/DEPENDS
index c1b4205..0c847e2 100755
--- a/net/cifs-utils/DEPENDS
+++ b/net/cifs-utils/DEPENDS
@@ -1,15 +1,35 @@
depends autoconf &&
-depends keyutils &&
+
+#optional_depends libcap-ng \
+# "--with-libcap-ng" \
+# "--without-libcap-ng" \
+# "for libcap-ng support" &&
+
+#if ! is_depends_enabled ${SPELL} libcap-ng; then
+ optional_depends libcap \
+ "--with-libcap" \
+ "--without-libcap" \
+ "for libcap support"
+#fi &&
+
optional_depends systemd \
- "--enable-systemd" \
- "--disable-systemd" \
- "for systemd specific behavior for mount.cifs" &&
+ "--enable-systemd" \
+ "--disable-systemd" \
+ "for systemd specific behavior for mount.cifs" &&
+
optional_depends LINUX-PAM-HEADERS \
- "--enable-pam" \
- "--disable-pam" \
- "for cifscreds PAM module" &&
+ "--enable-pam" \
+ "--disable-pam" \
+ "for cifscreds PAM module" &&

-if [[ "$CIFS_UPCALL" == "y" ]]; then
- depends krb5
-fi
+if list_find "$CIFS_UTILS_OPTS" "--enable-cifsupcall"; then
+ depends krb5 &&
+ depends talloc
+fi &&

+if list_find "$CIFS_UTILS_OPTS" "--enable-cifsupcall" || \
+ list_find "$CIFS_UTILS_OPTS" "--enable-cifsidmap" || \
+ list_find "$CIFS_UTILS_OPTS" "--enable-cifscreds" || \
+ is_depends_enabled ${SPELL} $(get_spell_provider $SPELL
LINUX-PAM-HEADERS); then
+ depends keyutils
+fi
diff --git a/net/cifs-utils/HISTORY b/net/cifs-utils/HISTORY
index abba254..5358801 100644
--- a/net/cifs-utils/HISTORY
+++ b/net/cifs-utils/HISTORY
@@ -1,3 +1,9 @@
+2017-12-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing libcap[-ng] optional dependency; added
missing
+ talloc required dependency
+ * CONFIGURE, BUILD: moved to CIFS_UTILS_OPTS
+ * DEPENDS: rewritten
+
2017-05-31 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 6.7
* PRE_BUILD: added for build fix

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0e3d508bf3da259640021747e9945de61606260a), Vlad Glagolev, 12/18/2017