system/dlm: Updated for version 4.0.9.

Signed-off-by: Mario Preksavec <mario@slackware.hr>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 10 insertions, 43 deletions

diff --git a/system/dlm/dlm.SlackBuild b/system/dlm/dlm.SlackBuild
index 1c5638ea33a6..ccebfec1f93a 100644
--- a/system/dlm/dlm.SlackBuild
+++ b/system/dlm/dlm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for dlm
 
-# Copyright 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 2019, 2020  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dlm
-VERSION=${VERSION:-4.0.8}
+VERSION=${VERSION:-4.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/dlm/dlm.info b/system/dlm/dlm.info
index f128b8592b5a..7343b4d19a93 100644
--- a/system/dlm/dlm.info
+++ b/system/dlm/dlm.info
@@ -1,8 +1,8 @@
 PRGNAM="dlm"
-VERSION="4.0.8"
+VERSION="4.0.9"
 HOMEPAGE="https://pagure.io/dlm"
-DOWNLOAD="https://pagure.io/dlm/archive/dlm-4.0.8/dlm-dlm-4.0.8.tar.gz"
-MD5SUM="61e63252f2e0b72207497daf83a69719"
+DOWNLOAD="https://pagure.io/dlm/archive/dlm-4.0.9/dlm-dlm-4.0.9.tar.gz"
+MD5SUM="4c57a941a15547859cd38fd55f66388e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pacemaker"
diff --git a/system/dlm/patches/Check-sscanf-return-value.patch b/system/dlm/patches/Check-sscanf-return-value.patch
deleted file mode 100644
index 719e294fca39..000000000000
--- a/system/dlm/patches/Check-sscanf-return-value.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
-Date: Wed, 25 Apr 2018 23:13:29 +0200
-Subject: Check sscanf return value
-
----
- dlm_tool/main.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/dlm_tool/main.c b/dlm_tool/main.c
-index 042caa9..1900236 100644
---- a/dlm_tool/main.c
-+++ b/dlm_tool/main.c
-@@ -692,6 +692,11 @@ static void print_lkb(char *line, struct rinfo *ri)
- 		    (unsigned long long *)&lkb.timestamp,
- 		    (unsigned long long *)&lkb.time_bast);
- 
-+	if (rv != 17) {
-+		fprintf(stderr, "print_lkb error rv %d line \"%s\"\n", rv, line);
-+		return;
-+	}
-+
- 	ri->lkb_count++;
- 
- 	if (lkb.status == DLM_LKSTS_GRANTED) {
diff --git a/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch b/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch
index 7f32d838d25d..d4e9f5bd8961 100644
--- a/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch
+++ b/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch
@@ -9,12 +9,10 @@ Subject: Use CPPFLAGS from the environment
  libdlm/Makefile       | 4 ++--
  4 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile
-index 75c5750..47af929 100644
 --- a/dlm_controld/Makefile
 +++ b/dlm_controld/Makefile
-@@ -58,10 +58,10 @@ endif
- all: $(LIB_TARGET) $(BIN_TARGET)
+@@ -62,10 +62,10 @@
+ all: $(LIB_TARGET) $(BIN_TARGET) $(LIB_PC)
  
  $(BIN_TARGET): $(BIN_SOURCE)
 -	$(CC) $(BIN_SOURCE) $(BIN_CFLAGS) $(BIN_LDFLAGS) -o $@ -L.
@@ -26,11 +24,9 @@ index 75c5750..47af929 100644
  	ln -sf $(LIB_TARGET) $(LIB_SO)
  	ln -sf $(LIB_TARGET) $(LIB_SMAJOR)
  
-diff --git a/dlm_tool/Makefile b/dlm_tool/Makefile
-index 80d7725..a9b3be0 100644
 --- a/dlm_tool/Makefile
 +++ b/dlm_tool/Makefile
-@@ -27,7 +27,7 @@ LDFLAGS += -lpthread -ldlm -ldlmcontrol
+@@ -27,7 +27,7 @@
  all: $(BIN_TARGET)
  
  $(BIN_TARGET): $(BIN_SOURCE)
@@ -39,11 +35,9 @@ index 80d7725..a9b3be0 100644
  
  clean:
  	rm -f *.o *.so *.so.* $(BIN_TARGET)
-diff --git a/fence/Makefile b/fence/Makefile
-index b927879..d4a3c09 100644
 --- a/fence/Makefile
 +++ b/fence/Makefile
-@@ -28,7 +28,7 @@ LDFLAGS += -ldl
+@@ -28,7 +28,7 @@
  all: $(BIN_TARGET)
  
  $(BIN_TARGET): $(BIN_SOURCE)
@@ -52,11 +46,9 @@ index b927879..d4a3c09 100644
  
  clean:
  	rm -f *.o *.so *.so.* $(BIN_TARGET)
-diff --git a/libdlm/Makefile b/libdlm/Makefile
-index ab32761..21addf8 100644
 --- a/libdlm/Makefile
 +++ b/libdlm/Makefile
-@@ -90,10 +90,10 @@ LLT_LDFLAGS += $(LDFLAGS)
+@@ -90,10 +90,10 @@
  all: $(LIB_TARGET) $(LLT_TARGET) $(LIB_PC) $(LLT_PC)
  
  $(LIB_O): $(SOURCE) 
diff --git a/system/dlm/patches/series b/system/dlm/patches/series
index 3b61b57b9b17..17ef4f6ee02b 100644
--- a/system/dlm/patches/series
+++ b/system/dlm/patches/series
@@ -2,4 +2,3 @@ Debian-path-for-the-config-file.patch
 Enable-systemctl-help-dlm-to-show-relevant-man-pages.patch
 Use-CPPFLAGS-from-the-environment.patch
 Don-t-link-dlm_stonith-against-libxml2.patch
-Check-sscanf-return-value.patch