From f20c2ed1f939b148b1e068d2de02fcccde6a0b79 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 30 Mar 2017 15:23:15 -0400 Subject: [PATCH 01/19] 3.10.1 GA --- glusterfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index 58c4560..01efb0a 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -167,7 +167,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.0 +Version: 3.10.1 Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1309,6 +1309,9 @@ exit 0 %endif %changelog +* Thu Mar 30 2017 Kaleb S. KEITHLEY - 3.10.1-1 +- 3.10.1 GA + * Thu Feb 23 2017 Kaleb S. KEITHLEY - 3.10.0-1 - 3.10.0 GA From 0f0a3c76e6b4023af3bb231678e04545651935e7 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 30 Mar 2017 15:41:11 -0400 Subject: [PATCH 02/19] 3.10.1 GA --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 10277d9..6ff1e62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.0.tar.gz) = eeb6ef61e33b9a5afd59802aa641d67ac9b48dc1d1e08c302a744765b3f63dc479cd13b41df9e874dc2a194b038e85d1f94209112df4269d8b00cd5bf6b05449 +SHA512 (glusterfs-3.10.1.tar.gz) = 35acf10d37db7ca9cf7d88e4eabcac4febdccfe15cbe68df86c44042987547f3a56447a1ced5ed238d171efdbcb97dd1fc6917283641bdcd7d476deb37ad0871 From ab98b3c4b2e3a12e5548a8ae943441fc338ee210 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 15 May 2017 09:50:07 -0400 Subject: [PATCH 03/19] 3.10.2 GA --- glusterfs-3.10.2.patch | 40 ++++++++++++++++++++++++++++++++++++++++ glusterfs.spec | 7 ++++++- sources | 2 +- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 glusterfs-3.10.2.patch diff --git a/glusterfs-3.10.2.patch b/glusterfs-3.10.2.patch new file mode 100644 index 0000000..11581f8 --- /dev/null +++ b/glusterfs-3.10.2.patch @@ -0,0 +1,40 @@ +diff --git a/configure.ac b/configure.ac +index c9742e2..0eebcda 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1056,24 +1056,28 @@ old_prefix=$prefix + if test "x$prefix" = xNONE; then + prefix=$ac_default_prefix + fi +-GLUSTERFS_LIBEXECDIR="$libexecdir/glusterfs" +-GLUSTERFSD_MISCDIR="$prefix/var/lib/misc/glusterfsd" ++old_exec_prefix=$exec_prefix ++if test "x$exec_prefix" = xNONE; then ++ exec_prefix="$(eval echo $prefix)" ++fi ++GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" ++GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" + prefix=$old_prefix ++exec_prefix=$old_exec_prefix + + ### Dirty hacky stuff to make LOCALSTATEDIR work + if test "x$prefix" = xNONE; then +- test $localstatedir = '$prefix/var' && localstatedir=$ac_default_prefix/var ++ test $localstatedir = '${prefix}/var' && localstatedir=$ac_default_prefix/var + localstatedir=/var +- LOCALSTATEDIR=$localstatedir +-else +- LOCALSTATEDIR=$localstatedir + fi ++localstatedir="$(eval echo ${localstatedir})" ++LOCALSTATEDIR=$localstatedir + + old_prefix=$prefix + if test "x$prefix" = xNONE; then + prefix=$ac_default_prefix + fi +-GLUSTERD_VOLFILE="$sysconfdir/glusterfs/glusterd.vol" ++GLUSTERD_VOLFILE="$(eval echo ${sysconfdir})/glusterfs/glusterd.vol" + prefix=$old_prefix + + diff --git a/glusterfs.spec b/glusterfs.spec index 01efb0a..25751a1 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -167,7 +167,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.1 +Version: 3.10.2 Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -187,6 +187,7 @@ Source8: glusterfsd.init %else Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz %endif +Patch0: glusterfs-3.10.2.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -658,6 +659,7 @@ This package provides the glusterfs server daemon. %prep %setup -q -n %{name}-%{version}%{?prereltag} +%patch0 -p1 %build %if ( 0%{?rhel} && 0%{?rhel} < 6 ) @@ -1309,6 +1311,9 @@ exit 0 %endif %changelog +* Sun May 14 2017 Kaleb S. KEITHLEY - 3.10.2-1 +- 3.10.2 GA + * Thu Mar 30 2017 Kaleb S. KEITHLEY - 3.10.1-1 - 3.10.1 GA diff --git a/sources b/sources index 6ff1e62..72fbc3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.1.tar.gz) = 35acf10d37db7ca9cf7d88e4eabcac4febdccfe15cbe68df86c44042987547f3a56447a1ced5ed238d171efdbcb97dd1fc6917283641bdcd7d476deb37ad0871 +SHA512 (glusterfs-3.10.2.tar.gz) = 7556970cd8c790485c17cf89851fdd7ca7e1b53071f60456f3faa0c73c8ef723e1bbb8e1e32b9e33a5670f12dde41ec84d644db08a6e19754705d82596312b79 From a9286e7caca2b8ccbc35f76c04966814d24d1cb8 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 1 Jun 2017 06:27:19 -0400 Subject: [PATCH 04/19] 3.10.3 GA --- glusterfs-3.10.2.patch | 40 ---------------------------------------- glusterfs.spec | 7 ++++--- sources | 2 +- 3 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 glusterfs-3.10.2.patch diff --git a/glusterfs-3.10.2.patch b/glusterfs-3.10.2.patch deleted file mode 100644 index 11581f8..0000000 --- a/glusterfs-3.10.2.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index c9742e2..0eebcda 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1056,24 +1056,28 @@ old_prefix=$prefix - if test "x$prefix" = xNONE; then - prefix=$ac_default_prefix - fi --GLUSTERFS_LIBEXECDIR="$libexecdir/glusterfs" --GLUSTERFSD_MISCDIR="$prefix/var/lib/misc/glusterfsd" -+old_exec_prefix=$exec_prefix -+if test "x$exec_prefix" = xNONE; then -+ exec_prefix="$(eval echo $prefix)" -+fi -+GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" -+GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" - prefix=$old_prefix -+exec_prefix=$old_exec_prefix - - ### Dirty hacky stuff to make LOCALSTATEDIR work - if test "x$prefix" = xNONE; then -- test $localstatedir = '$prefix/var' && localstatedir=$ac_default_prefix/var -+ test $localstatedir = '${prefix}/var' && localstatedir=$ac_default_prefix/var - localstatedir=/var -- LOCALSTATEDIR=$localstatedir --else -- LOCALSTATEDIR=$localstatedir - fi -+localstatedir="$(eval echo ${localstatedir})" -+LOCALSTATEDIR=$localstatedir - - old_prefix=$prefix - if test "x$prefix" = xNONE; then - prefix=$ac_default_prefix - fi --GLUSTERD_VOLFILE="$sysconfdir/glusterfs/glusterd.vol" -+GLUSTERD_VOLFILE="$(eval echo ${sysconfdir})/glusterfs/glusterd.vol" - prefix=$old_prefix - - diff --git a/glusterfs.spec b/glusterfs.spec index 25751a1..39f46f1 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -167,7 +167,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.2 +Version: 3.10.3 Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -187,7 +187,6 @@ Source8: glusterfsd.init %else Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz %endif -Patch0: glusterfs-3.10.2.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -659,7 +658,6 @@ This package provides the glusterfs server daemon. %prep %setup -q -n %{name}-%{version}%{?prereltag} -%patch0 -p1 %build %if ( 0%{?rhel} && 0%{?rhel} < 6 ) @@ -1311,6 +1309,9 @@ exit 0 %endif %changelog +* Thu Jun 1 2017 Kaleb S. KEITHLEY - 3.10.3-1 +- 3.10.3 GA + * Sun May 14 2017 Kaleb S. KEITHLEY - 3.10.2-1 - 3.10.2 GA diff --git a/sources b/sources index 72fbc3c..f4114e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.2.tar.gz) = 7556970cd8c790485c17cf89851fdd7ca7e1b53071f60456f3faa0c73c8ef723e1bbb8e1e32b9e33a5670f12dde41ec84d644db08a6e19754705d82596312b79 +SHA512 (glusterfs-3.10.3.tar.gz) = 1db946faaa88bebdf2daeea5e1f9c4074743ac3aa9a9d84a8d7b9e539089ed1394fc76c289c33ca0ceed884b005a8e3b7b1723bc5e669c029eaafdd437731461 From f13655b59b095a56d46854e50cc32ecabb051966 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 6 Jul 2017 06:16:34 -0400 Subject: [PATCH 05/19] 3.10.4 GA --- glusterfs.spec | 21 ++++++++++++++++++++- sources | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 39f46f1..69a91d2 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -167,7 +167,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.3 +Version: 3.10.4 Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -441,6 +441,10 @@ Requires: pcs, dbus %if ( 0%{?rhel} && 0%{?rhel} == 6 ) Requires: cman, pacemaker, corosync %endif +%if ( 0%{?fedora} && 0%{?fedora} > 25 ) +Requires(post): policycoreutils-python-utils +Requires(postun): policycoreutils-python-utils +%endif %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 5 ) # we need portblock resource-agent in 3.9.5 and later. Requires: resource-agents >= 3.9.5 @@ -832,6 +836,12 @@ modprobe fuse exit 0 %endif +%if ( 0%{?fedora} && 0%{?fedora} > 25 ) +%post ganesha +semanage boolean -m ganesha_use_fusefs --on +exit 0 +%endif + %if ( 0%{!?_without_georeplication:1} ) %post geo-replication if [ $1 -ge 1 ]; then @@ -965,6 +975,12 @@ exit 0 /sbin/ldconfig exit 0 +%if ( 0%{?fedora} && 0%{?fedora} > 25 ) +%postun ganesha +semanage boolean -m ganesha_use_fusefs --off +exit 0 +%endif + %postun libs /sbin/ldconfig exit 0 @@ -1309,6 +1325,9 @@ exit 0 %endif %changelog +* Thu Jul 6 2017 Kaleb S. KEITHLEY - 3.10.4-1 +- 3.10.4 GA + * Thu Jun 1 2017 Kaleb S. KEITHLEY - 3.10.3-1 - 3.10.3 GA diff --git a/sources b/sources index f4114e4..f7de5ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.3.tar.gz) = 1db946faaa88bebdf2daeea5e1f9c4074743ac3aa9a9d84a8d7b9e539089ed1394fc76c289c33ca0ceed884b005a8e3b7b1723bc5e669c029eaafdd437731461 +SHA512 (glusterfs-3.10.4.tar.gz) = e006063c11776ea53c8a7e3bd3f6bcd01eaeddad5be6da84725a89182c78e6be199f507c14e14d8233c891adef7dc2f1a8d6599d22b8d6897dbfb3669b24434f From 7bb38cda8bae0758359d4e27144ee176ab0d96d6 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 26 Jul 2017 13:59:19 -0400 Subject: [PATCH 06/19] 3.10.4, bz #1473197 --- account-server.conf | 16 -- container-server.conf | 18 -- gluster-swift-account-auditor.service | 12 -- gluster-swift-account-auditor@.service | 11 - gluster-swift-account-reaper.service | 11 - gluster-swift-account-reaper@.service | 11 - gluster-swift-account-replicator.service | 12 -- gluster-swift-account-replicator@.service | 11 - gluster-swift-account.init | 78 ------- gluster-swift-account.service | 11 - gluster-swift-account@.service | 11 - gluster-swift-container-auditor.service | 11 - gluster-swift-container-auditor@.service | 11 - gluster-swift-container-replicator.service | 12 -- gluster-swift-container-replicator@.service | 11 - gluster-swift-container-updater.service | 11 - gluster-swift-container-updater@.service | 11 - gluster-swift-container.init | 78 ------- gluster-swift-container.service | 11 - gluster-swift-container@.service | 11 - gluster-swift-functions | 64 ------ gluster-swift-object-auditor.service | 12 -- gluster-swift-object-auditor@.service | 11 - gluster-swift-object-expirer.service | 11 - gluster-swift-object-expirer@.service | 11 - gluster-swift-object-replicator.service | 12 -- gluster-swift-object-replicator@.service | 11 - gluster-swift-object-updater.service | 11 - gluster-swift-object-updater@.service | 11 - gluster-swift-object.init | 79 ------- gluster-swift-object.service | 11 - gluster-swift-object@.service | 11 - gluster-swift-proxy.init | 79 ------- gluster-swift-proxy.service | 11 - gluster-swift.tmpfs | 6 - glusterfs.spec | 215 +++++++++++--------- object-expirer.conf | 17 -- object-server.conf | 16 -- proxy-server.conf | 39 ---- swift.conf | 2 - 40 files changed, 122 insertions(+), 887 deletions(-) delete mode 100644 account-server.conf delete mode 100644 container-server.conf delete mode 100644 gluster-swift-account-auditor.service delete mode 100644 gluster-swift-account-auditor@.service delete mode 100644 gluster-swift-account-reaper.service delete mode 100644 gluster-swift-account-reaper@.service delete mode 100644 gluster-swift-account-replicator.service delete mode 100644 gluster-swift-account-replicator@.service delete mode 100755 gluster-swift-account.init delete mode 100644 gluster-swift-account.service delete mode 100644 gluster-swift-account@.service delete mode 100644 gluster-swift-container-auditor.service delete mode 100644 gluster-swift-container-auditor@.service delete mode 100644 gluster-swift-container-replicator.service delete mode 100644 gluster-swift-container-replicator@.service delete mode 100644 gluster-swift-container-updater.service delete mode 100644 gluster-swift-container-updater@.service delete mode 100755 gluster-swift-container.init delete mode 100644 gluster-swift-container.service delete mode 100644 gluster-swift-container@.service delete mode 100644 gluster-swift-functions delete mode 100644 gluster-swift-object-auditor.service delete mode 100644 gluster-swift-object-auditor@.service delete mode 100644 gluster-swift-object-expirer.service delete mode 100644 gluster-swift-object-expirer@.service delete mode 100644 gluster-swift-object-replicator.service delete mode 100644 gluster-swift-object-replicator@.service delete mode 100644 gluster-swift-object-updater.service delete mode 100644 gluster-swift-object-updater@.service delete mode 100755 gluster-swift-object.init delete mode 100644 gluster-swift-object.service delete mode 100644 gluster-swift-object@.service delete mode 100755 gluster-swift-proxy.init delete mode 100644 gluster-swift-proxy.service delete mode 100644 gluster-swift.tmpfs delete mode 100644 object-expirer.conf delete mode 100644 object-server.conf delete mode 100644 proxy-server.conf delete mode 100644 swift.conf diff --git a/account-server.conf b/account-server.conf deleted file mode 100644 index 1ffca8b..0000000 --- a/account-server.conf +++ /dev/null @@ -1,16 +0,0 @@ -[DEFAULT] -bind_ip = 127.0.0.1 -bind_port = 6012 -workers = 2 - -[pipeline:main] -pipeline = account-server - -[app:account-server] -use = egg:swift#account - -[account-replicator] - -[account-auditor] - -[account-reaper] diff --git a/container-server.conf b/container-server.conf deleted file mode 100644 index fa0de88..0000000 --- a/container-server.conf +++ /dev/null @@ -1,18 +0,0 @@ -[DEFAULT] -bind_ip = 127.0.0.1 -bind_port = 6011 -workers = 2 - -[pipeline:main] -pipeline = container-server - -[app:container-server] -use = egg:swift#container - -[container-replicator] - -[container-updater] - -[container-auditor] - -[container-sync] diff --git a/gluster-swift-account-auditor.service b/gluster-swift-account-auditor.service deleted file mode 100644 index 35413ce..0000000 --- a/gluster-swift-account-auditor.service +++ /dev/null @@ -1,12 +0,0 @@ -# After network.target just because. -[Unit] -Description=OpenStack Object Storage (swift) - Account Auditor -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-auditor /etc/swift/account-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-account-auditor@.service b/gluster-swift-account-auditor@.service deleted file mode 100644 index 8b44df9..0000000 --- a/gluster-swift-account-auditor@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Auditor instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-auditor /etc/swift/account-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-account-reaper.service b/gluster-swift-account-reaper.service deleted file mode 100644 index dd6fb00..0000000 --- a/gluster-swift-account-reaper.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Reaper -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-reaper /etc/swift/account-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-account-reaper@.service b/gluster-swift-account-reaper@.service deleted file mode 100644 index dbd5aa4..0000000 --- a/gluster-swift-account-reaper@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Reaper instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-reaper /etc/swift/account-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-account-replicator.service b/gluster-swift-account-replicator.service deleted file mode 100644 index 0cad889..0000000 --- a/gluster-swift-account-replicator.service +++ /dev/null @@ -1,12 +0,0 @@ -# After network.target just so replicator can talk to other nodes. -[Unit] -Description=OpenStack Object Storage (swift) - Account Replicator -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-replicator /etc/swift/account-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-account-replicator@.service b/gluster-swift-account-replicator@.service deleted file mode 100644 index 65fbaa3..0000000 --- a/gluster-swift-account-replicator@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Replicator instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-replicator /etc/swift/account-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-account.init b/gluster-swift-account.init deleted file mode 100755 index 4f1dbfd..0000000 --- a/gluster-swift-account.init +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: gluster-swift-account -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Default-Stop: 0 1 6 -# Short-Description: Swift account server -# Description: Account server for swift. -### END INIT INFO - -# gluster-swift-account: swift account server -# -# chkconfig: - 20 80 -# description: Account server for swift. - -. /etc/rc.d/init.d/functions -. /usr/share/gluster-swift/functions - -name="account" - -[ -e "/etc/sysconfig/gluster-swift-$name" ] && . "/etc/sysconfig/gluster-swift-$name" - -lockfile="/var/lock/subsys/gluster-swift-account" - -start() { - swift_action "$name" start - retval=$? - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - swift_action "$name" stop - retval=$? - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -rh_status() { - swift_action "$name" status -} - -rh_status_q() { - rh_status &> /dev/null -} - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}" - exit 2 -esac -exit $? diff --git a/gluster-swift-account.service b/gluster-swift-account.service deleted file mode 100644 index 782b06a..0000000 --- a/gluster-swift-account.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Server -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-server /etc/swift/account-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-account@.service b/gluster-swift-account@.service deleted file mode 100644 index cae48c7..0000000 --- a/gluster-swift-account@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Account Server instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-account-server /etc/swift/account-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-container-auditor.service b/gluster-swift-container-auditor.service deleted file mode 100644 index 6359b91..0000000 --- a/gluster-swift-container-auditor.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Auditor -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-auditor /etc/swift/container-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-container-auditor@.service b/gluster-swift-container-auditor@.service deleted file mode 100644 index 7c046da..0000000 --- a/gluster-swift-container-auditor@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Auditor instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-auditor /etc/swift/container-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-container-replicator.service b/gluster-swift-container-replicator.service deleted file mode 100644 index 399f7b4..0000000 --- a/gluster-swift-container-replicator.service +++ /dev/null @@ -1,12 +0,0 @@ -# After network.target just so replicator can talk to other nodes. -[Unit] -Description=OpenStack Object Storage (swift) - Container Replicator -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-replicator /etc/swift/container-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-container-replicator@.service b/gluster-swift-container-replicator@.service deleted file mode 100644 index 4803503..0000000 --- a/gluster-swift-container-replicator@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Replicator instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-replicator /etc/swift/container-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-container-updater.service b/gluster-swift-container-updater.service deleted file mode 100644 index 6efc57e..0000000 --- a/gluster-swift-container-updater.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Updater -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-updater /etc/swift/container-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-container-updater@.service b/gluster-swift-container-updater@.service deleted file mode 100644 index 19f99ff..0000000 --- a/gluster-swift-container-updater@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Updater instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-updater /etc/swift/container-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-container.init b/gluster-swift-container.init deleted file mode 100755 index 1d27989..0000000 --- a/gluster-swift-container.init +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: gluster-swift-container -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Default-Stop: 0 1 6 -# Short-Description: Swift container server -# Description: Container server for swift. -### END INIT INFO - -# gluster-swift-container: swift container server -# -# chkconfig: - 20 80 -# description: Container server for swift. - -. /etc/rc.d/init.d/functions -. /usr/share/gluster-swift/functions - -name="container" - -[ -e "/etc/sysconfig/gluster-swift-$name" ] && . "/etc/sysconfig/gluster-swift-$name" - -lockfile="/var/lock/subsys/gluster-swift-container" - -start() { - swift_action "$name" start - retval=$? - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - swift_action "$name" stop - retval=$? - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -rh_status() { - swift_action "$name" status -} - -rh_status_q() { - rh_status &> /dev/null -} - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}" - exit 2 -esac -exit $? diff --git a/gluster-swift-container.service b/gluster-swift-container.service deleted file mode 100644 index 6db2b51..0000000 --- a/gluster-swift-container.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Server -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-server /etc/swift/container-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-container@.service b/gluster-swift-container@.service deleted file mode 100644 index 4f51e3f..0000000 --- a/gluster-swift-container@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Container Server instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-container-server /etc/swift/container-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-functions b/gluster-swift-functions deleted file mode 100644 index 4b69ed8..0000000 --- a/gluster-swift-functions +++ /dev/null @@ -1,64 +0,0 @@ -# vim: filetype=sh - -. /etc/rc.d/init.d/functions - -swift_action() { - retval=0 - server="$1" - call="swift_$2" - - if [[ -f "/etc/swift/$server-server.conf" ]]; then - $call "$server" \ - "/etc/swift/$server-server.conf" \ - "/var/run/swift/$server-server.pid" - [ $? -ne 0 ] && retval=1 - elif [[ -d "/etc/swift/$server-server/" ]]; then - declare -i count=0 - mkdir -p /var/run/swift/$server-server - for name in $( ls "/etc/swift/$server-server/" ); do - $call "$server" \ - "/etc/swift/$server-server/$name" \ - "/var/run/swift/$server-server/$count.pid" - [ $? -ne 0 ] && retval=1 - count=$count+1 - done - fi - return $retval -} - -swift_start() { - name="$1" - long_name="$name-server" - conf_file="$2" - pid_file="$3" - - ulimit -n ${SWIFT_MAX_FILES-32768} - echo -n "Starting swift-$long_name: " - daemon --pidfile $pid_file \ - "/usr/bin/swift-$long_name $conf_file &>/var/log/swift-startup.log & echo \$! > $pid_file" - retval=$? - echo - return $retval -} - -swift_stop() { - name="$1" - long_name="$name-server" - conf_name="$2" - pid_file="$3" - - echo -n "Stopping swift-$long_name: " - killproc -p $pid_file -d ${SWIFT_STOP_DELAY-15} $long_name - retval=$? - echo - return $retval -} - -swift_status() { - name="$1" - long_name="$name-server" - conf_name="$2" - pid_file="$3" - - status -p $pid_file $long_name -} diff --git a/gluster-swift-object-auditor.service b/gluster-swift-object-auditor.service deleted file mode 100644 index 498d53e..0000000 --- a/gluster-swift-object-auditor.service +++ /dev/null @@ -1,12 +0,0 @@ -# After network.target just because. -[Unit] -Description=OpenStack Object Storage (swift) - Object Auditor -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-auditor /etc/swift/object-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-object-auditor@.service b/gluster-swift-object-auditor@.service deleted file mode 100644 index f5c2537..0000000 --- a/gluster-swift-object-auditor@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Auditor instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-auditor /etc/swift/object-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-object-expirer.service b/gluster-swift-object-expirer.service deleted file mode 100644 index 1438427..0000000 --- a/gluster-swift-object-expirer.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Expirer -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-expirer /etc/swift/object-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-object-expirer@.service b/gluster-swift-object-expirer@.service deleted file mode 100644 index e7d03c3..0000000 --- a/gluster-swift-object-expirer@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Expirer instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-expirer /etc/swift/object-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-object-replicator.service b/gluster-swift-object-replicator.service deleted file mode 100644 index be1d3fa..0000000 --- a/gluster-swift-object-replicator.service +++ /dev/null @@ -1,12 +0,0 @@ -# After network.target just so replicator can talk to other nodes. -[Unit] -Description=OpenStack Object Storage (swift) - Object Replicator -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-replicator /etc/swift/object-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-object-replicator@.service b/gluster-swift-object-replicator@.service deleted file mode 100644 index 7493398..0000000 --- a/gluster-swift-object-replicator@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Replicator instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-replicator /etc/swift/object-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-object-updater.service b/gluster-swift-object-updater.service deleted file mode 100644 index d9697a5..0000000 --- a/gluster-swift-object-updater.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Updater -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-updater /etc/swift/object-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-object-updater@.service b/gluster-swift-object-updater@.service deleted file mode 100644 index 9f223c7..0000000 --- a/gluster-swift-object-updater@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Updater instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-updater /etc/swift/object-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-object.init b/gluster-swift-object.init deleted file mode 100755 index f0fe540..0000000 --- a/gluster-swift-object.init +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: gluster-swift-object -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Default-Stop: 0 1 6 -# Short-Description: Swift object server -# Description: Object server for swift. -### END INIT INFO - -# gluster-swift-object: swift object server -# -# chkconfig: - 20 80 -# description: Object server for swift. - -. /etc/rc.d/init.d/functions -. /usr/share/gluster-swift/functions - -name="object" - -[ -e "/etc/sysconfig/gluster-swift-$name" ] && . "/etc/sysconfig/gluster-swift-$name" - -lockfile="/var/lock/subsys/gluster-swift-object" - -start() { - swift_action "$name" start - retval=$? - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - swift_action "$name" stop - retval=$? - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -rh_status() { - swift_action "$name" status -} - -rh_status_q() { - rh_status &> /dev/null -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}" - exit 2 -esac -exit $? diff --git a/gluster-swift-object.service b/gluster-swift-object.service deleted file mode 100644 index 1cd5020..0000000 --- a/gluster-swift-object.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Server -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-server /etc/swift/object-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-object@.service b/gluster-swift-object@.service deleted file mode 100644 index 172e322..0000000 --- a/gluster-swift-object@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Object Server instance %I -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-object-server /etc/swift/object-server/%i.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift-proxy.init b/gluster-swift-proxy.init deleted file mode 100755 index 052e05f..0000000 --- a/gluster-swift-proxy.init +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: gluster-swift-proxy -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Default-Stop: 0 1 6 -# Short-Description: Swift proxy server -# Description: Account server for swift. -### END INIT INFO - -# gluster-swift-proxy: swift proxy server -# -# chkconfig: - 20 80 -# description: Proxy server for swift. - -. /etc/rc.d/init.d/functions -. /usr/share/gluster-swift/functions - -name="proxy" - -[ -e "/etc/sysconfig/gluster-swift-$name" ] && . "/etc/sysconfig/gluster-swift-$name" - -lockfile="/var/lock/subsys/gluster-swift-proxy" - -start() { - swift_action "$name" start - retval=$? - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - swift_action "$name" stop - retval=$? - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -rh_status() { - swift_action "$name" status -} - -rh_status_q() { - rh_status &> /dev/null -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}" - exit 2 -esac -exit $? diff --git a/gluster-swift-proxy.service b/gluster-swift-proxy.service deleted file mode 100644 index 4078f50..0000000 --- a/gluster-swift-proxy.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Object Storage (swift) - Proxy Server -After=syslog.target network.target - -[Service] -Type=simple -User=swift -ExecStart=/usr/bin/swift-proxy-server /etc/swift/proxy-server.conf - -[Install] -WantedBy=multi-user.target diff --git a/gluster-swift.tmpfs b/gluster-swift.tmpfs deleted file mode 100644 index 8f4f5a5..0000000 --- a/gluster-swift.tmpfs +++ /dev/null @@ -1,6 +0,0 @@ -# swift needs a couple of directories in /var/run -d /var/run/swift 0755 swift root -d /var/run/swift/account-server 0755 swift root -d /var/run/swift/container-server 0755 swift root -d /var/run/swift/object-server 0755 swift root -d /var/run/swift/proxy-server 0755 swift root diff --git a/glusterfs.spec b/glusterfs.spec index 69a91d2..f1922ec 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -168,7 +168,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.10.4 -Release: 1%{?prereltag:.%{prereltag}}%{?dist} +Release: 2%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -1005,43 +1005,51 @@ exit 0 %if ( 0%{!?_without_rdma:1} ) %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma* %endif +%dir %{_datadir}/glusterfs %dir %{_datadir}/glusterfs/scripts -%{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh -%{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh + %{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh + %{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh # xlators that are needed on the client- and on the server-side +%dir %{_libdir}/glusterfs +%dir %{_libdir}/glusterfs/%{version}%{?prereltag} %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/auth -%{_libdir}/glusterfs/%{version}%{?prereltag}/auth/addr.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/auth/login.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/auth/addr.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/auth/login.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport -%{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/socket.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/socket.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/error-gen.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/io-stats.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/trace.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/error-gen.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/io-stats.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/trace.so %if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) ) # RHEL-5 based distributions have a too old openssl -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/crypt.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/crypt.so %endif -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/access-control.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cdc.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changelog.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-client.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/worm.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/meta.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-cache.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-threads.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/md-cache.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/open-behind.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/quick-read.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/read-ahead.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/readdir-ahead.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/stat-prefetch.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/write-behind.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/access-control.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cdc.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changelog.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-client.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/worm.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/meta.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-cache.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-threads.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/md-cache.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/open-behind.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/quick-read.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/read-ahead.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/readdir-ahead.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/stat-prefetch.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/write-behind.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so %dir %{_localstatedir}/run/gluster %if 0%{?_tmpfilesdir:1} %{_tmpfilesdir}/gluster.conf @@ -1051,12 +1059,14 @@ exit 0 %exclude %{_libdir}/*.so # libgfapi files %{_libdir}/libgfapi.* -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api.so %files api-devel %{_libdir}/pkgconfig/glusterfs-api.pc %{_libdir}/libgfapi.so -%{_includedir}/glusterfs/api/* +%dir %{_includedir}/glusterfs/api + %{_includedir}/glusterfs/api/* %files cli %{_sbindir}/gluster @@ -1064,40 +1074,44 @@ exit 0 %{_sysconfdir}/bash_completion.d/gluster %files client-xlators -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so - +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so %files devel %dir %{_includedir}/glusterfs -%{_includedir}/glusterfs/* + %{_includedir}/glusterfs/* %exclude %{_includedir}/glusterfs/api %exclude %{_libdir}/libgfapi.so %{_libdir}/*.so # Glupy Translator examples -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/debug-trace.* -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/helloworld.* -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/negative.* +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/debug-trace.* + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/helloworld.* + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/negative.* %{_libdir}/pkgconfig/libgfchangelog.pc %if ( 0%{!?_without_tiering:1} ) %{_libdir}/pkgconfig/libgfdb.pc %endif %files extra-xlators -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/features/template.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/features/template.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so # Glupy Python files -%{python2_sitelib}/gluster/glupy/* +%dir %{python2_sitelib}/gluster/glupy + %{python2_sitelib}/gluster/glupy/* %files fuse # glusterfs is a symlink to glusterfsd, -server depends on -fuse. %{_sbindir}/glusterfs %{_sbindir}/glusterfsd %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so /sbin/mount.glusterfs %if ( 0%{!?_without_fusermount:1} ) %{_bindir}/fusermount-glusterfs @@ -1120,15 +1134,17 @@ exit 0 %{_sbindir}/gfind_missing_files %{_sbindir}/gluster-mountbroker -%{_libexecdir}/glusterfs/gsyncd -%{_libexecdir}/glusterfs/python/syncdaemon/* -%{_libexecdir}/glusterfs/gverify.sh -%{_libexecdir}/glusterfs/set_geo_rep_pem_keys.sh -%{_libexecdir}/glusterfs/peer_gsec_create -%{_libexecdir}/glusterfs/peer_mountbroker -%{_libexecdir}/glusterfs/peer_mountbroker.py* -%{_libexecdir}/glusterfs/gfind_missing_files -%{_libexecdir}/glusterfs/peer_georep-sshkey.py* + %{_libexecdir}/glusterfs/gsyncd +%dir %{_libexecdir}/glusterfs/python +%dir %{_libexecdir}/glusterfs/python/syncdaemon + %{_libexecdir}/glusterfs/python/syncdaemon/* + %{_libexecdir}/glusterfs/gverify.sh + %{_libexecdir}/glusterfs/set_geo_rep_pem_keys.sh + %{_libexecdir}/glusterfs/peer_gsec_create + %{_libexecdir}/glusterfs/peer_mountbroker + %{_libexecdir}/glusterfs/peer_mountbroker.py* + %{_libexecdir}/glusterfs/gfind_missing_files + %{_libexecdir}/glusterfs/peer_georep-sshkey.py* %{_sbindir}/gluster-georep-sshkey @@ -1139,12 +1155,12 @@ exit 0 %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create/pre -%{_datadir}/glusterfs/scripts/get-gfid.sh -%{_datadir}/glusterfs/scripts/slave-upgrade.sh -%{_datadir}/glusterfs/scripts/gsync-upgrade.sh -%{_datadir}/glusterfs/scripts/generate-gfid-file.sh -%{_datadir}/glusterfs/scripts/gsync-sync-gfid -%{_datadir}/glusterfs/scripts/schedule_georep.py* + %{_datadir}/glusterfs/scripts/get-gfid.sh + %{_datadir}/glusterfs/scripts/slave-upgrade.sh + %{_datadir}/glusterfs/scripts/gsync-upgrade.sh + %{_datadir}/glusterfs/scripts/generate-gfid-file.sh + %{_datadir}/glusterfs/scripts/gsync-sync-gfid + %{_datadir}/glusterfs/scripts/schedule_georep.py* %endif %files libs @@ -1159,20 +1175,22 @@ exit 0 %files -n python2-gluster # introducing glusterfs module in site packages. # so that all other gluster submodules can reside in the same namespace. -%{python2_sitelib}/gluster/__init__.* -%{python2_sitelib}/gluster/cliutils +%dir %{python2_sitelib}/gluster + %{python2_sitelib}/gluster/__init__.* + %{python2_sitelib}/gluster/cliutils %if ( 0%{!?_without_rdma:1} ) %files rdma -%{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma* + %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma* %endif %if ( ! 0%{_for_fedora_koji_builds} ) %files regression-tests -%{_prefix}/share/glusterfs/run-tests.sh -%{_prefix}/share/glusterfs/tests -%{_datadir}/glusterfs/run-tests.sh -%{_datadir}/glusterfs/tests +%dir %{_prefix}/share/glusterfs + %{_prefix}/share/glusterfs/run-tests.sh +%dir %{_prefix}/share/glusterfs/tests + %{_datadir}/glusterfs/run-tests.sh + %{_datadir}/glusterfs/tests/* %exclude %{_datadir}/glusterfs/tests/vagrant %endif @@ -1206,26 +1224,31 @@ exit 0 # {_sbindir}/glusterfsd is the actual binary, but glusterfs (client) is a # symlink. The binary itself (and symlink) are part of the glusterfs-fuse # package, because glusterfs-server depends on that anyway. -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so %if ( 0%{!?_without_tiering:1} ) -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changetimerecorder.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changetimerecorder.so %endif -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix* -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota* -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt* -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs* -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server* -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage* -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix* + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota* + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt/glusterd.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/server.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/ + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/bd.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so %if ( 0%{!?_without_tiering:1} ) %{_libdir}/libgfdb.so.* %endif @@ -1296,12 +1319,13 @@ exit 0 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols # Extra utility script -%{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh + %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh # Incrementalapi -%{_libexecdir}/glusterfs/glusterfind +%dir %{_libexecdir}/glusterfs + %{_libexecdir}/glusterfs/glusterfind + %{_libexecdir}/glusterfs/peer_add_secret_pub %{_bindir}/glusterfind -%{_libexecdir}/glusterfs/peer_add_secret_pub %if ( 0%{?_with_firewalld:1} ) %{_prefix}/lib/firewalld/services/glusterfs.xml @@ -1311,12 +1335,14 @@ exit 0 %if ( 0%{!?_without_events:1} ) %files events %config(noreplace) %{_sysconfdir}/glusterfs/eventsconfig.json -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/events -%{_libexecdir}/glusterfs/events -%{_libexecdir}/glusterfs/peer_eventsapi.py* +%dir %{_sharedstatedir}/glusterd +%dir %{_sharedstatedir}/glusterd/events +%dir %{_libexecdir}/glusterfs/events + %{_libexecdir}/glusterfs/events/* + %{_libexecdir}/glusterfs/peer_eventsapi.py* %{_sbindir}/glustereventsd %{_sbindir}/gluster-eventsapi -%{_datadir}/glusterfs/scripts/eventsdash.py* + %{_datadir}/glusterfs/scripts/eventsdash.py* %if ( 0%{?_with_systemd:1} ) %{_unitdir}/glustereventsd.service %else @@ -1325,6 +1351,9 @@ exit 0 %endif %changelog +* Wed Jul 26 2017 Kaleb S. KEITHLEY - 3.10.4-2 +- 3.10.4, bz #1473197 + * Thu Jul 6 2017 Kaleb S. KEITHLEY - 3.10.4-1 - 3.10.4 GA diff --git a/object-expirer.conf b/object-expirer.conf deleted file mode 100644 index b75963c..0000000 --- a/object-expirer.conf +++ /dev/null @@ -1,17 +0,0 @@ -[DEFAULT] - -[object-expirer] -# auto_create_account_prefix = . - -[pipeline:main] -pipeline = catch_errors cache proxy-server - -[app:proxy-server] -use = egg:swift#proxy - -[filter:cache] -use = egg:swift#memcache -memcache_servers = 127.0.0.1:11211 - -[filter:catch_errors] -use = egg:swift#catch_errors diff --git a/object-server.conf b/object-server.conf deleted file mode 100644 index 3a3d9be..0000000 --- a/object-server.conf +++ /dev/null @@ -1,16 +0,0 @@ -[DEFAULT] -bind_ip = 127.0.0.1 -bind_port = 6010 -workers = 3 - -[pipeline:main] -pipeline = object-server - -[app:object-server] -use = egg:swift#object - -[object-replicator] - -[object-updater] - -[object-auditor] diff --git a/proxy-server.conf b/proxy-server.conf deleted file mode 100644 index 3e4b88a..0000000 --- a/proxy-server.conf +++ /dev/null @@ -1,39 +0,0 @@ -[DEFAULT] -bind_port = 8080 -workers = 8 -user = swift - -[pipeline:main] -pipeline = healthcheck cache authtoken keystone proxy-server - -[app:proxy-server] -use = egg:swift#proxy -allow_account_management = true -account_autocreate = true - -[filter:cache] -use = egg:swift#memcache -memcache_servers = 127.0.0.1:11211 - -[filter:catch_errors] -use = egg:swift#catch_errors - -[filter:healthcheck] -use = egg:swift#healthcheck - -[filter:keystone] -paste.filter_factory = keystone.middleware.swift_auth:filter_factory -operator_roles = admin, SwiftOperator -is_admin = true -cache = swift.cache - -[filter:authtoken] -paste.filter_factory = keystone.middleware.auth_token:filter_factory -admin_tenant_name = %SERVICE_TENANT_NAME% -admin_user = %SERVICE_USER% -admin_password = %SERVICE_PASSWORD% -auth_host = 127.0.0.1 -auth_port = 35357 -auth_protocol = http -signing_dir = /tmp/keystone-signing-swift - diff --git a/swift.conf b/swift.conf deleted file mode 100644 index adbd96f..0000000 --- a/swift.conf +++ /dev/null @@ -1,2 +0,0 @@ -[swift-hash] -swift_hash_path_suffix = %SWIFT_HASH_PATH_SUFFIX% From 722f80abb6d27cae0baf2b15583fb1c26c4ae0b5 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 27 Jul 2017 07:50:09 -0400 Subject: [PATCH 07/19] 3.10.4, bz #1473197, again --- glusterfs.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index f1922ec..3dbaba9 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -168,7 +168,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.10.4 -Release: 2%{?prereltag:.%{prereltag}}%{?dist} +Release: 3%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -1099,7 +1099,10 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/features %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/features/template.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so # Glupy Python files %dir %{python2_sitelib}/gluster/glupy @@ -1351,6 +1354,9 @@ exit 0 %endif %changelog +* Thu Jul 27 2017 Kaleb S. KEITHLEY - 3.10.4-3 +- 3.10.4, bz #1473197, again + * Wed Jul 26 2017 Kaleb S. KEITHLEY - 3.10.4-2 - 3.10.4, bz #1473197 From 935fbdbc9852067ec9732e67fee8cc61c158c2af Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Sat, 12 Aug 2017 11:29:59 -0400 Subject: [PATCH 08/19] 3.10.5 GA --- glusterfs.spec | 56 ++++++++++++++++++++++++++++++++++++++++++-------- sources | 2 +- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 3dbaba9..355f777 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -99,6 +99,9 @@ %if ( 0%{?rhel} && 0%{?rhel} < 7 ) %{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python2_sitearch: %global python2_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%global _rundir %{_localstatedir}/run +%else +%global _rundir /run %endif %if ( 0%{?_with_systemd:1} ) @@ -167,8 +170,8 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.4 -Release: 3%{?prereltag:.%{prereltag}}%{?dist} +Version: 3.10.5 +Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -722,7 +725,7 @@ install -D -p -m 0755 %{SOURCE6} \ mkdir -p %{buildroot}%{_localstatedir}/log/glusterd mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd -mkdir -p %{buildroot}%{_localstatedir}/run/gluster +mkdir -p %{buildroot}%{_rundir}/gluster # Remove unwanted files from all the shared libraries find %{buildroot}%{_libdir} -name '*.a' -delete @@ -772,6 +775,13 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha install -D -p -m 0644 extras/glusterfs-logrotate \ %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs +# ganesha ghosts +mkdir -p %{buildroot}%{_sysconfdir}/ganesha +touch %{buildroot}%{_sysconfdir}/ganesha/ganesha-ha.conf +mkdir -p %{buildroot}%{_rundir}/gluster/shared_storage/nfs-ganesha/exports +touch %{buildroot}%{_rundir}/gluster/shared_storage/nfs-ganesha/ganesha.conf +touch %{buildroot}%{_rundir}/gluster/shared_storage/nfs-ganesha/ganesha-ha.conf + %if ( 0%{!?_without_georeplication:1} ) # geo-rep ghosts mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/geo-replication @@ -912,7 +922,7 @@ if [ $? -eq 0 ]; then #Cleaning leftover glusterd socket file which is created by glusterd in #rpm_script_t context. - rm -rf /var/run/glusterd.socket + rm -f %{_rundir}/glusterd.socket # glusterd _was_ running, we killed it, it exited after *.upgrade=on, # so start it again @@ -922,7 +932,7 @@ else #Cleaning leftover glusterd socket file which is created by glusterd in #rpm_script_t context. - rm -rf /var/run/glusterd.socket + rm -f %{_rundir}/glusterd.socket fi exit 0 @@ -992,6 +1002,24 @@ exit 0 %endif exit 0 +##----------------------------------------------------------------------------- +## All %%trigger should be placed here and keep them sorted +## +%if ( 0%{?fedora} && 0%{?fedora} > 25 ) +%trigger ganesha -- selinux-policy-targeted +semanage boolean -m ganesha_use_fusefs --on +exit 0 +%endif + +##----------------------------------------------------------------------------- +## All %%triggerun should be placed here and keep them sorted +## +%if ( 0%{?fedora} && 0%{?fedora} > 25 ) +%triggerun ganesha -- selinux-policy-targeted +semanage boolean -m ganesha_use_fusefs --off +exit 0 +%endif + ##----------------------------------------------------------------------------- ## All %%files should be placed here and keep them sorted by groups ## @@ -1050,7 +1078,7 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/write-behind.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so -%dir %{_localstatedir}/run/gluster +%dir %{_rundir}/gluster %if 0%{?_tmpfilesdir:1} %{_tmpfilesdir}/gluster.conf %endif @@ -1126,10 +1154,17 @@ exit 0 %endif %files ganesha -%{_sysconfdir}/ganesha/* +%dir %{_libexecdir}/ganesha %{_libexecdir}/ganesha/* %{_prefix}/lib/ocf/resource.d/heartbeat/* %{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh +%{_sysconfdir}/ganesha/ganesha-ha.conf.sample +%ghost %config(noreplace) %{_sysconfdir}/ganesha/ganesha-ha.conf +%ghost %dir %{_rundir}/gluster/shared_storage/nfs-ganesha +%ghost %dir %{_rundir}/gluster/shared_storage/nfs-ganesha/exports +%ghost %config(noreplace) %{_rundir}/gluster/shared_storage/nfs-ganesha/ganesha.conf +%ghost %config(noreplace) %{_rundir}/gluster/shared_storage/nfs-ganesha/ganesha-ha.conf + %if ( 0%{!?_without_georeplication:1} ) %files geo-replication @@ -1208,7 +1243,7 @@ exit 0 # sysconf %config(noreplace) %{_sysconfdir}/glusterfs %exclude %{_sysconfdir}/glusterfs/eventsconfig.json -%dir %{_localstatedir}/run/gluster +%dir %{_rundir}/gluster %config(noreplace) %{_sysconfdir}/sysconfig/glusterd %if ( 0%{_for_fedora_koji_builds} ) %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd @@ -1313,7 +1348,7 @@ exit 0 %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid -%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options +%config(noreplace) %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/quotad %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/scrub @@ -1354,6 +1389,9 @@ exit 0 %endif %changelog +* Sat Aug 12 2017 Kaleb S. KEITHLEY - 3.10.5-1 +- 3.10.5 GA + * Thu Jul 27 2017 Kaleb S. KEITHLEY - 3.10.4-3 - 3.10.4, bz #1473197, again diff --git a/sources b/sources index f7de5ca..195f00b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.4.tar.gz) = e006063c11776ea53c8a7e3bd3f6bcd01eaeddad5be6da84725a89182c78e6be199f507c14e14d8233c891adef7dc2f1a8d6599d22b8d6897dbfb3669b24434f +SHA512 (glusterfs-3.10.5.tar.gz) = c83187545517527e59de41a0d431cd99f535bd47be93a5ea82a2a0fef4600c06d12f1e5b3e0963569680f2a02bf96ad0a380b9fb5077b473453613ec5e538776 From e43af053e2972d37f1bc2fe80264b9691919e03f Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 3 Oct 2017 10:14:07 -0400 Subject: [PATCH 09/19] 3.10.6 GA --- glusterfs.spec | 13 +++++++++---- sources | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 355f777..ff7c68c 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -22,7 +22,7 @@ %{?_without_rdma:%global _without_rdma --disable-ibverbs} # No RDMA Support on s390(x) -%ifarch s390 s390x +%ifarch s390 s390x %{arm} %global _without_rdma --disable-ibverbs %endif @@ -100,8 +100,6 @@ %{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python2_sitearch: %global python2_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %global _rundir %{_localstatedir}/run -%else -%global _rundir /run %endif %if ( 0%{?_with_systemd:1} ) @@ -170,7 +168,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.5 +Version: 3.10.6 Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -543,8 +541,12 @@ Obsoletes: python-gluster < 3.10 %package rdma Summary: GlusterFS rdma support for ib-verbs Group: Applications/File +%if ( 0%{?fedora} && 0%{?fedora} > 26 ) +BuildRequires: rdma-core-devel +%else BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel >= 1.0.15 +%endif Requires: %{name} = %{version}-%{release} %description rdma @@ -1389,6 +1391,9 @@ exit 0 %endif %changelog +* Tue Oct 3 2017 Kaleb S. KEITHLEY - 3.10.6-1 +- 3.10.6 GA + * Sat Aug 12 2017 Kaleb S. KEITHLEY - 3.10.5-1 - 3.10.5 GA diff --git a/sources b/sources index 195f00b..dd80a72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.5.tar.gz) = c83187545517527e59de41a0d431cd99f535bd47be93a5ea82a2a0fef4600c06d12f1e5b3e0963569680f2a02bf96ad0a380b9fb5077b473453613ec5e538776 +SHA512 (glusterfs-3.10.6.tar.gz) = db9e22c2992dc20e4542634c8c3406d082b0678fdd0678b6538877f9ee4f7d7a8eb01c8ec0183de5f2cf1031d440685f91d160636e423d19f049b64d1c8a0a6e From 07bf41ec876201dc9c4c2ce5cad7f6b47fef3dec Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 3 Oct 2017 15:22:25 -0400 Subject: [PATCH 10/19] 3.10.6 w/ BZ 1497990 --- glusterfs.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index ff7c68c..cf7ad0a 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -106,13 +106,13 @@ %if ( 0%{_for_fedora_koji_builds} ) %global _init_enable() /bin/true ; %else -%global _init_enable() /bin/systemctl enable %1.service ; +%global _init_enable() %systemd_post %1.service %endif -%global _init_disable() /bin/systemctl disable %1.service ; -%global _init_restart() /bin/systemctl try-restart %1.service ; -%global _init_start() /bin/systemctl start %1.service ; -%global _init_stop() /bin/systemctl stop %1.service ; -%global _init_install() install -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service ; +%global _init_disable() %systemd_preun %1.service +%global _init_restart() %systemd_postun_with_restart %1.service +%global _init_start() /bin/systemctl start %1.service +%global _init_stop() /bin/systemctl stop %1.service +%global _init_install() install -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service # can't seem to make a generic macro that works %global _init_glusterd %{_unitdir}/glusterd.service %global _init_glusterfsd %{_unitdir}/glusterfsd.service @@ -169,7 +169,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.10.6 -Release: 1%{?prereltag:.%{prereltag}}%{?dist} +Release: 2%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -1391,6 +1391,9 @@ exit 0 %endif %changelog +* Tue Oct 3 2017 Kaleb S. KEITHLEY - 3.10.6-2 +- 3.10.6 w/ BZ 1497990 + * Tue Oct 3 2017 Kaleb S. KEITHLEY - 3.10.6-1 - 3.10.6 GA From 734c10cc3e8f436f6535d2f15508cd44b83a5450 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 6 Oct 2017 13:38:42 -0400 Subject: [PATCH 11/19] 3.10.6 w/ BZ 1497990 again --- glusterfs.spec | 95 ++++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 45 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index cf7ad0a..cbb783d 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -103,31 +103,33 @@ %endif %if ( 0%{?_with_systemd:1} ) -%if ( 0%{_for_fedora_koji_builds} ) -%global _init_enable() /bin/true ; -%else -%global _init_enable() %systemd_post %1.service -%endif -%global _init_disable() %systemd_preun %1.service -%global _init_restart() %systemd_postun_with_restart %1.service -%global _init_start() /bin/systemctl start %1.service -%global _init_stop() /bin/systemctl stop %1.service -%global _init_install() install -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service +%global service_start() /bin/systemctl --quiet start %1.service || : \ +%{nil} +%global service_stop() /bin/systemctl --quiet stop %1.service || :\ +%{nil} +%global service_install() install -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service \ +%{nil} # can't seem to make a generic macro that works -%global _init_glusterd %{_unitdir}/glusterd.service -%global _init_glusterfsd %{_unitdir}/glusterfsd.service -%global _init_glustereventsd %{_unitdir}/glustereventsd.service +%global glusterd_svcfile %{_unitdir}/glusterd.service +%global glusterfsd_svcfile %{_unitdir}/glusterfsd.service +%global glustereventsd_svcfile %{_unitdir}/glustereventsd.service %else -%global _init_enable() /sbin/chkconfig --add %1 ; -%global _init_disable() /sbin/chkconfig --del %1 ; -%global _init_restart() /sbin/service %1 condrestart &>/dev/null ; -%global _init_start() /sbin/service %1 start &>/dev/null ; -%global _init_stop() /sbin/service %1 stop &>/dev/null ; -%global _init_install() install -D -p -m 0755 %1 %{buildroot}%{_sysconfdir}/init.d/%2 ; +%global systemd_post() /sbin/chkconfig --add %1 >/dev/null 2>&1 || : \ +%{nil} +%global systemd_preun() /sbin/chkconfig --del %1 >/dev/null 2>&1 || : \ +%{nil} +%global systemd_postun_with_restart() /sbin/service %1 condrestart >/dev/null 2>&1 || : \ +%{nil} +%global service_start() /sbin/service %1 start >/dev/null 2>&1 || : \ +%{nil} +%global service_stop() /sbin/service %1 stop >/dev/null 2>&1 || : \ +%{nil} +%global service_install() install -D -p -m 0755 %1 %{buildroot}%{_sysconfdir}/init.d/%2 \ +%{nil} # can't seem to make a generic macro that works -%global _init_glusterd %{_sysconfdir}/init.d/glusterd -%global _init_glusterfsd %{_sysconfdir}/init.d/glusterfsd -%global _init_glustereventsd %{_sysconfdir}/init.d/glustereventsd +%global glusterd_svcfile %{_sysconfdir}/init.d/glusterd +%global glusterfsd_svcfile %{_sysconfdir}/init.d/glusterfsd +%global glustereventsd_svcfile %{_sysconfdir}/init.d/glustereventsd %endif %if ( 0%{_for_fedora_koji_builds} ) @@ -169,7 +171,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.10.6 -Release: 2%{?prereltag:.%{prereltag}}%{?dist} +Release: 3%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -771,7 +773,7 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha # Install glusterfsd .service or init.d file %if ( 0%{_for_fedora_koji_builds} ) -%_init_install %{glusterfsd_service} glusterfsd +%service_install %{glusterfsd_service} glusterfsd %endif install -D -p -m 0644 extras/glusterfs-logrotate \ @@ -829,7 +831,7 @@ rm -rf %{buildroot} /sbin/ldconfig %if ( 0%{!?_without_syslog:1} ) %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) -%_init_restart rsyslog +%systemd_postun_with_restart rsyslog %endif %endif exit 0 @@ -838,7 +840,7 @@ exit 0 %if ( 0%{!?_without_events:1} ) %post events -%_init_restart glustereventsd +%systemd_post glustereventsd exit 0 %endif @@ -857,7 +859,7 @@ exit 0 %if ( 0%{!?_without_georeplication:1} ) %post geo-replication if [ $1 -ge 1 ]; then - %_init_restart glusterd + %systemd_postun_with_restart glusterd fi exit 0 %endif @@ -868,9 +870,9 @@ exit 0 %post server # Legacy server -%_init_enable glusterd +%systemd_post glusterd %if ( 0%{_for_fedora_koji_builds} ) -%_init_enable glusterfsd +%systemd_post glusterfsd %endif # ".cmd_log_history" is renamed to "cmd_history.log" in GlusterFS-3.7 . # While upgrading glusterfs-server package form GlusterFS version <= 3.6 to @@ -928,7 +930,7 @@ if [ $? -eq 0 ]; then # glusterd _was_ running, we killed it, it exited after *.upgrade=on, # so start it again - %_init_start glusterd + %service_start glusterd else glusterd --xlator-option *.upgrade=on -N @@ -944,9 +946,9 @@ exit 0 %if ( 0%{!?_without_events:1} ) %preun events if [ $1 -eq 0 ]; then - if [ -f %_init_glustereventsd ]; then - %_init_stop glustereventsd - %_init_disable glustereventsd + if [ -f %glustereventsd_svcfile ]; then + %service_stop glustereventsd + %systemd_preun glustereventsd fi fi exit 0 @@ -954,20 +956,20 @@ exit 0 %preun server if [ $1 -eq 0 ]; then - if [ -f %_init_glusterfsd ]; then - %_init_stop glusterfsd + if [ -f %glusterfsd_svcfile ]; then + %service_stop glusterfsd fi - %_init_stop glusterd - if [ -f %_init_glusterfsd ]; then - %_init_disable glusterfsd + %service_stop glusterd + if [ -f %glusterfsd_svcfile ]; then + %systemd_preun glusterfsd fi - %_init_disable glusterd + %systemd_preun glusterd fi if [ $1 -ge 1 ]; then - if [ -f %_init_glusterfsd ]; then - %_init_restart glusterfsd + if [ -f %glusterfsd_svcfile ]; then + %systemd_postun_with_restart glusterfsd fi - %_init_restart glusterd + %systemd_postun_with_restart glusterd fi exit 0 @@ -978,7 +980,7 @@ exit 0 /sbin/ldconfig %if ( 0%{!?_without_syslog:1} ) %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) -%_init_restart rsyslog +%systemd_postun_with_restart rsyslog %endif %endif exit 0 @@ -1252,9 +1254,9 @@ exit 0 %endif # init files -%_init_glusterd +%glusterd_svcfile %if ( 0%{_for_fedora_koji_builds} ) -%_init_glusterfsd +%glusterfssharedstorage_svcfile %endif # binaries @@ -1391,6 +1393,9 @@ exit 0 %endif %changelog +* Fri Oct 6 2017 Kaleb S. KEITHLEY - 3.10.6-3 +- 3.10.6 w/ BZ 1497990 again + * Tue Oct 3 2017 Kaleb S. KEITHLEY - 3.10.6-2 - 3.10.6 w/ BZ 1497990 From 10fdd1d565bb78b463245f98b206c2122c513acc Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 6 Oct 2017 21:15:43 -0400 Subject: [PATCH 12/19] 3.10.6 w/ BZ 1497990 again --- glusterfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index cbb783d..b478302 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1256,7 +1256,7 @@ exit 0 # init files %glusterd_svcfile %if ( 0%{_for_fedora_koji_builds} ) -%glusterfssharedstorage_svcfile +%glusterfsd_svcfile %endif # binaries From cb8b65678fd0afdee49e0e818dbd6938db7f83f9 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 23 Oct 2017 10:15:09 -0400 Subject: [PATCH 13/19] 3.10.6 bz #1504256 --- ...erfsd-Dereferencing-the-null-pointer.patch | 39 +++++++++++++++++++ glusterfs.spec | 7 +++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0001-glusterfsd-Dereferencing-the-null-pointer.patch diff --git a/0001-glusterfsd-Dereferencing-the-null-pointer.patch b/0001-glusterfsd-Dereferencing-the-null-pointer.patch new file mode 100644 index 0000000..eabad8a --- /dev/null +++ b/0001-glusterfsd-Dereferencing-the-null-pointer.patch @@ -0,0 +1,39 @@ +From 87bd25b64ae34cce95e87e724acfeab4c13d60a4 Mon Sep 17 00:00:00 2001 +From: Sanju Rakonde +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 +--- + 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 b478302..06cf5e4 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -171,7 +171,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.10.6 -Release: 3%{?prereltag:.%{prereltag}}%{?dist} +Release: 4%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -190,6 +190,7 @@ 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) @@ -669,6 +670,7 @@ This package provides the glusterfs server daemon. %prep %setup -q -n %{name}-%{version}%{?prereltag} +%patch0 -p1 %build %if ( 0%{?rhel} && 0%{?rhel} < 6 ) @@ -1393,6 +1395,9 @@ exit 0 %endif %changelog +* Mon Oct 23 2017 Kaleb S. KEITHLEY - 3.10.6-4 +- 3.10.6 bz #1504256 + * Fri Oct 6 2017 Kaleb S. KEITHLEY - 3.10.6-3 - 3.10.6 w/ BZ 1497990 again From 9b4a41763899d98ea46ac1d132b37d3297fc1f19 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 31 Oct 2017 07:25:31 -0400 Subject: [PATCH 14/19] 3.10.7 GA --- ...erfsd-Dereferencing-the-null-pointer.patch | 39 ------------------- glusterfs.spec | 9 +++-- sources | 2 +- 3 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 0001-glusterfsd-Dereferencing-the-null-pointer.patch 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 -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 ---- - 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 06cf5e4..df545dd 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 - 3.10.7-1 +- 3.10.7 GA + * Mon Oct 23 2017 Kaleb S. KEITHLEY - 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 From c1fe7209209c29f1353ce50d354ad5926eac7c1d Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 30 Nov 2017 10:23:46 -0500 Subject: [PATCH 15/19] 3.10.8 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index df545dd..a867f39 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -170,7 +170,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.7 +Version: 3.10.8 Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1393,6 +1393,9 @@ exit 0 %endif %changelog +* Thu Nov 30 2017 Kaleb S. KEITHLEY - 3.10.8-1 +- 3.10.8 GA + * Tue Oct 31 2017 Kaleb S. KEITHLEY - 3.10.7-1 - 3.10.7 GA diff --git a/sources b/sources index a4ff456..e2849a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.7.tar.gz) = 25b5bcbb42f1525be7b9489a4b2a5701a05cb6967261d4fa87598c81db2b5e93bd31363ddb9f895b6ab8c9ab87aa9e38ec21f50b12b32fb592502db45d822906 +SHA512 (glusterfs-3.10.8.tar.gz) = ad1a17458bbf993d08c6fa8ac105af98e25cb942eab8718830abf37be7956e232d8a58437f72ef6f84449683154ea2df69b9fddd6fbd57887cacd5419722cb4d From 9638517eabadc0f30fc5d09a3df82e825090fa44 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 4 Jan 2018 10:59:58 -0500 Subject: [PATCH 16/19] 3.10.9 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index a867f39..ab0b325 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -170,7 +170,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.8 +Version: 3.10.9 Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1393,6 +1393,9 @@ exit 0 %endif %changelog +* Thu Jan 4 2018 Kaleb S. KEITHLEY - 3.10.9-1 +- 3.10.9 GA + * Thu Nov 30 2017 Kaleb S. KEITHLEY - 3.10.8-1 - 3.10.8 GA diff --git a/sources b/sources index e2849a8..efa49e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.8.tar.gz) = ad1a17458bbf993d08c6fa8ac105af98e25cb942eab8718830abf37be7956e232d8a58437f72ef6f84449683154ea2df69b9fddd6fbd57887cacd5419722cb4d +SHA512 (glusterfs-3.10.9.tar.gz) = 72b8a88c5407196a05ec03f3e7862fbe7d6201842f7a4193697ff9be91b8dcf02fa3b4bce68a817e3e23e021e982fde23ace71c4d162add79283c802dade0777 From 2bdfb17ad9e747f7cc21d80443a6e460797127e8 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 31 Jan 2018 06:33:11 -0500 Subject: [PATCH 17/19] 3.10.10 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index ab0b325..725ea80 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -170,7 +170,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.9 +Version: 3.10.10 Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1393,6 +1393,9 @@ exit 0 %endif %changelog +* Wed Jan 31 2018 Kaleb S. KEITHLEY - 3.10.10-1 +- 3.10.10 GA + * Thu Jan 4 2018 Kaleb S. KEITHLEY - 3.10.9-1 - 3.10.9 GA diff --git a/sources b/sources index efa49e0..b04e933 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.9.tar.gz) = 72b8a88c5407196a05ec03f3e7862fbe7d6201842f7a4193697ff9be91b8dcf02fa3b4bce68a817e3e23e021e982fde23ace71c4d162add79283c802dade0777 +SHA512 (glusterfs-3.10.10.tar.gz) = 6928425c2d796cf1089625c761c5826ed4d0e78a04c61f00721135da819227290bb88df50bba9628a9a6f936d854b9cac691cf38a5965f0ffb620eb3af667483 From 34262ee7d4beb7b99ec6efd9e56ba94ed52fb75c Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 1 Mar 2018 08:53:40 -0500 Subject: [PATCH 18/19] 3.10.11 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 725ea80..8d0b10f 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -170,7 +170,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.10 +Version: 3.10.11 Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1393,6 +1393,9 @@ exit 0 %endif %changelog +* Thu Mar 1 2018 Kaleb S. KEITHLEY - 3.10.11-1 +- 3.10.11 GA + * Wed Jan 31 2018 Kaleb S. KEITHLEY - 3.10.10-1 - 3.10.10 GA diff --git a/sources b/sources index b04e933..8e84d7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.10.tar.gz) = 6928425c2d796cf1089625c761c5826ed4d0e78a04c61f00721135da819227290bb88df50bba9628a9a6f936d854b9cac691cf38a5965f0ffb620eb3af667483 +SHA512 (glusterfs-3.10.11.tar.gz) = 534becb65f9bf5d0f3da257c2ccfd9d5e5a6ff32a21bd9fae1a0aa8c961c632d9a2320ed73e7e79b46e3194e13872e2b617bf01519f428b6a4ffef5bfd98bd89 From 1d196e4f4ebbf3047b75931dc500e141c051a843 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 24 Apr 2018 21:08:41 +0200 Subject: [PATCH 19/19] 3.10.12 GA Signed-off-by: Niels de Vos --- glusterfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 8d0b10f..ae51961 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -170,7 +170,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.10.11 +Version: 3.10.12 Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1393,6 +1393,9 @@ exit 0 %endif %changelog +* Tue Apr 24 2018 Niels de Vos - 3.10.12-1 +- 3.10.12 GA + * Thu Mar 1 2018 Kaleb S. KEITHLEY - 3.10.11-1 - 3.10.11 GA diff --git a/sources b/sources index 8e84d7e..ea7fc03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.10.11.tar.gz) = 534becb65f9bf5d0f3da257c2ccfd9d5e5a6ff32a21bd9fae1a0aa8c961c632d9a2320ed73e7e79b46e3194e13872e2b617bf01519f428b6a4ffef5bfd98bd89 +SHA512 (glusterfs-3.10.12.tar.gz) = 52043cb298831281b96869a6b4bcc25277493a50f95e8fda7fa26cbfba80b5e5d204ba83b0f13299599eefb29f058ed8cfc1d54188695f76323567df03c0501d