Update libcap to 2.16.
The update ensures that we don't need to apply a patch before building
the library (without file-setting capability support). Its also more
robust in the face of apparently 'really old' versions of sed.
Reviewed-by: Martin Bligh <mbligh@google.com>
Signed-off-by: Andrew G. Morgan <agm@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2584 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/deps/libcap/libcap-2.14.tar.gz b/client/deps/libcap/libcap-2.14.tar.gz
deleted file mode 100644
index 27a2d92..0000000
--- a/client/deps/libcap/libcap-2.14.tar.gz
+++ /dev/null
Binary files differ
diff --git a/client/deps/libcap/libcap-2.16.tar.gz b/client/deps/libcap/libcap-2.16.tar.gz
new file mode 100644
index 0000000..987d889
--- /dev/null
+++ b/client/deps/libcap/libcap-2.16.tar.gz
Binary files differ
diff --git a/client/deps/libcap/libcap.patch b/client/deps/libcap/libcap.patch
deleted file mode 100644
index 1d69a03..0000000
--- a/client/deps/libcap/libcap.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile 2008-10-16 21:31:01.000000000 -0700
-+++ Makefile 2008-11-06 09:56:12.000000000 -0800
-@@ -10,14 +10,14 @@
- STALIBNAME=$(LIBTITLE).a
- #
-
--FILES=cap_alloc cap_proc cap_extint cap_flag cap_text cap_file
-+FILES=cap_alloc cap_proc cap_extint cap_flag cap_text
-
- INCLS=libcap.h cap_names.h $(INCS)
- OBJS=$(addsuffix .o, $(FILES))
- MAJLIBNAME=$(LIBNAME).$(VERSION)
- MINLIBNAME=$(MAJLIBNAME).$(MINOR)
- GPERF_OUTPUT = _caps_output.gperf
--LDFLAGS += -lattr
-+#LDFLAGS += -lattr
-
- all: $(MINLIBNAME) $(STALIBNAME)
-
diff --git a/client/deps/libcap/libcap.py b/client/deps/libcap/libcap.py
index 32de5fb..31de0a6 100755
--- a/client/deps/libcap/libcap.py
+++ b/client/deps/libcap/libcap.py
@@ -4,17 +4,14 @@
from autotest_lib.client.common_lib import utils
from autotest_lib.client.bin import autotest_utils
-version = 1
+version = 2
-def setup(srcdir, tarball='libcap-2.14.tar.gz'):
+def setup(srcdir, tarball='libcap-2.16.tar.gz'):
topdir = os.getcwd()
autotest_utils.extract_tarball_to_dir(tarball, srcdir)
- os.chdir(os.path.join(srcdir, 'libcap'))
- utils.system('patch -p0 < ../../libcap.patch')
os.chdir(srcdir)
- utils.system('make -C libcap')
+ utils.system('make -C libcap LIBATTR=no')
os.chdir(topdir)
-
srcdir = os.path.abspath('./src')
utils.update_version(srcdir, False, version, setup, srcdir)