Compare commits

..

3 Commits

Author SHA1 Message Date
Jonathan Dieter 0624af153f Fix 32-bit builds 2018-08-10 10:42:38 +02:00
Jonathan Dieter 1e1524a121 Fix fuse requires
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
2018-08-09 21:05:05 +02:00
Jonathan Dieter bce5824c5c Initial devel module with unstable 3.13.0 release candidate 2018-08-09 16:59:45 +02:00
6 changed files with 108 additions and 1558 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/lizardfs-3.11.2.tar.gz
/lizardfs-3.11.3.tar.gz
/lizardfs-3.12.0.tar.gz
/lizardfs-3.13.0-rc1.tar.gz

View File

@ -0,0 +1,29 @@
From 05a3396180c170c6de2b6841f16852d0673090ca Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter@gmail.com>
Date: Fri, 10 Aug 2018 09:58:34 +0200
Subject: [PATCH] Fix 32-bit build for mfsmount3
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---
src/mount/lizard_client.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/mount/lizard_client.h b/src/mount/lizard_client.h
index 0c08b7fc..20928d77 100644
--- a/src/mount/lizard_client.h
+++ b/src/mount/lizard_client.h
@@ -249,7 +249,11 @@ struct EntryParam {
}
Inode ino;
+#if FUSE_USE_VERSION >= 30
+ uint64_t generation;
+#else
unsigned long generation;
+#endif
struct stat attr;
double attr_timeout;
double entry_timeout;
--
2.17.1

View File

@ -1,26 +0,0 @@
diff -r -U4 lizardfs-3.12.0--orig/src/common/access_control_list.h lizardfs-3.12.0--patched/src/common/access_control_list.h
--- lizardfs-3.12.0--orig/src/common/access_control_list.h 2017-12-20 10:59:37.000000000 +0100
+++ lizardfs-3.12.0--patched/src/common/access_control_list.h 2023-01-28 19:10:49.806668379 +0100
@@ -19,8 +19,9 @@
#pragma once
#include "common/platform.h"
+#include <cstdint>
#include <memory>
#include "common/compact_vector.h"
#include "common/exception.h"
diff -r -U4 lizardfs-3.12.0--orig/src/common/io_limits_config_loader.h lizardfs-3.12.0--patched/src/common/io_limits_config_loader.h
--- lizardfs-3.12.0--orig/src/common/io_limits_config_loader.h 2017-12-20 10:59:37.000000000 +0100
+++ lizardfs-3.12.0--patched/src/common/io_limits_config_loader.h 2023-01-28 19:11:35.314973825 +0100
@@ -18,8 +18,9 @@
#pragma once
#include "common/platform.h"
+#include <cstdint>
#include <istream>
#include <map>
#include <string>

File diff suppressed because it is too large Load Diff

View File

