diff --git a/0000-Fix-libsanlock-build-on-Unubtu-Debian.patch b/0000-Fix-libsanlock-build-on-Unubtu-Debian.patch deleted file mode 100644 index 79605e42f71d67dea926c3b30f0da7d6a868b5db..0000000000000000000000000000000000000000 --- a/0000-Fix-libsanlock-build-on-Unubtu-Debian.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 39b4d87397e5a09adcd100e0f379f34d5dde7e9b Mon Sep 17 00:00:00 2001 -From: Nir Soffer -Date: Mon, 15 Jan 2018 01:21:51 +0200 -Subject: [PATCH 1/2] Fix libsanlock build on Unubtu/Debian - -LIB_ENTIRE_LDFLAGS included libraries (e.g. -laio -lblkid) instead of -linker flags. The libraries should be in LIB_ENTIRE_LDDADD and come -*after* the sources. Otherwisae, the libraries are not linked, and -loading libsanlock.so fail with undefined symbol error. - -Signed-off-by: Nir Soffer ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 69fcd1321ee7..73a2b3498475 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -98,15 +98,15 @@ CMD_CFLAGS = $(CFLAGS) -fPIE -DPIE - CMD_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie - CMD_LDADD += -lpthread -luuid -lrt -laio -lblkid -lsanlock -L../wdmd -lwdmd - --LIB_ENTIRE_LDFLAGS += -lpthread -lrt -laio -lblkid -L../wdmd -lwdmd - LIB_ENTIRE_LDFLAGS += -Wl,-z,relro -pie -+LIB_ENTIRE_LDADD += -lpthread -lrt -laio -lblkid -L../wdmd -lwdmd - - LIB_CLIENT_LDFLAGS += -Wl,-z,relro -pie - - all: $(LIBSO_ENTIRE_TARGET) $(LIBSO_CLIENT_TARGET) $(CMD_TARGET) $(LIBPC_ENTIRE_TARGET) $(LIBPC_CLIENT_TARGET) - - $(LIBSO_ENTIRE_TARGET): $(LIB_ENTIRE_SOURCE) -- $(CC) $(CFLAGS) $(LIB_ENTIRE_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $^ -+ $(CC) $(CFLAGS) $(LIB_ENTIRE_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $^ $(LIB_ENTIRE_LDADD) - ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so - ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) - --- -2.7.5 - diff --git a/0001-fix-makefile-flags.patch b/0001-fix-makefile-flags.patch deleted file mode 100644 index 6fd80aad332095da8afad26221ae702a806f7e3b..0000000000000000000000000000000000000000 --- a/0001-fix-makefile-flags.patch +++ /dev/null @@ -1,85 +0,0 @@ -From fa6d48a7c8991b2251e50469a7e57058be226ab0 Mon Sep 17 00:00:00 2001 -From: David Teigland -Date: Wed, 14 Mar 2018 11:49:35 -0500 -Subject: [PATCH 2/2] fix makefile flags - -should let the fedora build flags work ---- - reset/Makefile | 2 +- - src/Makefile | 15 +++++++-------- - wdmd/Makefile | 8 ++++---- - 3 files changed, 12 insertions(+), 13 deletions(-) - -diff --git a/reset/Makefile b/reset/Makefile -index c61348a2b9c3..04a23032614a 100644 ---- a/reset/Makefile -+++ b/reset/Makefile -@@ -34,7 +34,7 @@ VER=$(shell cat ../VERSION) - CFLAGS += -DVERSION=\"$(VER)\" -I../src -I../wdmd - CFLAGS += -fPIE -DPIE - --LDFLAGS = -Wl,-z,now -Wl,-z,relro -pie -+LDFLAGS += -Wl,-z,now -Wl,-z,relro - LDADD = -lsanlock -lwdmd - - all: $(TARGET1) $(TARGET2) -diff --git a/src/Makefile b/src/Makefile -index 73a2b3498475..14c0a53e6aeb 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -94,24 +94,23 @@ VER=$(shell cat ../VERSION) - CFLAGS += -DVERSION=\"$(VER)\" - - CMD_CFLAGS = $(CFLAGS) -fPIE -DPIE -+CMD_LDFLAGS = $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -+CMD_LDADD = -lpthread -luuid -lrt -laio -lblkid -lsanlock -L../wdmd -lwdmd - --CMD_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie --CMD_LDADD += -lpthread -luuid -lrt -laio -lblkid -lsanlock -L../wdmd -lwdmd -+LIB_ENTIRE_LDFLAGS = $(LDFLAGS) -Wl,-z,relro -+LIB_ENTIRE_LDADD = -lpthread -lrt -laio -lblkid -L../wdmd -lwdmd - --LIB_ENTIRE_LDFLAGS += -Wl,-z,relro -pie --LIB_ENTIRE_LDADD += -lpthread -lrt -laio -lblkid -L../wdmd -lwdmd -- --LIB_CLIENT_LDFLAGS += -Wl,-z,relro -pie -+LIB_CLIENT_LDFLAGS = $(LDFLAGS) -Wl,-z,relro - - all: $(LIBSO_ENTIRE_TARGET) $(LIBSO_CLIENT_TARGET) $(CMD_TARGET) $(LIBPC_ENTIRE_TARGET) $(LIBPC_CLIENT_TARGET) - - $(LIBSO_ENTIRE_TARGET): $(LIB_ENTIRE_SOURCE) -- $(CC) $(CFLAGS) $(LIB_ENTIRE_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $^ $(LIB_ENTIRE_LDADD) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(LIB_ENTIRE_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $^ $(LIB_ENTIRE_LDADD) - ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so - ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) - - $(LIBSO_CLIENT_TARGET): $(LIB_CLIENT_SOURCE) -- $(CC) $(CFLAGS) $(LIB_CLIENT_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_CLIENT_TARGET).so.$(SOMAJOR) $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(LIB_CLIENT_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_CLIENT_TARGET).so.$(SOMAJOR) $^ - ln -sf $(LIBSO_CLIENT_TARGET) $(LIB_CLIENT_TARGET).so - ln -sf $(LIBSO_CLIENT_TARGET) $(LIB_CLIENT_TARGET).so.$(SOMAJOR) - -diff --git a/wdmd/Makefile b/wdmd/Makefile -index bf871c591943..0c4438950d6e 100644 ---- a/wdmd/Makefile -+++ b/wdmd/Makefile -@@ -45,12 +45,12 @@ CFLAGS += -D_GNU_SOURCE -g -O2 \ - VER=$(shell cat ../VERSION) - CFLAGS += -DVERSION=\"$(VER)\" - --CMD_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie --CMD_LDADD += -lwdmd -lrt -+CMD_LDFLAGS = $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -+CMD_LDADD = -lwdmd -lrt - --LIB_LDFLAGS += -Wl,-z,relro -pie -+LIB_LDFLAGS = $(LDFLAGS) -Wl,-z,relro - --TEST_LDFLAGS = -lwdmd -+TEST_LDFLAGS = $(LDFLAGS) -lwdmd - - - all: $(SHLIB_TARGET) $(CMD_TARGET) $(TEST_TARGET) --- -2.7.5 - diff --git a/sanlock-3.6.0.tar.gz b/sanlock-3.6.0.tar.gz deleted file mode 100644 index d7ca044e9bc2d5c7c4a36e4886d1210bf74790dc..0000000000000000000000000000000000000000 Binary files a/sanlock-3.6.0.tar.gz and /dev/null differ diff --git a/sanlock-3.8.1.tar.gz b/sanlock-3.8.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..91f01bccdaaaee0c96d3afd73c86895d58020a02 Binary files /dev/null and b/sanlock-3.8.1.tar.gz differ diff --git a/sanlock.spec b/sanlock.spec index 20dce4986c25df7620c2e9f1a436ee61ebcee3c6..db6db0e59ee6ebdf6aebd7f35b1b8750c3b9dd59 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -1,12 +1,10 @@ Name: sanlock -Version: 3.6.0 -Release: 7 +Version: 3.8.1 +Release: 1 Summary: A shared storage lock manager License: GPLv2 and GPLv2+ and LGPLv2+ URL: https://pagure.io/sanlock/ Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz -Patch0001: 0000-Fix-libsanlock-build-on-Unubtu-Debian.patch -Patch0002: 0001-fix-makefile-flags.patch BuildRequires: libblkid-devel libaio-devel python2 python2-devel systemd-units Requires(pre): shadow @@ -156,5 +154,8 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \ %changelog +* Thu Jul 16 2020 yanglongkang - 3.8.1-1 +- update package to 3.8.1 + * Sat Nov 30 2019 zoushuangshuang - 3.6.0-7 - Package init