1
0
forked from pool/glusterfs

Accepting request 669027 from filesystems

- Update to new upstream version 5.3 (4.0 is EOL)

OBS-URL: https://build.opensuse.org/request/show/669027
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glusterfs?expand=0&rev=22
This commit is contained in:
Stephan Kulow 2019-02-04 20:10:28 +00:00 committed by Git OBS Bridge
commit 20caf91a2f
6 changed files with 18 additions and 85 deletions

View File

@ -1,40 +0,0 @@
From d2a7297a226155ff9b0696ca04480f4e9f3bd6bc Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ef32c64a7d2625b40657a5333447ccc5378248aa23c53283f2ca91a893f7c9f5
size 7643713

3
glusterfs-5.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:293542b1f43e681741282d1ba2aefe9b501321c782e896f518cca36072414448
size 7628366

View File

@ -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 <rpc/rpc.h>
+old_CFLAGS=$CFLAGS
+AC_CACHE_CHECK([where to find <rpc/rpc.h>], [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 <rpc/rpc.h>
+ ]])], [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)

View File

@ -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

View File

@ -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
@ -26,9 +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
Patch1: glusterfs-tirpc.diff
Patch2: 0001-build-restore-ability-to-control-verbosity-settings.patch
Source: https://download.gluster.org/pub/gluster/glusterfs/5/5.3/glusterfs-5.3.tar.gz
BuildRequires: acl-devel
BuildRequires: autoconf
BuildRequires: automake
@ -143,7 +141,7 @@ links.
%prep
%setup -q
%patch -P 1 -P 2 -p1
#%patch -P 2 -p1
>contrib/sunrpc/xdr_sizeof.c
%build