Hello community,
here is the log from the commit of package glusterfs.3588 for
openSUSE:13.1:Update checked in at 2015-03-11 13:04:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/glusterfs.3588 (Old)
and /work/SRC/openSUSE:13.1:Update/.glusterfs.3588.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glusterfs.3588"
Changes:
--------
New Changes file:
--- /dev/null 2015-02-28 12:43:00.252025756 +0100
+++ /work/SRC/openSUSE:13.1:Update/.glusterfs.3588.new/glusterfs.changes
2015-03-11 13:04:02.000000000 +0100
@@ -0,0 +1,58 @@
+-------------------------------------------------------------------
+Fri Feb 27 10:39:33 UTC 2015 - jeng...@inai.de
+
+- CVE-2014-3619: add multifrag.diff [bnc#919879]
+
+-------------------------------------------------------------------
+Thu Feb 28 21:58:02 UTC 2013 - jeng...@inai.de
+
+- Update to new upstream release 3.4.0alpha (rpm: 3.4.0~qa9)
+* automake-1.13 support
+- Enable AIO support
+
+-------------------------------------------------------------------
+Tue Nov 27 11:28:36 UTC 2012 - jeng...@inai.de
+
+- Use `glusterd -N` in glusterd.service to run in foreground
+ as required
+
+-------------------------------------------------------------------
+Tue Nov 27 10:59:15 UTC 2012 - cfarr...@suse.com
+
+- license update: GPL-2.0 or LGPL-3.0+
+
+-------------------------------------------------------------------
+Fri Nov 9 21:47:11 UTC 2012 - jeng...@inai.de
+
+- Update to new upstream release 3.4.0qa2
+* No changelog provided by upstream
+- Remove glusterfs-init.diff, merged upstream
+- Provide systemd service file
+
+-------------------------------------------------------------------
+Wed Oct 31 12:19:47 UTC 2012 - jeng...@inai.de
+
+- Update to new upstream release 3.3.1
+* mount.glusterfs: Add support for {attribute,entry}-timeout options
+* cli: Proper xml output for "gluster peer status"
+* self-heald: Fix inode leak
+* storage/posix: implement native linux AIO support
+
+-------------------------------------------------------------------
+Mon Sep 24 03:45:09 UTC 2012 - jeng...@inai.de
+
+- Update to new upstream release 3.3.0
+* New: Unified File & Object access
+* New: Hadoop hooks - HDFS compatibility layer
+* New volume type: Repstr - replicated + striped (+ distributed)
+ volumes
+
+-------------------------------------------------------------------
+Fri Dec 2 15:43:43 UTC 2011 - co...@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Wed Oct 5 22:17:35 UTC 2011 - jeng...@medozas.de
+
+- Initial package for build.opensuse.org
New:
----
glusterd.service
glusterfs-3.4.0alpha.tar.xz
glusterfs-date.diff
glusterfs.changes
glusterfs.spec
multifrag.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glusterfs.spec ++++++
#
# spec file for package glusterfs
#
# Copyright (c) 2015 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# 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/
#
Name: glusterfs
%define lname_api libgfapi0
%define lname_rpc libgfrpc0
%define lname_xdr libgfxdr0
%define lname_gf libglusterfs0
Version: 3.4.0~qa9
Release: 0
%define rversion 3.4.0alpha
Summary: Aggregating distributed file system
License: GPL-2.0 or LGPL-3.0+
Group: System/Filesystems
Url: http://gluster.org/
#Git-Clone: git://github.com/gluster/glusterfs
#Git-Clone: git://github.com/fvzwieten/lsgvt
Source: %name-%rversion.tar.xz
Source3: glusterd.service
Patch1: glusterfs-date.diff
Patch2: multifrag.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: libaio-devel
BuildRequires: pkgconfig
BuildRequires: python
BuildRequires: readline-devel
BuildRequires: xz
%if 0%{?sles_version} == 11
BuildRequires: fuse-devel >= 2.6.5
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
%else
BuildRequires: pkgconfig(fuse) >= 2.6.5
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(uuid)
%endif
%if 0%{?suse_version} >= 1210
BuildRequires: systemd
%endif
Requires: python
%description
GlusterFS is a clustered file-system capable of scaling to several
petabytes. It aggregates various storage bricks over Infiniband RDMA
or TCP/IP interconnect into one large parallel network file system.
GlusterFS is one of the most sophisticated file systems in terms of
features and extensibility. It borrows a powerful concept called
Translators from GNU Hurd kernel. Much of the code in GlusterFS is in
user space and easily manageable.
%package -n %lname_api
Summary: GlusterFS API library
Group: System/Libraries
%description -n %lname_api
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package -n %lname_rpc
Summary: GlusterFS Remote Procedure Call library
Group: System/Libraries
%description -n %lname_rpc
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package -n %lname_xdr
Summary: GlusterFS's External Data Representation library
Group: System/Libraries
%description -n %lname_xdr
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package -n %lname_gf
Summary: GlusterFS's core library
Group: System/Libraries
%description -n %lname_gf
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package devel
Summary: Development files for glusterfs
Group: Development/Libraries/C and C++
Requires: %lname_api = %version
Requires: %lname_gf = %version
Requires: %lname_rpc = %version
Requires: %lname_xdr = %version
Requires: %name = %version
%description devel
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
This package provides development files such as headers and library
links.
%prep
%setup -qn %name-%rversion
%patch -P 1 -P 2 -p1
%build
%configure --disable-static
# This section is not parallel safe or so due to bison/lex
make -C libglusterfs/src
make %{?_smp_mflags};
%install
b="%buildroot";
make install DESTDIR="$b" docdir="%_docdir/%name"
find "$b/%_libdir" -type f -name "*.la" -delete;
mkdir -p "$b/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd};
# The things seemingly forgotten by make install.
# - Manually populate devel dirs
mkdir -p "$b/%_includedir/%name";
install -pm0644 libglusterfs/src/*.h "$b/%_includedir/%name/";
# - hekafs wants this:
mkdir -p "$b/%_includedir/%name"/{rpc,server};
install -pm0644 rpc/rpc-lib/src/*.h rpc/xdr/src/*.h \
"$b/%_includedir/%name/rpc/";
install -pm0644 xlators/protocol/server/src/*.h \
"$b/%_includedir/%name/server/";
# - init script; there is no SuSE-release in the build env
mkdir -p "$b/%_initrddir";
install -pm0755 extras/init.d/glusterd-SuSE "$b/%_initrddir/glusterd";
# - wrapper umount script?
# - logrotate entry
mkdir -p "$b/%_localstatedir/log/%name";
# - vim syntax
# - state
mkdir -p "$b/%_localstatedir/lib/glusterd";
perl -i -pe \
's{^(\s*option working-directory )\S+}{$1
%_localstatedir/lib/glusterd}g' \
"$b/%_sysconfdir/%name/glusterd.vol";
# Clean, but must NOT remove .la from dirs not searched by
# default, thus maxdepth.
find "$b/%_libdir" -maxdepth 1 -type f -name "*.la" -delete;
# W: wrong-file-end-of-line-encoding
perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
%if 0%{?_unitdir:1}
mkdir -p "$b/%_unitdir";
install -pm0644 "%{S:3}" "$b/%_unitdir/";
%endif
%fdupes %buildroot
%pre
%service_add_pre glusterd.service
%post
%service_add_post glusterd.service
%preun
%service_del_preun glusterd.service
%postun
%service_del_postun glusterd.service
%post -n %lname_api -p /sbin/ldconfig
%postun -n %lname_api -p /sbin/ldconfig
%post -n %lname_rpc -p /sbin/ldconfig
%postun -n %lname_rpc -p /sbin/ldconfig
%post -n %lname_xdr -p /sbin/ldconfig
%postun -n %lname_xdr -p /sbin/ldconfig
%post -n %lname_gf -p /sbin/ldconfig
%postun -n %lname_gf -p /sbin/ldconfig
%files
%defattr(-,root,root)
%_initrddir/glusterd
%dir %_sysconfdir/%name
%config(noreplace) %_sysconfdir/%name/glusterd.vol
%config(noreplace) %_sysconfdir/%name/glusterfs-logrotate
#%config %_sysconfdir/%name/*.sample
/sbin/mount.%name
%_libexecdir/%name
%_libdir/%name
%_sbindir/gluster*
%_mandir/man*/*
%_docdir/%name
%_localstatedir/lib/glusterd
%_localstatedir/log/%name
%if 0%{?_unitdir:1}
%_unitdir/glusterd.service
%endif
%_prefix/lib/ocf
%files -n %lname_api
%defattr(-,root,root)
%_libdir/libgfapi.so.0*
%files -n %lname_rpc
%defattr(-,root,root)
%_libdir/libgfrpc.so.0*
%files -n %lname_xdr
%defattr(-,root,root)
%_libdir/libgfxdr.so.0*
%files -n %lname_gf
%defattr(-,root,root)
%_libdir/libglusterfs.so.0*
%files devel
%defattr(-,root,root)
%_includedir/%name
%_libdir/*.so
%_libdir/pkgconfig/*.pc
%changelog
++++++ glusterd.service ++++++
[Unit]
Description=Gluster elastic volume management daemon
[Service]
ExecStart=/usr/sbin/glusterd -N
[Install]
WantedBy=multi-user.target
++++++ glusterfs-date.diff ++++++
From: Jan Engelhardt <jeng...@medozas.de>
Date: 2011-10-05 13:17:29.728670235 +0200
Upstream: hell yes
build: remove __DATE__ and __TIME__ flagged by rpmlint
glusterfs.x86_64: W: file-contains-date-and-time /usr/sbin/glusterfsd
glusterfs.x86_64: W: file-contains-date-and-time /usr/sbin/gluster
Your file uses __DATE and __TIME__ this causes the package to rebuild when
not needed
---
cli/src/cli.c | 2 +-
glusterfsd/src/glusterfsd.c | 2 +-
libglusterfs/src/graph.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Index: glusterfs-3.4.0alpha/cli/src/cli.c
===================================================================
--- glusterfs-3.4.0alpha.orig/cli/src/cli.c
+++ glusterfs-3.4.0alpha/cli/src/cli.c
@@ -70,7 +70,7 @@ extern int connected;
/* using argp for command line parsing */
const char *argp_program_version = "" \
- PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__ \
+ PACKAGE_NAME" "PACKAGE_VERSION \
"\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n" \
"Copyright (c) 2006-2011 Gluster Inc. " \
"<http://www.gluster.com>\n" \
Index: glusterfs-3.4.0alpha/glusterfsd/src/glusterfsd.c
===================================================================
--- glusterfs-3.4.0alpha.orig/glusterfsd/src/glusterfsd.c
+++ glusterfs-3.4.0alpha/glusterfsd/src/glusterfsd.c
@@ -80,7 +80,7 @@ static char gf_doc[] = "";
static char argp_doc[] = "--volfile-server=SERVER [MOUNT-POINT]\n" \
"--volfile=VOLFILE [MOUNT-POINT]";
const char *argp_program_version = ""
- PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__
+ PACKAGE_NAME" "PACKAGE_VERSION" built on *bleep* "
"\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n"
"Copyright (c) 2006-2013 Red Hat, Inc. <http://www.redhat.com/>\n"
"GlusterFS comes with ABSOLUTELY NO WARRANTY.\n"
Index: glusterfs-3.4.0alpha/libglusterfs/src/graph.c
===================================================================
--- glusterfs-3.4.0alpha.orig/libglusterfs/src/graph.c
+++ glusterfs-3.4.0alpha/libglusterfs/src/graph.c
@@ -40,8 +40,8 @@ _gf_dump_details (int argc, char **argv)
fprintf (gf_log_logfile,
"========================================"
"========================================\n");
- fprintf (gf_log_logfile, "Version : %s %s built on %s %s\n",
- PACKAGE_NAME, PACKAGE_VERSION, __DATE__, __TIME__);
+ fprintf (gf_log_logfile, "Version : %s %s\n",
+ PACKAGE_NAME, PACKAGE_VERSION);
fprintf (gf_log_logfile, "git: %s\n",
GLUSTERFS_REPOSITORY_REVISION);
fprintf (gf_log_logfile, "Starting Time: %s\n", timestr);
++++++ multifrag.diff ++++++
commit ab0547eba39b155246f0d9f09e9a580665c6053f
Author: Niels de Vos <nde...@redhat.com>
Date: Thu Sep 25 12:08:47 2014 +0200
socket: Fixed parsing RPC records containing multi fragments
In __socket_proto_state_machine(), when parsing RPC records containing
multi fragments, just change the state of parsing process, had not
processed the memory to coalesce the multi fragments.
Cherry picked from commit fb6702b7f8ba19333b7ba4af543d908e3f5e1923:
> Change-Id: I5583e578603bd7290814a5d26885b31759c73115
> BUG: 1139598
> Signed-off-by: Gu Feng <flygo...@126.com>
> Reviewed-on: http://review.gluster.org/8662
> Tested-by: Gluster Build System <jenk...@build.gluster.com>
> Reviewed-by: Niels de Vos <nde...@redhat.com>
> Reviewed-by: Raghavendra G <rgowd...@redhat.com>
> Tested-by: Raghavendra G <rgowd...@redhat.com>
Change-Id: I5583e578603bd7290814a5d26885b31759c73115
BUG: 1146470
Signed-off-by: Niels de Vos <nde...@redhat.com>
Reviewed-on: http://review.gluster.org/8849
Tested-by: Gluster Build System <jenk...@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeit...@redhat.com>
diff --git a/rpc/rpc-transport/socket/src/socket.c
b/rpc/rpc-transport/socket/src/socket.c
index 943071b..c2e6d73 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -382,10 +382,11 @@ __socket_cached_read (rpc_transport_t *this, struct iovec
*opvector, int opcount
/* first call after passing SP_STATE_READING_FRAGHDR */
in->ra_max = min (RPC_FRAGSIZE (in->fraghdr), GF_SOCKET_RA_MAX);
/* Note that the in->iobuf is the primary iobuf into which
- headers are read into. By using this itself as our
+ headers are read into, and in->frag.fragcurrent points to
+ some position in the buffer. By using this itself as our
read-ahead cache, we can avoid memory copies in iov_load
*/
- in->ra_buf = iobuf_ptr (in->iobuf);
+ in->ra_buf = in->frag.fragcurrent;
}
/* fill read-ahead */
@@ -1987,9 +1988,22 @@ __socket_proto_state_machine (rpc_transport_t *this,
goto out;
}
+ if (in->iobuf == NULL) {
+ /* first fragment */
+ frag->fragcurrent = iobuf_ptr (iobuf);
+ } else {
+ /* second or further fragment */
+ memcpy(iobuf_ptr (iobuf), iobuf_ptr (in->iobuf),
+ in->total_bytes_read -
RPC_FRAGSIZE(in->fraghdr));
+ iobuf_unref (in->iobuf);
+ frag->fragcurrent = (char *) iobuf_ptr (iobuf) +
+ in->total_bytes_read -
RPC_FRAGSIZE(in->fraghdr);
+ frag->pending_vector->iov_base = frag->fragcurrent;
+ in->pending_vector = frag->pending_vector;
+ }
+
in->iobuf = iobuf;
in->iobuf_size = 0;
- frag->fragcurrent = iobuf_ptr (iobuf);
in->record_state = SP_STATE_READING_FRAG;
/* fall through */
@@ -2004,6 +2018,9 @@ __socket_proto_state_machine (rpc_transport_t *this,
frag->bytes_read = 0;
if (!RPC_LASTFRAG (in->fraghdr)) {
+ in->pending_vector = in->vector;
+ in->pending_vector->iov_base = &in->fraghdr;
+ in->pending_vector->iov_len =
sizeof(in->fraghdr);
in->record_state = SP_STATE_READING_FRAGHDR;
break;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
