automatic import of lizardfs

3 files changed, 23 insertions, 87 deletions

diff --git a/.gitignore b/.gitignore
index 05eb819..f4aed8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /lizardfs-3.13.0.tar.gz
+/v3.12.0.tar.gz
diff --git a/lizardfs.spec b/lizardfs.spec
index b425344..3e8df67 100644
--- a/lizardfs.spec
+++ b/lizardfs.spec
@@ -1,11 +1,13 @@
+%define distro @DISTRO@
+
 Summary:        LizardFS - distributed, fault tolerant file system
 Name:           lizardfs
-Version:        3.13.0
+Version:        3.12.0
 Release:        0
 License:        GPL v3
 Group:          System Environment/Daemons
 URL:            http://www.lizardfs.org/
-Source:         https://tcm.chinaoss.net/lizardfs-3.13.0.tar.gz
+Source:         https://github.com/lizardfs/lizardfs/archive/refs/tags/v%{version}.tar.gz
 BuildRequires:  fuse-devel
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
@@ -19,15 +21,13 @@ BuildRequires:  boost-devel
 BuildRequires:  boost
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define         liz_project        lizardfs
+%define         liz_project        mfs
 %define         liz_group          %{liz_project}
 %define         liz_user           %{liz_project}
 %define         liz_datadir        %{_localstatedir}/lib/%{liz_project}
 %define         liz_confdir        %{_sysconfdir}/%{liz_project}
 %define         liz_limits_conf    /etc/security/limits.d/10-lizardfs.conf
 %define         liz_pam_d          /etc/pam.d/lizardfs
-%define         _unpackaged_files_terminate_build 0
-%define         debug_package      %{nil}
 
 %description
 LizardFS is an Open Source, easy to deploy and maintain, distributed,
@@ -78,14 +78,6 @@ Requires:       bash-completion
 %description client
 LizardFS client: mfsmount and mfstools.
 
-#%package client3
-#Summary:        LizardFS client using FUSE3
-#Group:          System Environment/Daemons
-#Requires:       lizardfs-client
-
-#%description client3
-#LizardFS client: mfsmount and mfstools.
-
 %package lib-client
 Summary:        LizardFS client C/C++ library
 Group:          Development/Libraries
@@ -128,17 +120,6 @@ Group:          System Environment/Daemons
 %description adm
 LizardFS command line administration utility.
 
-%package uraft
-Summary:        LizardFS cluster management tool
-Group:          System Environment/Daemons
-Requires:       lizardfs-master
-Requires:       lizardfs-adm
-Requires:       boost-system
-Requires:       boost-program-options
-
-%description uraft
-LizardFS cluster management tool.
-
 # Scriptlets - master
 ############################################################
 
@@ -230,23 +211,6 @@ exit 0
 %postun cgiserv
 %systemd_postun_with_restart lizardfs-cgiserv.service
 
-# Scriptlets - client3
-############################################################
-
-#%post client3
-#/bin/ln -sf %{_mandir}/man1/mfsmount.1 %{_mandir}/man1/mfsmount3.1
-
-# Scriptlets - uraft
-############################################################
-
-%post uraft
-echo "net.ipv4.conf.all.arp_accept = 1" > /etc/sysctl.d/10-lizardfs-uraft-arp.conf
-chmod 0664 /etc/sysctl.d/10-lizardfs-uraft-arp.conf
-sysctl -p /etc/sysctl.d/10-lizardfs-uraft-arp.conf
-echo "# Allow lizardfs user to set floating ip" > /etc/sudoers.d/lizardfs-uraft
-echo "lizardfs    ALL=NOPASSWD:/sbin/ip" >> /etc/sudoers.d/lizardfs-uraft
-echo 'Defaults !requiretty' >> /etc/sudoers
-
 # Prep, build, install, files...
 ############################################################
 
