summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien ROZO2011-12-19 10:40:57 +0100
committerJulien ROZO2011-12-19 10:40:57 +0100
commit8e71bea7c70f419315c3a9eecba965bbab69d130 (patch)
tree6ccb48d8a7604d867b37078be1df9ecadb06b44f
parentf1ea5cc0184e7c68c168ff0c2766a1767e2d075a (diff)
cifs-utils: added the possibility to enable/disable cifsacl, which needs
keyutils to be built
-rwxr-xr-xnet/cifs-utils/BUILD6
-rwxr-xr-xnet/cifs-utils/CONFIGURE6
-rwxr-xr-xnet/cifs-utils/DEPENDS2
-rw-r--r--net/cifs-utils/HISTORY6
4 files changed, 16 insertions, 4 deletions
diff --git a/net/cifs-utils/BUILD b/net/cifs-utils/BUILD
index 2479140b40..30a65dd52f 100755
--- a/net/cifs-utils/BUILD
+++ b/net/cifs-utils/BUILD
@@ -16,4 +16,10 @@ else
OPTS="$OPTS --disable-cifsidmap"
fi &&
+if [[ "$CIFS_ACL" == "y" ]]; then
+ OPTS="$OPTS --enable-cifsacl"
+else
+ OPTS="$OPTS --disable-cifsacl"
+fi &&
+
default_build
diff --git a/net/cifs-utils/CONFIGURE b/net/cifs-utils/CONFIGURE
index 4e54023a44..bd48272daf 100755
--- a/net/cifs-utils/CONFIGURE
+++ b/net/cifs-utils/CONFIGURE
@@ -6,8 +6,10 @@ 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_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_IDMAP "Enable cifs.idmap utility ?" n &&
+ config_query CIFS_ACL "Enable cifsacl utility ?" n
fi
diff --git a/net/cifs-utils/DEPENDS b/net/cifs-utils/DEPENDS
index 841fd0bec3..1cb626c788 100755
--- a/net/cifs-utils/DEPENDS
+++ b/net/cifs-utils/DEPENDS
@@ -2,6 +2,6 @@ if [[ "$CIFS_UPCALL" == "y" ]]; then
depends krb5
fi &&
-if [[ "$CIFS_CREDS" == "y" || "$CIFS_IDMAP" == "y" ]]; then
+if [[ "$CIFS_CREDS" == "y" || "$CIFS_IDMAP" == "y" || "$CIFS_ACL" == "y" ]]; then
depends keyutils
fi
diff --git a/net/cifs-utils/HISTORY b/net/cifs-utils/HISTORY
index 998e4f1594..cab9e44ac6 100644
--- a/net/cifs-utils/HISTORY
+++ b/net/cifs-utils/HISTORY
@@ -1,6 +1,10 @@
+2011-12-19 Julien "_kaze_" ROZO <julien@rozo.org>
+ * CONFIGURE, DEPENDS, BUILD: added the possibility to enable/disable
+ cifsacl, which depends on keyutils to be built
+
2011-10-25 Tommy Boatman <tboatman@sourcemage.org>
* DETAILS: version 5.1
-2011-09-05 Julien _kaze_ ROZO <julien@rozo.org>
+2011-09-05 Julien "_kaze_" ROZO <julien@rozo.org>
* DETAILS, BUILD, CONFIGURE, DEPENDS, HISTORY: spell created