From 56bab027bdc1d79ee7f8dfa6c6f6d4d43a8b1c570f96788155969f9b8412d456 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 31 Oct 2012 12:27:28 +0000 Subject: [PATCH 1/6] glusterfs-3.3.1 OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=13 --- glusterd.service | 8 ++++++++ glusterfs-3.3.0.tar.xz | 3 --- glusterfs-3.3.1.tar.xz | 3 +++ glusterfs-init.diff | 38 ----------------------------------- glusterfs.changes | 9 +++++++++ glusterfs.spec | 45 ++++++++++++++++++++++++++++++------------ 6 files changed, 52 insertions(+), 54 deletions(-) create mode 100644 glusterd.service delete mode 100644 glusterfs-3.3.0.tar.xz create mode 100644 glusterfs-3.3.1.tar.xz delete mode 100644 glusterfs-init.diff diff --git a/glusterd.service b/glusterd.service new file mode 100644 index 0000000..858e835 --- /dev/null +++ b/glusterd.service @@ -0,0 +1,8 @@ +[Unit] +Description=Gluster elastic volume management daemon + +[Service] +ExecStart=/usr/sbin/glusterd + +[Install] +WantedBy=multi-user.target diff --git a/glusterfs-3.3.0.tar.xz b/glusterfs-3.3.0.tar.xz deleted file mode 100644 index 65d420a..0000000 --- a/glusterfs-3.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59f1ae0b1c3ef97768b0b740b7f0146aedd0102d19c19e50fb04ae5990126066 -size 1541028 diff --git a/glusterfs-3.3.1.tar.xz b/glusterfs-3.3.1.tar.xz new file mode 100644 index 0000000..0900c00 --- /dev/null +++ b/glusterfs-3.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc364b9198947eea1b9b0b7533aaeed6672a2f73e2ee4aada2004a64252d3ec9 +size 1565592 diff --git a/glusterfs-init.diff b/glusterfs-init.diff deleted file mode 100644 index ace65fa..0000000 --- a/glusterfs-init.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- - extras/init.d/glusterd-SuSE.in | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -Index: glusterfs-3.2.4/extras/init.d/glusterd-SuSE.in -=================================================================== ---- glusterfs-3.2.4.orig/extras/init.d/glusterd-SuSE.in -+++ glusterfs-3.2.4/extras/init.d/glusterd-SuSE.in -@@ -2,8 +2,8 @@ - # - ### BEGIN INIT INFO - # Provides: glusterd --# Required-Start: $local_fs $network --# Required-Stop: -+# Required-Start: $remote_fs $network -+# Required-Stop: $remote_fs $network - # Default-Start: 3 5 - # Default-Stop: - # Short-Description: Gluster File System service for volume management -@@ -61,13 +61,17 @@ case $1 in - fi - rc_status -v - ;; -+ reload) -+ rc_failed 3 -+ rc_status -v -+ ;; - restart) - $0 stop - $0 start - rc_status - ;; - *) -- echo $"Usage: $0 {start|stop|status|restart}." -+ echo $"Usage: $0 {start|stop|status|reload|restart}." - exit 1 - esac - diff --git a/glusterfs.changes b/glusterfs.changes index 0a735f4..7fe02b4 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Oct 31 12:19:47 UTC 2012 - jengelh@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 - jengelh@inai.de diff --git a/glusterfs.spec b/glusterfs.spec index e0a54d9..80c1761 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -16,11 +16,14 @@ # +#git_master +%define master 0 Name: glusterfs +%define lname_api libgfapi0 %define lname_rpc libgfrpc0 %define lname_xdr libgfxdr0 %define lname_gf libglusterfs0 -Version: 3.3.0 +Version: 3.3.1 Release: 0 Summary: Aggregating distributed file system License: GPL-2.0+ ; GPL-3.0 @@ -29,8 +32,8 @@ Url: http://gluster.org/ #Git-Clone: git://github.com/gluster/glusterfs Source: %name-%version.tar.xz -Patch1: glusterfs-init.diff -Patch2: glusterfs-date.diff +Patch1: glusterfs-date.diff +Patch2: glusterfs-init.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: bison @@ -63,6 +66,14 @@ 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 WIP 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 @@ -90,6 +101,7 @@ 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 @@ -115,7 +127,8 @@ make %{?_smp_mflags}; %install b="%buildroot"; -%make_install docdir=%_docdir/%name +make install DESTDIR="$b" docdir="%_docdir/%name" +find "$b/%_libdir" -type f -name "*.la" -delete; mkdir -p "$b/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd}; @@ -164,16 +177,13 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el; /sbin/ldconfig %insserv_cleanup -%post -n %lname_rpc -p /sbin/ldconfig - +%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 - +%post -n %lname_xdr -p /sbin/ldconfig %postun -n %lname_xdr -p /sbin/ldconfig - -%post -n %lname_gf -p /sbin/ldconfig - +%post -n %lname_gf -p /sbin/ldconfig %postun -n %lname_gf -p /sbin/ldconfig %files @@ -186,11 +196,17 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el; %_libexecdir/%name %_libdir/%name %_sbindir/gluster* -#%_mandir/man*/* +%_mandir/man*/* %_docdir/%name %_localstatedir/lib/glusterd %_localstatedir/log/%name +%if %master +%files -n %lname_api +%defattr(-,root,root) +%_libdir/libgfapi.so.0* +%endif + %files -n %lname_rpc %defattr(-,root,root) %_libdir/libgfrpc.so.0* @@ -207,5 +223,8 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el; %defattr(-,root,root) %_includedir/%name %_libdir/*.so +%if %master +%_libdir/pkgconfig/*.pc +%endif %changelog From a01b93d70c4c7c4e7a0c6913e672e30866b99e6b2bd4173149c77fb13223c9eb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 31 Oct 2012 12:56:54 +0000 Subject: [PATCH 2/6] Add glusterfs-init.diff OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=14 --- glusterfs-init.diff | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 glusterfs-init.diff diff --git a/glusterfs-init.diff b/glusterfs-init.diff new file mode 100644 index 0000000..7873cc4 --- /dev/null +++ b/glusterfs-init.diff @@ -0,0 +1,31 @@ +From 9563572894a0685bdb575398c775cbd187df3a9c Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 24 Sep 2012 06:08:36 +0200 +Subject: [PATCH] init.d: use proper dependencies in SUSE init script + +"/usr", the place where the binaries usually reside, requires +$remote_fs. + +Signed-off-by: Jan Engelhardt +--- + extras/init.d/glusterd-SuSE.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/extras/init.d/glusterd-SuSE.in b/extras/init.d/glusterd-SuSE.in +index 16cf8de..2c3fc02 100755 +--- a/extras/init.d/glusterd-SuSE.in ++++ b/extras/init.d/glusterd-SuSE.in +@@ -2,8 +2,8 @@ + # + ### BEGIN INIT INFO + # Provides: glusterd +-# Required-Start: $local_fs $network +-# Required-Stop: ++# Required-Start: $remote_fs $network ++# Required-Stop: $remote_fs $network + # Default-Start: 3 5 + # Default-Stop: + # Short-Description: Gluster File System service for volume management +-- +1.7.10.4 + From b71c647f86a7394904c6a9dcb985d8461ff3360af610fcb7fdfcc421c23a0071 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 10 Nov 2012 00:17:35 +0000 Subject: [PATCH 3/6] glusterfs-3.4.0~qa2 OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=15 --- glusterfs-3.3.1.tar.xz | 3 --- glusterfs-3.4.0qa2.tar.xz | 3 +++ glusterfs-init.diff | 31 ------------------------------- glusterfs.changes | 7 +++++++ glusterfs.spec | 19 +++++++------------ 5 files changed, 17 insertions(+), 46 deletions(-) delete mode 100644 glusterfs-3.3.1.tar.xz create mode 100644 glusterfs-3.4.0qa2.tar.xz delete mode 100644 glusterfs-init.diff diff --git a/glusterfs-3.3.1.tar.xz b/glusterfs-3.3.1.tar.xz deleted file mode 100644 index 0900c00..0000000 --- a/glusterfs-3.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc364b9198947eea1b9b0b7533aaeed6672a2f73e2ee4aada2004a64252d3ec9 -size 1565592 diff --git a/glusterfs-3.4.0qa2.tar.xz b/glusterfs-3.4.0qa2.tar.xz new file mode 100644 index 0000000..5e95573 --- /dev/null +++ b/glusterfs-3.4.0qa2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d25207e5c53ee6a79a8da10125f71d6635a9043ec9cab3b717a5453e7ffd5c9 +size 1689560 diff --git a/glusterfs-init.diff b/glusterfs-init.diff deleted file mode 100644 index 7873cc4..0000000 --- a/glusterfs-init.diff +++ /dev/null @@ -1,31 +0,0 @@ -From 9563572894a0685bdb575398c775cbd187df3a9c Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Mon, 24 Sep 2012 06:08:36 +0200 -Subject: [PATCH] init.d: use proper dependencies in SUSE init script - -"/usr", the place where the binaries usually reside, requires -$remote_fs. - -Signed-off-by: Jan Engelhardt ---- - extras/init.d/glusterd-SuSE.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/extras/init.d/glusterd-SuSE.in b/extras/init.d/glusterd-SuSE.in -index 16cf8de..2c3fc02 100755 ---- a/extras/init.d/glusterd-SuSE.in -+++ b/extras/init.d/glusterd-SuSE.in -@@ -2,8 +2,8 @@ - # - ### BEGIN INIT INFO - # Provides: glusterd --# Required-Start: $local_fs $network --# Required-Stop: -+# Required-Start: $remote_fs $network -+# Required-Stop: $remote_fs $network - # Default-Start: 3 5 - # Default-Stop: - # Short-Description: Gluster File System service for volume management --- -1.7.10.4 - diff --git a/glusterfs.changes b/glusterfs.changes index 7fe02b4..f903d64 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 9 21:47:11 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 3.4.0qa2 +* No changelog provided by upstream +- Remove glusterfs-init.diff, merged upstream + ------------------------------------------------------------------- Wed Oct 31 12:19:47 UTC 2012 - jengelh@inai.de diff --git a/glusterfs.spec b/glusterfs.spec index 80c1761..33b990e 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -16,24 +16,22 @@ # -#git_master -%define master 0 Name: glusterfs %define lname_api libgfapi0 %define lname_rpc libgfrpc0 %define lname_xdr libgfxdr0 %define lname_gf libglusterfs0 -Version: 3.3.1 +Version: 3.4.0~qa2 Release: 0 +%define rversion 3.4.0qa2 Summary: Aggregating distributed file system License: GPL-2.0+ ; GPL-3.0 Group: System/Filesystems Url: http://gluster.org/ #Git-Clone: git://github.com/gluster/glusterfs -Source: %name-%version.tar.xz +Source: %name-%rversion.tar.xz Patch1: glusterfs-date.diff -Patch2: glusterfs-init.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: bison @@ -67,7 +65,7 @@ Translators from GNU Hurd kernel. Much of the code in GlusterFS is in user space and easily manageable. %package -n %lname_api -Summary: GlusterFS WIP API library +Summary: GlusterFS API library Group: System/Libraries %description -n %lname_api @@ -115,8 +113,8 @@ This package provides development files such as headers and library links. %prep -%setup -q -%patch -P 1 -P 2 -p1 +%setup -qn %name-%rversion +%patch -P 1 -p1 %build ./autogen.sh; @@ -191,6 +189,7 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el; %_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 @@ -201,11 +200,9 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el; %_localstatedir/lib/glusterd %_localstatedir/log/%name -%if %master %files -n %lname_api %defattr(-,root,root) %_libdir/libgfapi.so.0* -%endif %files -n %lname_rpc %defattr(-,root,root) @@ -223,8 +220,6 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el; %defattr(-,root,root) %_includedir/%name %_libdir/*.so -%if %master %_libdir/pkgconfig/*.pc -%endif %changelog From ea25762b6b4cb1f3b605e41cbd63bf8bf74cdf7ebe936322092921e903b4b4ca Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 15 Nov 2012 00:51:48 +0000 Subject: [PATCH 4/6] Systemd service file OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=16 --- glusterfs.changes | 1 + glusterfs.spec | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/glusterfs.changes b/glusterfs.changes index f903d64..6b36229 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -4,6 +4,7 @@ Fri Nov 9 21:47:11 UTC 2012 - jengelh@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 - jengelh@inai.de diff --git a/glusterfs.spec b/glusterfs.spec index 33b990e..6cfc644 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -31,6 +31,7 @@ Url: http://gluster.org/ #Git-Clone: git://github.com/gluster/glusterfs Source: %name-%rversion.tar.xz +Source3: glusterd.service Patch1: glusterfs-date.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake @@ -53,6 +54,9 @@ BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(uuid) %endif +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif Requires: python %description @@ -161,19 +165,24 @@ 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 -/sbin/ldconfig -%insserv_cleanup -%restart_on_update glusterd +%service_add_post glusterd.service %preun -%stop_on_removal glusterd +%service_del_preun glusterd.service %postun -/sbin/ldconfig -%insserv_cleanup +%service_del_postun glusterd.service %post -n %lname_api -p /sbin/ldconfig %postun -n %lname_api -p /sbin/ldconfig @@ -199,6 +208,9 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el; %_docdir/%name %_localstatedir/lib/glusterd %_localstatedir/log/%name +%if 0%{?_unitdir:1} +%_unitdir/glusterd.service +%endif %files -n %lname_api %defattr(-,root,root) From 1b202898a4c86938a78e39de30953b2d7af49e8217972dced2608d78e414929c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Nov 2012 11:21:07 +0000 Subject: [PATCH 5/6] Accepting request 143019 from home:babelworx:ldig:branches:filesystems license update: GPL-2.0 or LGPL-3.0+ OBS-URL: https://build.opensuse.org/request/show/143019 OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=17 --- glusterfs.changes | 6 ++++++ glusterfs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/glusterfs.changes b/glusterfs.changes index 6b36229..61f68a8 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 27 10:59:15 UTC 2012 - cfarrell@suse.com + +- license update: GPL-2.0 or LGPL-3.0+ + + ------------------------------------------------------------------- Fri Nov 9 21:47:11 UTC 2012 - jengelh@inai.de diff --git a/glusterfs.spec b/glusterfs.spec index 6cfc644..f6c5889 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -25,7 +25,7 @@ Version: 3.4.0~qa2 Release: 0 %define rversion 3.4.0qa2 Summary: Aggregating distributed file system -License: GPL-2.0+ ; GPL-3.0 +License: GPL-2.0 or LGPL-3.0+ Group: System/Filesystems Url: http://gluster.org/ From 440a1d1fc563231a88a569b38f15622fbe7963b45adf58eaeb805b7c9709d323 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Nov 2012 11:21:33 +0000 Subject: [PATCH 6/6] Remove extra newline OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=18 --- glusterfs.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/glusterfs.changes b/glusterfs.changes index 61f68a8..3559029 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -3,7 +3,6 @@ Tue Nov 27 10:59:15 UTC 2012 - cfarrell@suse.com - license update: GPL-2.0 or LGPL-3.0+ - ------------------------------------------------------------------- Fri Nov 9 21:47:11 UTC 2012 - jengelh@inai.de