|
 |
f20720 |
---
|
|
|
f20720 |
Makefile.inc | 9 +++++----
|
|
|
f20720 |
kpartx/Makefile | 2 +-
|
|
|
f20720 |
libmpathpersist/Makefile | 4 ++--
|
|
|
f20720 |
libmultipath/Makefile | 1 +
|
|
|
f20720 |
libmultipath/checkers/Makefile | 2 +-
|
|
|
f20720 |
libmultipath/prioritizers/Makefile | 2 +-
|
|
|
f20720 |
multipath/Makefile | 2 +-
|
|
|
f20720 |
multipathd/Makefile | 5 +++--
|
|
|
f20720 |
8 files changed, 15 insertions(+), 12 deletions(-)
|
|
|
f20720 |
|
|
|
f20720 |
Index: multipath-tools-130222/Makefile.inc
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/Makefile.inc
|
|
|
f20720 |
+++ multipath-tools-130222/Makefile.inc
|
|
|
f20720 |
@@ -23,15 +23,15 @@ endif
|
|
|
f20720 |
|
|
|
f20720 |
prefix =
|
|
|
f20720 |
exec_prefix = $(prefix)
|
|
|
f20720 |
-bindir = $(exec_prefix)/sbin
|
|
|
f20720 |
+bindir = $(exec_prefix)/usr/sbin
|
|
|
f20720 |
libudevdir = ${prefix}/lib/udev
|
|
|
f20720 |
multipathdir = $(TOPDIR)/libmultipath
|
|
|
f20720 |
mandir = $(prefix)/usr/share/man/man8
|
|
|
f20720 |
man5dir = $(prefix)/usr/share/man/man5
|
|
|
f20720 |
man3dir = $(prefix)/usr/share/man/man3
|
|
|
f20720 |
rcdir = $(prefix)/etc/rc.d/init.d
|
|
|
f20720 |
-syslibdir = $(prefix)/$(LIB)
|
|
|
f20720 |
-libdir = $(prefix)/$(LIB)/multipath
|
|
|
f20720 |
+syslibdir = $(prefix)/usr/$(LIB)
|
|
|
f20720 |
+libdir = $(prefix)/usr/$(LIB)/multipath
|
|
|
f20720 |
unitdir = $(prefix)/lib/systemd/system
|
|
|
f20720 |
mpathpersistdir = $(TOPDIR)/libmpathpersist
|
|
|
f20720 |
|
|
|
f20720 |
@@ -42,8 +42,9 @@ ifndef RPM_OPT_FLAGS
|
|
|
f20720 |
RPM_OPT_FLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
|
|
|
f20720 |
endif
|
|
|
f20720 |
|
|
|
f20720 |
+LDFLAGS += -Wl,-z,relro
|
|
|
f20720 |
OPTFLAGS = $(RPM_OPT_FLAGS) -Wunused -Wstrict-prototypes
|
|
|
f20720 |
-CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
|
|
|
f20720 |
+CFLAGS = $(OPTFLAGS) -DLIB_STRING=\"${LIB}\"
|
|
|
f20720 |
SHARED_FLAGS = -shared
|
|
|
f20720 |
|
|
|
f20720 |
%.o: %.c
|
|
|
f20720 |
Index: multipath-tools-130222/multipathd/Makefile
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/multipathd/Makefile
|
|
|
f20720 |
+++ multipath-tools-130222/multipathd/Makefile
|
|
|
f20720 |
@@ -5,9 +5,10 @@ include ../Makefile.inc
|
|
|
f20720 |
#
|
|
|
f20720 |
# basic flags setting
|
|
|
f20720 |
#
|
|
|
f20720 |
-CFLAGS += -I$(multipathdir) -I$(mpathpersistdir)
|
|
|
f20720 |
+CFLAGS += -fPIE -DPIE -I$(multipathdir) -I$(mpathpersistdir)
|
|
|
f20720 |
LDFLAGS += -lpthread -ldevmapper -lreadline -ludev -ldl \
|
|
|
f20720 |
- -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist
|
|
|
f20720 |
+ -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist \
|
|
|
f20720 |
+ -Wl,-z,now -pie
|
|
|
f20720 |
|
|
|
f20720 |
#
|
|
|
f20720 |
# debuging stuff
|
|
|
f20720 |
Index: multipath-tools-130222/kpartx/Makefile
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/kpartx/Makefile
|
|
|
f20720 |
+++ multipath-tools-130222/kpartx/Makefile
|
|
|
f20720 |
@@ -4,7 +4,7 @@
|
|
|
f20720 |
#
|
|
|
f20720 |
include ../Makefile.inc
|
|
|
f20720 |
|
|
|
f20720 |
-CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
|
|
f20720 |
+CFLAGS += -fPIC -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
|
|
f20720 |
|
|
|
f20720 |
LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h)
|
|
|
f20720 |
|
|
|
f20720 |
Index: multipath-tools-130222/libmpathpersist/Makefile
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/libmpathpersist/Makefile
|
|
|
f20720 |
+++ multipath-tools-130222/libmpathpersist/Makefile
|
|
|
f20720 |
@@ -10,7 +10,7 @@ DEVLIB = libmpathpersist.so
|
|
|
f20720 |
LIBS = $(DEVLIB).$(SONAME)
|
|
|
f20720 |
|
|
|
f20720 |
|
|
|
f20720 |
-CFLAGS += -I$(multipathdir) -I$(mpathpersistdir)
|
|
|
f20720 |
+CFLAGS += -fPIC -I$(multipathdir) -I$(mpathpersistdir)
|
|
|
f20720 |
LIBDEPS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath
|
|
|
f20720 |
|
|
|
f20720 |
OBJS = mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o
|
|
|
f20720 |
@@ -19,7 +19,7 @@ all: $(LIBS)
|
|
|
f20720 |
|
|
|
f20720 |
|
|
|
f20720 |
$(LIBS):
|
|
|
f20720 |
- $(CC) -Wall -fPIC -c $(CFLAGS) *.c
|
|
|
f20720 |
+ $(CC) -Wall -c $(CFLAGS) *.c
|
|
|
f20720 |
$(CC) -shared $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
|
|
|
f20720 |
ln -s $(LIBS) $(DEVLIB)
|
|
|
f20720 |
$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
|
|
|
f20720 |
Index: multipath-tools-130222/libmultipath/Makefile
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/libmultipath/Makefile
|
|
|
f20720 |
+++ multipath-tools-130222/libmultipath/Makefile
|
|
|
f20720 |
@@ -8,6 +8,7 @@ SONAME=0
|
|
|
f20720 |
DEVLIB = libmultipath.so
|
|
|
f20720 |
LIBS = $(DEVLIB).$(SONAME)
|
|
|
f20720 |
LIBDEPS = -lpthread -ldl -ldevmapper -ludev
|
|
|
f20720 |
+CFLAGS += -fPIC
|
|
|
f20720 |
|
|
|
f20720 |
OBJS = memory.o parser.o vector.o devmapper.o \
|
|
|
f20720 |
hwtable.o blacklist.o util.o dmparser.o config.o \
|
|
|
f20720 |
Index: multipath-tools-130222/libmultipath/checkers/Makefile
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/libmultipath/checkers/Makefile
|
|
|
f20720 |
+++ multipath-tools-130222/libmultipath/checkers/Makefile
|
|
|
f20720 |
@@ -14,7 +14,7 @@ LIBS= \
|
|
|
f20720 |
libcheckhp_sw.so \
|
|
|
f20720 |
libcheckrdac.so
|
|
|
f20720 |
|
|
|
f20720 |
-CFLAGS += -I..
|
|
|
f20720 |
+CFLAGS += -fPIC -I..
|
|
|
f20720 |
|
|
|
f20720 |
all: $(LIBS)
|
|
|
f20720 |
|
|
|
f20720 |
Index: multipath-tools-130222/libmultipath/prioritizers/Makefile
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/libmultipath/prioritizers/Makefile
|
|
|
f20720 |
+++ multipath-tools-130222/libmultipath/prioritizers/Makefile
|
|
|
f20720 |
@@ -17,7 +17,7 @@ LIBS = \
|
|
|
f20720 |
libprioweightedpath.so \
|
|
|
f20720 |
libprioiet.so
|
|
|
f20720 |
|
|
|
f20720 |
-CFLAGS += -I..
|
|
|
f20720 |
+CFLAGS += -fPIC -I..
|
|
|
f20720 |
|
|
|
f20720 |
all: $(LIBS)
|
|
|
f20720 |
|
|
|
f20720 |
Index: multipath-tools-130222/multipath/Makefile
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/multipath/Makefile
|
|
|
f20720 |
+++ multipath-tools-130222/multipath/Makefile
|
|
|
f20720 |
@@ -6,7 +6,7 @@ include ../Makefile.inc
|
|
|
f20720 |
|
|
|
f20720 |
OBJS = main.o
|
|
|
f20720 |
|
|
|
f20720 |
-CFLAGS += -I$(multipathdir)
|
|
|
f20720 |
+CFLAGS += -fPIC -I$(multipathdir)
|
|
|
f20720 |
LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath
|
|
|
f20720 |
|
|
|
f20720 |
EXEC = multipath
|