@ -1,46 +1,36 @@
%define __cmake_in_source_build 1
Name: lizardfs
Summary: Distributed, fault tolerant file system
Version: 3.12.0
Release: 22%{?dist}
Version: 3.13.0
Release: 0.rc1r1%{?dist}
# LizardFS is under GPLv3 while crcutil is under ASL 2.0 and there's one header,
# src/common/coroutine.h, under the Boost license
License: GPLv3 and ASL 2.0 and Boost
URL: http://www.lizardfs.org/
Source: https://github.com/lizardfs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
#Source: https://github.com/lizardfs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
Source: %{name}-%{version}-rc1.tar.gz
Source1: pam-lizardfs
Source2: 95-lizardfs.conf
# Use spdlog system library if available
Patch0: 0001-Put-customized-spdlog-in-source-so-we-don-t-download.patch
# Fix for building with GCC 8
# See https://github.com/lizardfs/lizardfs/pull/677
Patch1: 0001-Add-missing-header.patch
# Use python 3 rather than python 2 for cgi server
Patch2: lizardfs-3.12-cgi-py3.patch
# Fix building with GCC13
Patch3: 0003-gcc-13-missing-includes.patch
BuildRequires: asciidoc
BuildRequires: cmake
# Fix for building fuse3 client on 32-bit platforms
Patch2: 0001-Fix-32-bit-build-for-mfsmount3.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: fuse3-devel
BuildRequires: fuse-devel
BuildRequires: cmake
BuildRequires: pkgconfig
BuildRequires: systemd
BuildRequires: boost-devel
BuildRequires: fuse-devel
BuildRequires: Judy-devel
BuildRequires: libdb-devel
BuildRequires: pam-devel
BuildRequires: systemd-devel
BuildRequires: zlib-devel
BuildRequires: asciidoc
BuildRequires: Judy-devel
BuildRequires: systemd-devel
BuildRequires: libdb-devel
BuildRequires: boost-devel
BuildRequires: pam-devel
BuildRequires: systemd
# libcrcutil is basically a copylib with a dead upstream
# https://code.google.com/archive/p/crcutil/
Provides: bundled(libcrcutil) = 1.0
@ -65,6 +55,7 @@ http://lizardfs.com
%package master
Summary: LizardFS master server
Group: System Environment/Daemons
Requires: pam
%{?systemd_requires}
@ -74,6 +65,7 @@ LizardFS master (metadata) server together with metadata restore utility.
%package metalogger
Summary: LizardFS metalogger server
Group: System Environment/Daemons
%{?systemd_requires}
%description metalogger
@ -82,14 +74,26 @@ LizardFS metalogger (metadata replication) server.
%package chunkserver
Summary: LizardFS data server
Group: System Environment/Daemons
%{?systemd_requires}
%description chunkserver
LizardFS data server.
%package uraft
Summary: LizardFS uRaft server
Group: System Environment/Daemons
Requires: lizardfs-master = %{version}-%{release}
%{?systemd_requires}
%description uraft
Package to automatically select which metadata server to make master
%package client
Summary: LizardFS client
Group: System Environment/Daemons
Requires: fuse
%description client
@ -98,7 +102,8 @@ LizardFS client: mfsmount and lizardfs.
%package cgi
Summary: LizardFS CGI Monitor
Requires: python3
Group: System Environment/Daemons
Requires: python2
%description cgi
LizardFS CGI Monitor.
@ -106,6 +111,7 @@ LizardFS CGI Monitor.
%package cgiserv
Summary: Simple CGI-capable HTTP server to run LizardFS CGI Monitor
Group: System Environment/Daemons
Requires: %{name}-cgi = %{version}-%{release}
%{?systemd_requires}
@ -115,6 +121,7 @@ Simple CGI-capable HTTP server to run LizardFS CGI Monitor.
%package adm
Summary: LizardFS administration utility
Group: System Environment/Daemons
%description adm
LizardFS command line administration utility.
@ -193,11 +200,24 @@ exit 0
%systemd_postun_with_restart lizardfs-cgiserv.service
# Scriptlets - uRaft
############################################################
%post uraft
%systemd_post lizardfs-uraft.service lizardfs-ha-master.service
%preun uraft
%systemd_preun lizardfs-uraft.service lizardfs-ha-master.service
%postun uraft
%systemd_postun_with_restart lizardfs-uraft.service lizardfs-ha-master.service
# Prep, build, install, files...
############################################################
%prep
%autosetup -p1
%autosetup -p1 -n lizardfs-3.13.0-rc1
# Remove /usr/bin/env from bash scripts
for i in src/tools/mfstools.sh src/master/mfsrestoremaster.in \
@ -205,8 +225,12 @@ for i in src/tools/mfstools.sh src/master/mfsrestoremaster.in \
utils/coverage.sh utils/cpp-interpreter.sh utils/wireshark/plugins/lizardfs/generate.sh; do
sed -i 's@#!/usr/bin/env bash@#!/bin/bash@' $i
done
# Remove /usr/bin/env from python2 scripts
for i in src/cgi/cgiserv.py.in src/cgi/chart.cgi.in src/cgi/lizardfs-cgiserver.py.in src/cgi/mfs.cgi.in; do
sed -i "s@#!/usr/bin/env python2@#!/usr/bin/python2@" $i
done
# Remove /usr/bin/env from python3 scripts
for i in src/cgi/cgiserv.py.in src/cgi/chart.cgi.in src/cgi/lizardfs-cgiserver.py.in src/cgi/mfs.cgi.in utils/wireshark/plugins/lizardfs/make_dissector.py; do
for i in utils/wireshark/plugins/lizardfs/make_dissector.py; do
sed -i 's@#!/usr/bin/env python3@#!/usr/bin/python3@' $i
done
@ -318,12 +342,26 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/limits.d/95-lizardf
%config(noreplace) %{_sysconfdir}/security/limits.d/95-lizardfs.conf
%files uraft
%doc NEWS README.md UPGRADE
%license COPYING
%{_sbindir}/lizardfs-uraft
%{_sbindir}/lizardfs-uraft-helper
%{_mandir}/man5/lizardfs-uraft.cfg.5*
%{_mandir}/man8/lizardfs-uraft-helper.8*
%{_mandir}/man8/lizardfs-uraft.8*
%{_unitdir}/lizardfs-uraft.service
%{_unitdir}/lizardfs-ha-master.service
%config %{liz_confdir}/lizardfs-uraft.cfg.dist
%files client
%doc NEWS README.md UPGRADE
%license COPYING
%{_bindir}/lizardfs
%{_bindir}/mfstools.sh
%{_bindir}/mfsmount
%{_bindir}/mfsmount3
%{_bindir}/mfsappendchunks
%{_bindir}/mfscheckfile
%{_bindir}/mfsdeleattr
@ -409,49 +447,18 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/limits.d/95-lizardf
%changelog
* Thu Feb 09 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 3.12.0-22
- Add a patch to fix build failures with GCC13
* Fri Aug 10 2018 Jonathan Dieter <jdieter@gmail.com> - 3.13.0.0.rc1r1
- Fix 32-bit builds
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Aug 09 2018 Jonathan Dieter <jdieter@gmail.com> - 3.13.0-0.rc1.1
- Fix fuse requires
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.12.0-17
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Aug 09 2020 Jonathan Dieter <jdieter@gmail.com> - 3.12.0-15
- Fix build issues
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-14
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Aug 24 2019 Jonathan Dieter <jdieter@gmail.com> - 3.12.0-11
- Use python 3 for cgi server and web interface
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jul 18 2018 Jonathan Dieter <jdieter@gmail.com> - 3.13.0-0.rc1
- uRaft HA
- Fixes to EC handling
- Reduced number of secondary groups retrievals (better performance)
- Switch to fuse3 client (better performance, writeback cache)
- Bugfixes
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (lizardfs-3.12.0.tar.gz) = 0136114266dfadcf8e2205bfd19f50ee201566958fba1dc97d4a238ed63ca91dc2cd6352f25d911f4410b0fbd59846f54206da773789d5b959c8c02bde5adf20
SHA512 (lizardfs-3.13.0-rc1.tar.gz) = e2b0cfa217d1f6e1e8a94d8db5cc2b55f20cebb03ddf87584259fdddb2ed68b08e2765ad48294c64c75c73f9b9a40f57ad23a35a8f57a54d0a0915657623930d