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