From 1053ac5b82a439cb7ebb284bc94f10564ad894d2 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Oct 31 2017 11:54:00 +0000
Subject: Merge remote-tracking branch 'origin/f26' into f25


---

diff --git a/0001-glusterfsd-Dereferencing-the-null-pointer.patch b/0001-glusterfsd-Dereferencing-the-null-pointer.patch
deleted file mode 100644
index eabad8a..0000000
--- a/0001-glusterfsd-Dereferencing-the-null-pointer.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 87bd25b64ae34cce95e87e724acfeab4c13d60a4 Mon Sep 17 00:00:00 2001
-From: Sanju Rakonde <srakonde@redhat.com>
-Date: Wed, 18 Oct 2017 08:06:24 +0530
-Subject: [PATCH] glusterfsd: Dereferencing the null pointer
-
-Problem: When control reaches to out, one of (iobref, iobuf, frame) can
-be null.for iobref, iobuf iobref_unref() and iobuf_unref() functions
-are called respectively, which are using GF_VALIDATE_OR_GOTO(), so
-there won't be null pointer dereference. But for frame without null
-checking STACK_DESTROY(frame->root) is called causing null pointer
-dereference.
-
-Fix: adding a line for null checking, the function
-STACK_DESTROY(frame->root) is called only when frame is not null.
-
-Change-Id: I3a6684c11fb7b694b81d6ad4fec3bced5562ad88
-BUG: 1503394
-Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
----
- glusterfsd/src/gf_attach.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/glusterfsd/src/gf_attach.c b/glusterfsd/src/gf_attach.c
-index 05119e4f4..3f248292d 100644
---- a/glusterfsd/src/gf_attach.c
-+++ b/glusterfsd/src/gf_attach.c
-@@ -144,7 +144,8 @@ out:
- 
-         iobref_unref (iobref);
-         iobuf_unref (iobuf);
--        STACK_DESTROY (frame->root);
-+        if (frame)
-+                STACK_DESTROY (frame->root);
- 
-         if (rpc_status != 0) {
-                 fprintf (stderr, "got error %d on RPC\n", rpc_status);
--- 
-2.13.5
-
diff --git a/glusterfs.spec b/glusterfs.spec
index 19387b3..b7f9080 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -170,8 +170,8 @@
 Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
-Version:          3.10.6
-Release:          4%{?prereltag:.%{prereltag}}%{?dist}
+Version:          3.10.7
+Release:          1%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -190,7 +190,6 @@ Source8:          glusterfsd.init
 %else
 Source0:          @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 %endif
-Patch0:           0001-glusterfsd-Dereferencing-the-null-pointer.patch
 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -670,7 +669,6 @@ This package provides the glusterfs server daemon.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prereltag}
-%patch0 -p1
 
 %build
 %if ( 0%{?rhel} && 0%{?rhel} < 6 )
@@ -1395,6 +1393,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Oct 31 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.7-1
+- 3.10.7 GA
+
 * Mon Oct 23 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.6-4
 - 3.10.6 bz #1504256
 
diff --git a/sources b/sources
index dd80a72..a4ff456 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-3.10.6.tar.gz) = db9e22c2992dc20e4542634c8c3406d082b0678fdd0678b6538877f9ee4f7d7a8eb01c8ec0183de5f2cf1031d440685f91d160636e423d19f049b64d1c8a0a6e
+SHA512 (glusterfs-3.10.7.tar.gz) = 25b5bcbb42f1525be7b9489a4b2a5701a05cb6967261d4fa87598c81db2b5e93bd31363ddb9f895b6ab8c9ab87aa9e38ec21f50b12b32fb592502db45d822906