From 46d282689bcec062a6c2cb7aa307f2d82f5d6761ba32e0872829acf27d38f4d8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 23 Jan 2019 23:41:10 +0000 Subject: [PATCH 1/3] Accepting request 667114 from home:seanlew:branches:filesystems Update glusterfs to 5.x branch OBS-URL: https://build.opensuse.org/request/show/667114 OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=54 --- glusterfs-4.0.2.tar.gz | 3 --- glusterfs-5.3.tar.gz | 3 +++ glusterfs.changes | 10 ++++++++++ glusterfs.spec | 12 ++++++------ 4 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 glusterfs-4.0.2.tar.gz create mode 100644 glusterfs-5.3.tar.gz diff --git a/glusterfs-4.0.2.tar.gz b/glusterfs-4.0.2.tar.gz deleted file mode 100644 index ce18f48..0000000 --- a/glusterfs-4.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef32c64a7d2625b40657a5333447ccc5378248aa23c53283f2ca91a893f7c9f5 -size 7643713 diff --git a/glusterfs-5.3.tar.gz b/glusterfs-5.3.tar.gz new file mode 100644 index 0000000..93d526b --- /dev/null +++ b/glusterfs-5.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:293542b1f43e681741282d1ba2aefe9b501321c782e896f518cca36072414448 +size 7628366 diff --git a/glusterfs.changes b/glusterfs.changes index 55adf5f..14e8d3f 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Jan 19 06:52:11 UTC 2019 - seanlew@opensuse.org + +- Update to new upstream version 5.3 (4.0 is EOL) + * 5.3 brings hundreds of improvements, see complete relnote at + https://docs.gluster.org/en/latest/release-notes/5.0/ +- Remove patches no longer needed in 5.x: + * 0001-build-restore-ability-to-control-verbosity-settings.patch + * glusterfs-tirpc.diff + ------------------------------------------------------------------- Thu May 3 11:50:05 UTC 2018 - jengelh@inai.de diff --git a/glusterfs.spec b/glusterfs.spec index 751531b..9028dff 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1,7 +1,7 @@ # # spec file for package glusterfs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: glusterfs -Version: 4.0.2 +Version: 5.3 Release: 0 Summary: Aggregating distributed file system License: GPL-2.0-only OR LGPL-3.0-or-later @@ -27,8 +27,8 @@ Url: http://www.gluster.org/ #Git-Clone: git://github.com/gluster/glusterfs #Git-Clone: git://github.com/fvzwieten/lsgvt Source: https://download.gluster.org/pub/gluster/glusterfs/4.0/4.0.2/glusterfs-%version.tar.gz -Patch1: glusterfs-tirpc.diff -Patch2: 0001-build-restore-ability-to-control-verbosity-settings.patch +#Patch1: glusterfs-tirpc.diff +#Patch2: 0001-build-restore-ability-to-control-verbosity-settings.patch BuildRequires: acl-devel BuildRequires: autoconf BuildRequires: automake @@ -143,7 +143,7 @@ links. %prep %setup -q -%patch -P 1 -P 2 -p1 +#%patch -P 2 -p1 >contrib/sunrpc/xdr_sizeof.c %build From 5d808c47a8680f1d3b61c3563736e96d719fe8eba8e0c18fe801fae30b0d6b50 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 25 Jan 2019 22:04:05 +0000 Subject: [PATCH 2/3] Drop patch files OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=55 --- ...bility-to-control-verbosity-settings.patch | 40 ------------------- glusterfs-tirpc.diff | 35 ---------------- glusterfs.spec | 2 - 3 files changed, 77 deletions(-) delete mode 100644 0001-build-restore-ability-to-control-verbosity-settings.patch delete mode 100644 glusterfs-tirpc.diff diff --git a/0001-build-restore-ability-to-control-verbosity-settings.patch b/0001-build-restore-ability-to-control-verbosity-settings.patch deleted file mode 100644 index e7adfb4..0000000 --- a/0001-build-restore-ability-to-control-verbosity-settings.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d2a7297a226155ff9b0696ca04480f4e9f3bd6bc Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Thu, 14 Dec 2017 19:43:43 +0100 -Subject: [PATCH] build: restore ability to control verbosity settings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -References: https://github.com/gluster/glusterfs/pull/381 - -`make V=1` is broken — no commands are printed whatsoever. At the -same time, `make V=0` *also* is broken in that no summary lines -("CC  foo.o") are printed, either. Kill the annoying hardcoded ---quiet in configure.ac, since it seems to override everything that -automake offers. ---- - configure.ac | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 81c56d4e6..ed11f35e4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,14 +25,6 @@ if make --help 2>&1 | grep -q no-print-directory; then - AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory"; - fi - --if make --help 2>&1 | grep -q quiet; then -- AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet" --fi -- --if libtool --help 2>&1 | grep -q quiet; then -- AM_LIBTOOLFLAGS="--quiet"; --fi -- - AC_CONFIG_HEADERS([config.h site.h]) - - AC_CONFIG_FILES([Makefile --- -2.15.1 - diff --git a/glusterfs-tirpc.diff b/glusterfs-tirpc.diff deleted file mode 100644 index b63b478..0000000 --- a/glusterfs-tirpc.diff +++ /dev/null @@ -1,35 +0,0 @@ -From: kukuk@suse.de -Date: Mon Nov 13 07:49:33 CET 2017 - -Fall back to libtirpc if there is no sunrpc support in glibc. - ---- - configure.ac | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -Index: glusterfs-3.12.3/configure.ac -=================================================================== ---- glusterfs-3.12.3.orig/configure.ac -+++ glusterfs-3.12.3/configure.ac -@@ -431,6 +431,21 @@ AC_CHECK_HEADERS([openssl/dh.h]) - - AC_CHECK_HEADERS([openssl/ecdh.h]) - -+dnl RPC library -+AC_CHECK_FUNC([xdrmem_create],[], AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl tirpc])) -+dnl Cygwin/recent glibc requires -I/usr/include/tirpc for -+old_CFLAGS=$CFLAGS -+AC_CACHE_CHECK([where to find ], [lv_cv_xdr_cflags], [ -+ for add_CFLAGS in '' '-I/usr/include/tirpc' 'missing'; do -+ if test x"$add_CFLAGS" = xmissing; then -+ lv_cv_xdr_cflags=missing; break -+ fi -+ CFLAGS="$old_CFLAGS $add_CFLAGS" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -+ ]])], [lv_cv_xdr_cflags=${add_CFLAGS:-none}; break]) -+ done -+]) -+ - dnl Math library - AC_CHECK_LIB([m], [pow], [MATH_LIB='-lm'], [MATH_LIB='']) - AC_SUBST(MATH_LIB) diff --git a/glusterfs.spec b/glusterfs.spec index 9028dff..3280618 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -27,8 +27,6 @@ Url: http://www.gluster.org/ #Git-Clone: git://github.com/gluster/glusterfs #Git-Clone: git://github.com/fvzwieten/lsgvt Source: https://download.gluster.org/pub/gluster/glusterfs/4.0/4.0.2/glusterfs-%version.tar.gz -#Patch1: glusterfs-tirpc.diff -#Patch2: 0001-build-restore-ability-to-control-verbosity-settings.patch BuildRequires: acl-devel BuildRequires: autoconf BuildRequires: automake From 67649f227a9ced0ef6b07b6d5dc216e85ca7161295a73954fc9147d64dd936b0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 28 Jan 2019 10:53:29 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=56 --- glusterfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index 3280618..4662020 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -26,7 +26,7 @@ Url: http://www.gluster.org/ #Git-Clone: git://github.com/gluster/glusterfs #Git-Clone: git://github.com/fvzwieten/lsgvt -Source: https://download.gluster.org/pub/gluster/glusterfs/4.0/4.0.2/glusterfs-%version.tar.gz +Source: https://download.gluster.org/pub/gluster/glusterfs/5/5.3/glusterfs-5.3.tar.gz BuildRequires: acl-devel BuildRequires: autoconf BuildRequires: automake