| Brad Bishop | 8410d61 | 2019-11-25 09:40:59 -0500 | [diff] [blame^] | 1 | From 78a9cffb1c760466933bbbcbae7ecb9b30a3e6a5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 21 Nov 2019 13:47:42 -0800 |
| 4 | Subject: [PATCH] sanlock: Replace "cp -a" with "cp -R --no-dereference |
| 5 | --preserve=mode, links" |
| 6 | |
| 7 | Using "cp -a" leaks UID of user running the builds |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | src/Makefile | 8 ++++---- |
| 14 | wdmd/Makefile | 4 ++-- |
| 15 | 2 files changed, 6 insertions(+), 6 deletions(-) |
| 16 | |
| 17 | diff --git a/src/Makefile b/src/Makefile |
| 18 | index 533dd79..2fc9ba5 100644 |
| 19 | --- a/src/Makefile |
| 20 | +++ b/src/Makefile |
| 21 | @@ -127,9 +127,9 @@ install: all |
| 22 | $(INSTALL) -c -m 755 $(LIBSO_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR) |
| 23 | $(INSTALL) -c -m 644 $(LIBPC_ENTIRE_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig |
| 24 | $(INSTALL) -c -m 644 $(LIBPC_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig |
| 25 | - cp -a $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) |
| 26 | - cp -a $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) |
| 27 | - cp -a $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) |
| 28 | - cp -a $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) |
| 29 | + cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) |
| 30 | + cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) |
| 31 | + cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) |
| 32 | + cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) |
| 33 | $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) |
| 34 | $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/ |
| 35 | diff --git a/wdmd/Makefile b/wdmd/Makefile |
| 36 | index 5849efc..4894517 100644 |
| 37 | --- a/wdmd/Makefile |
| 38 | +++ b/wdmd/Makefile |
| 39 | @@ -68,7 +68,7 @@ install: all |
| 40 | $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man8 |
| 41 | $(INSTALL) -c -m 755 $(CMD_TARGET) $(DESTDIR)/$(BINDIR) |
| 42 | $(INSTALL) -c -m 755 $(SHLIB_TARGET) $(DESTDIR)/$(LIBDIR) |
| 43 | - cp -a $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) |
| 44 | - cp -a $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) |
| 45 | + cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) |
| 46 | + cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) |
| 47 | $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) |
| 48 | $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8 |
| 49 | -- |
| 50 | 2.24.0 |
| 51 | |