summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Tom Briden <tom@decompile.me.uk> 2018-06-30 09:13:56 +0100
committerAvatar Tom Briden <tom@decompile.me.uk> 2018-07-04 21:33:15 +0100
commitf2e96c82856ff6165353a381d85c13b01fb70ec6 (patch)
tree849e22990bc6873e28d65465b22e213060617a77
parent3bd315a14cbb1f1f29f2c9963aa928f598718459 (diff)
downloadnet-f2e96c82856ff6165353a381d85c13b01fb70ec6.tar.gz
net-f2e96c82856ff6165353a381d85c13b01fb70ec6.tar.xz
cifs-utils: version bump to 6.8
-rw-r--r--packages/net-fs/cifs-utils/cifs-utils-6.7.exheres-012
-rw-r--r--packages/net-fs/cifs-utils/cifs-utils-6.8.exheres-07
-rw-r--r--packages/net-fs/cifs-utils/cifs-utils.exlib18
-rw-r--r--packages/net-fs/cifs-utils/files/cifs-utils-6.7_data_blob.patch16
4 files changed, 25 insertions, 28 deletions
diff --git a/packages/net-fs/cifs-utils/cifs-utils-6.7.exheres-0 b/packages/net-fs/cifs-utils/cifs-utils-6.7.exheres-0
deleted file mode 100644
index 0f17abb..0000000
--- a/packages/net-fs/cifs-utils/cifs-utils-6.7.exheres-0
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011 Elias Pipping <pipping@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require cifs-utils
-
-# configure: error: cannot find install-sh, install.sh, or shtool in "." "./.." "./../.."
-# last checked: 6.7
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-
-PLATFORMS="~amd64 ~x86"
-
-DEFAULT_SRC_PREPARE_PATCHES=( -p0 "${FILES}"/${PNV}_data_blob.patch )
diff --git a/packages/net-fs/cifs-utils/cifs-utils-6.8.exheres-0 b/packages/net-fs/cifs-utils/cifs-utils-6.8.exheres-0
new file mode 100644
index 0000000..64bcf5b
--- /dev/null
+++ b/packages/net-fs/cifs-utils/cifs-utils-6.8.exheres-0
@@ -0,0 +1,7 @@
+# Copyright 2011 Elias Pipping <pipping@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require cifs-utils
+
+PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/net-fs/cifs-utils/cifs-utils.exlib b/packages/net-fs/cifs-utils/cifs-utils.exlib
index fe244f7..99ef405 100644
--- a/packages/net-fs/cifs-utils/cifs-utils.exlib
+++ b/packages/net-fs/cifs-utils/cifs-utils.exlib
@@ -2,8 +2,15 @@
# Copyright 2015 Thomas Witt
# Distributed under the terms of the GNU General Public License v2
+# original configure script errors and we need to run sed on configure.ac
+# to fix rst2man binary naming
+# last checked: 6.8
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
+
require pam
+export_exlib_phases src_prepare
+
SUMMARY="User-space tools required by the in-kernel CIFS filesystem"
HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
DOWNLOADS="https://download.samba.org/pub/linux-cifs/${PN}/${PNV}.tar.bz2"
@@ -17,6 +24,8 @@ MYOPTIONS="
"
DEPENDENCIES="
+ build:
+ dev-python/docutils [[ note = [ rst2man for man page ] ]]
build+run:
sys-apps/keyutils
sys-libs/libcap
@@ -38,6 +47,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
--with-pamdir=$(getpam_mod_dir)
--without-libcap-ng
--enable-cifscreds
+ --enable-man
--disable-cifsacl
--disable-cifsidmap
)
@@ -47,3 +57,11 @@ DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
systemd
)
+cifs-utils_src_prepare() {
+ #Fix naming of rst2man from our docutils
+ edo sed -e "s/AC_CHECK_PROG(have_rst2man, rst2man/AC_CHECK_PROG(have_rst2man, rst2man.py/" -i ${WORK}/configure.ac
+ edo sed -e "s/rst2man/rst2man.py/" -i ${WORK}/Makefile.am
+
+ autotools_src_prepare
+}
+
diff --git a/packages/net-fs/cifs-utils/files/cifs-utils-6.7_data_blob.patch b/packages/net-fs/cifs-utils/files/cifs-utils-6.7_data_blob.patch
deleted file mode 100644
index 8e65073..0000000
--- a/packages/net-fs/cifs-utils/files/cifs-utils-6.7_data_blob.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Thomas Witt <pyromaniac@exherbo.org>
-Upstream: pending
-Reason: data_blob.h includes talloc.h from libtalloc, but that is only a
-dependency for cifs.upcall. No symbols from that header are used by cifs.mount,
-so remove it since it was probably added by accident
-
---- mount.cifs.c.old 2017-03-15 19:50:07.886061685 +0100
-+++ mount.cifs.c 2017-03-15 19:50:17.914773221 +0100
-@@ -61,7 +61,6 @@
- #include "mount.h"
- #include "util.h"
- #include "resolve_host.h"
--#include "data_blob.h"
-
- #ifndef MS_MOVE
- #define MS_MOVE 8192