@@ -261,7 +225,6 @@ make -j4
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -d -m755 $RPM_BUILD_ROOT/%{liz_confdir}
 install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
 for f in rpm/service-files/*.service ; do
 	install -m644 "$f" $RPM_BUILD_ROOT/%{_unitdir}/$(basename "$f")
@@ -271,15 +234,12 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %files master
-%define liz_master_examples %{_docdir}/lizardfs-master/examples
 %defattr(644,root,root,755)
 %doc NEWS README.md UPGRADE
 %attr(755,root,root) %{_sbindir}/mfsmaster
 %attr(755,root,root) %{_sbindir}/mfsrestoremaster
 %attr(755,root,root) %{_sbindir}/mfsmetadump
 %attr(755,root,root) %{_sbindir}/mfsmetarestore
-%dir %{liz_confdir}
-%attr(755,%{liz_user},%{liz_group}) %dir %{liz_confdir}
 %attr(755,%{liz_user},%{liz_group}) %dir %{liz_datadir}
 %{_mandir}/man5/mfsexports.cfg.5*
 %{_mandir}/man5/mfstopology.cfg.5*
@@ -293,42 +253,37 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/mfsmetadump.8*
 %{_mandir}/man8/mfsmetarestore.8*
 %{_mandir}/man8/mfsrestoremaster.8*
-%{liz_master_examples}/mfsexports.cfg
-%{liz_master_examples}/mfstopology.cfg
-%{liz_master_examples}/mfsgoals.cfg
-%{liz_master_examples}/mfsmaster.cfg
-%{liz_master_examples}/globaliolimits.cfg
+%{liz_confdir}/mfsexports.cfg.dist
+%{liz_confdir}/mfstopology.cfg.dist
+%{liz_confdir}/mfsgoals.cfg.dist
+%{liz_confdir}/mfsmaster.cfg.dist
+%{liz_confdir}/globaliolimits.cfg.dist
 %attr(644,root,root) %{liz_datadir}/metadata.mfs.empty
 %attr(644,root,root) %{_unitdir}/lizardfs-master.service
 
 %files metalogger
-%define liz_metalogger_examples %{_docdir}/lizardfs-metalogger/examples
 %defattr(644,root,root,755)
 %doc NEWS README.md UPGRADE
 %attr(755,root,root) %{_sbindir}/mfsmetalogger
 %attr(755,%{liz_user},%{liz_group}) %dir %{liz_datadir}
 %{_mandir}/man5/mfsmetalogger.cfg.5*
 %{_mandir}/man8/mfsmetalogger.8*
-%{liz_metalogger_examples}/mfsmetalogger.cfg
+%{liz_confdir}/mfsmetalogger.cfg.dist
 %attr(644,root,root) %{_unitdir}/lizardfs-metalogger.service
 
 %files chunkserver
-%define liz_chunkserver_examples %{_docdir}/lizardfs-chunkserver/examples
 %defattr(644,root,root,755)
 %doc NEWS README.md UPGRADE
 %attr(755,root,root) %{_sbindir}/mfschunkserver
-%dir %{liz_confdir}
-%attr(755,%{liz_user},%{liz_group}) %dir %{liz_confdir}
 %attr(755,%{liz_user},%{liz_group}) %dir %{liz_datadir}
 %{_mandir}/man5/mfschunkserver.cfg.5*
 %{_mandir}/man5/mfshdd.cfg.5*
 %{_mandir}/man8/mfschunkserver.8*
-%{liz_chunkserver_examples}/mfschunkserver.cfg
-%{liz_chunkserver_examples}/mfshdd.cfg
+%{liz_confdir}/mfschunkserver.cfg.dist
+%{liz_confdir}/mfshdd.cfg.dist
 %attr(644,root,root) %{_unitdir}/lizardfs-chunkserver.service
 
 %files client
-%define liz_client_examples %{_docdir}/lizardfs-client/examples
 %defattr(644,root,root,755)
 %doc NEWS README.md UPGRADE
 %attr(755,root,root) %{_bindir}/lizardfs
@@ -379,14 +334,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/moosefs.7*
 %{_mandir}/man1/mfsmount.1*
 %{_mandir}/man5/mfsmount.cfg.5*
-%{liz_client_examples}/iolimits.cfg
-%{liz_client_examples}/mfsmount.cfg
+%{liz_confdir}/mfsmount.cfg.dist
+%{liz_confdir}/iolimits.cfg.dist
 %{_sysconfdir}/bash_completion.d/lizardfs
 
-#%files client3
-#%attr(755,root,root) %{_bindir}/mfsmount3
-#%{_mandir}/man1/mfsmount3.1*
-
 %files lib-client
 %{_libdir}/liblizardfsmount_shared.so
 %{_libdir}/liblizardfs-client.so
@@ -397,6 +348,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/lizardfs/lizardfs_c_api.h
 %{_includedir}/lizardfs/lizardfs_error_codes.h
 
+### Uncomment lines below to re-enable ganesha build.
+#%files nfs-ganesha
+#%{_libdir}/ganesha/libfsallizardfs.so
+#%{_libdir}/ganesha/libfsallizardfs.so.4
+#%{_libdir}/ganesha/libfsallizardfs.so.4.2.0
 
 %files cgi
 %defattr(644,root,root,755)
@@ -426,31 +382,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/lizardfs-probe
 %{_mandir}/man8/lizardfs-probe.8*
 
-%files uraft
-%define liz_uraft_examples %{_docdir}/lizardfs-uraft/examples
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/lizardfs-uraft
-%attr(755,root,root) %{_sbindir}/lizardfs-uraft-helper
-%doc NEWS README.md UPGRADE
-%{_mandir}/man8/lizardfs-uraft.8*
-%{_mandir}/man8/lizardfs-uraft-helper.8*
-%{_mandir}/man5/lizardfs-uraft.cfg.5*
-%{liz_uraft_examples}/lizardfs-uraft.cfg
-%attr(644,root,root) %{_unitdir}/lizardfs-uraft.service
-%attr(644,root,root) %{_unitdir}/lizardfs-ha-master.service
-
 %changelog
-* Thu Jun 28 2018 Pawel Kalinowski <contact@lizardfs.org> - 3.13.0
-- (all) uRaft HA
-- (all) fixes to EC handling
-- (all) nfs-ganesha plugin changed to use only C code
-- (mount) reduced number of secondary groups retrievals (better performance)
-- (mount) add fuse3 client (better performance, writeback cache)
-- (all) many fixes
-
 * Wed Nov 22 2017 Pawel Kalinowski <contact@lizardfs.org> - 3.12.0
 - (all) C API
-- (all) nfs-ganesha plugin
+- (all) nfs-ganesha plugin (multiple exports allowed)
 - (all) RichACL support (which includes NFSv4)
 - (all) OSX ACL support
 - (master, mount) file lock fixes
diff --git a/sources b/sources
index 47fb34c..ec13766 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba16282e9d3edf8369bceef3ccf44a6b  lizardfs-3.13.0.tar.gz
+e584aa9534f900ca04d40a4772e01302  v3.12.0.tar.gz