Upgrade libcap to libcap-2.69 am: 3620cbbd3a am: 73ad227596 am: 8a1cf2a372 am: bed57b7ffc am: 9577b17009android-wear-14.0.0-gpl_r1android-14.0.0_r51android-14.0.0_r50android14-qpr3-release

Original change: https://android-review.googlesource.com/c/platform/external/libcap/+/2724494

Change-Id: I4ea4e156399ef29965e8ef1e5ce85c0fb0a969db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 46 insertions, 23 deletions

diff --git a/pam_cap/Makefile b/pam_cap/Makefile
index 689239e..258e519 100644
--- a/pam_cap/Makefile
+++ b/pam_cap/Makefile
@@ -3,6 +3,9 @@
 topdir=$(shell pwd)/..
 include ../Make.Rules
 
+# Always build pam_cap sources this way:
+CFLAGS += -fPIC
+
 all: pam_cap.so
 	$(MAKE) testlink
 
@@ -14,10 +17,14 @@ install: all
 	$(MAKE) -C ../libcap loader.txt
 
 execable.o: execable.c ../libcap/execable.h ../libcap/loader.txt
-	$(CC) $(CFLAGS) $(IPATH) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -c execable.c -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -c execable.c -o $@
+
+LIBCAP:
+	$(MAKE) -C ../libcap all
+	touch $@
 
-pam_cap.so: pam_cap.o execable.o pam_cap_linkopts
-	cat pam_cap_linkopts | xargs -e $(LD) -o $@ pam_cap.o execable.o $(LIBCAPLIB) $(LDFLAGS)
+pam_cap.so: pam_cap.o execable.o pam_cap_linkopts LIBCAP
+	cat pam_cap_linkopts | xargs -e $(LD) $(LDFLAGS) -o $@ pam_cap.o execable.o $(LIBCAPLIB)
 
 # Some distributions force link everything at compile time, and don't
 # take advantage of libpam's dlopen runtime options to resolve ill
@@ -28,43 +35,59 @@ pam_cap.so: pam_cap.o execable.o pam_cap_linkopts
 #
 #   https://bugzilla.kernel.org/show_bug.cgi?id=214023
 #
-# If the current build environment is one of those, extend the link
-# options for pam_cap.so to force linkage against libpam and the
-# gazillion other things libpam is linked against...
+# If the current build environment is one of those, or we can't
+# reliably prove it isn't, extend the link options for pam_cap.so to
+# force linkage against libpam and the gazillion other things libpam
+# is linked against...
+#
+# If you want to force this behavior one way or the other, use the
+# make FORCELINKPAM=yes or FORCELINKPAM=no override.
+ifeq ($(FORCELINKPAM),yes)
+pam_cap_linkopts: Makefile
+	echo "-Wl,-e,__so_start -lpam" > $@
+else
+ifeq ($(FORCELINKPAM),no)
+pam_cap_linkopts: Makefile
+	echo "-Wl,-e,__so_start" > $@
+else
 pam_cap_linkopts: lazylink.so
 	echo "-Wl,-e,__so_start" > $@
 	./lazylink.so || echo "-lpam" >> $@
 
 lazylink.so: lazylink.c ../libcap/execable.h ../libcap/loader.txt
-	$(LD) -o $@ $(CFLAGS) $(IPATH) lazylink.c -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" $(LDFLAGS) -Wl,-e,__so_start
-
-pam_cap.o: pam_cap.c
-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
+	$(LD) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) lazylink.c -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -Wl,-e,__so_start
+endif
+endif
 
 ../libcap/libcap.a:
 	$(MAKE) -C ../libcap libcap.a
 
+# Avoid $(LDFLAGS) here to avoid conflicts with --static for a in-tree
+# test binary.
 test_pam_cap: test_pam_cap.c pam_cap.c ../libcap/libcap.a
-	$(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ test_pam_cap.c $(LIBCAPLIB) --static
 
-testlink: test.c pam_cap.o
-	$(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
+testlink: test.o pam_cap.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB)
 
-test: testlink test_pam_cap pam_cap.so
-	$(MAKE) testlink
+incapable.conf:
+	echo "^cap_setuid  alpha" > $@ && chmod o+w $@
+
+test: testlink test_pam_cap pam_cap.so incapable.conf
 	./test_pam_cap
 	LD_LIBRARY_PATH=../libcap ./pam_cap.so
 	LD_LIBRARY_PATH=../libcap ./pam_cap.so --help
 	@echo "module can be run as an executable!"
 
-sudotest: test test_pam_cap
-	sudo ./test_pam_cap root 0x0 0x0 0x0 config=./capability.conf
-	sudo ./test_pam_cap root 0x0 0x0 0x0 config=./sudotest.conf
-	sudo ./test_pam_cap alpha 0x0 0x0 0x0 config=./capability.conf
-	sudo ./test_pam_cap alpha 0x0 0x1 0x80 config=./sudotest.conf
-	sudo ./test_pam_cap beta 0x0 0x1 0x0 config=./sudotest.conf
-	sudo ./test_pam_cap gamma 0x0 0x0 0x81 config=./sudotest.conf
-	sudo ./test_pam_cap delta 0x41 0x80 0x41 config=./sudotest.conf
+sudotest: test_pam_cap incapable.conf
+	$(SUDO) ./test_pam_cap root 0x0 0x0 0x0 config=./capability.conf
+	$(SUDO) ./test_pam_cap root 0x0 0x0 0x0 config=./sudotest.conf
+	$(SUDO) ./test_pam_cap alpha 0x0 0x0 0x0 config=./capability.conf
+	$(SUDO) ./test_pam_cap alpha 0x0 0x1 0x80 config=./sudotest.conf
+	$(SUDO) ./test_pam_cap beta 0x0 0x1 0x0 config=./sudotest.conf
+	$(SUDO) ./test_pam_cap gamma 0x0 0x0 0x81 config=./sudotest.conf
+	$(SUDO) ./test_pam_cap delta 0x41 0x80 0x41 config=./sudotest.conf
 
 clean:
 	rm -f *.o *.so testlink lazylink.so test_pam_cap pam_cap_linkopts *~
+	rm -f LIBCAP incapable.conf