Move cgi server and web interface over to Python 3
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
This commit is contained in:
parent
3a57b3c612
commit
13cd4b0e1c
File diff suppressed because it is too large
Load Diff
|
@ -1,7 +1,7 @@
|
||||||
Name: lizardfs
|
Name: lizardfs
|
||||||
Summary: Distributed, fault tolerant file system
|
Summary: Distributed, fault tolerant file system
|
||||||
Version: 3.12.0
|
Version: 3.12.0
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
# LizardFS is under GPLv3 while crcutil is under ASL 2.0 and there's one header,
|
# LizardFS is under GPLv3 while crcutil is under ASL 2.0 and there's one header,
|
||||||
# src/common/coroutine.h, under the Boost license
|
# src/common/coroutine.h, under the Boost license
|
||||||
License: GPLv3 and ASL 2.0 and Boost
|
License: GPLv3 and ASL 2.0 and Boost
|
||||||
|
@ -14,6 +14,8 @@ Patch0: 0001-Put-customized-spdlog-in-source-so-we-don-t-download.patch
|
||||||
# Fix for building with GCC 8
|
# Fix for building with GCC 8
|
||||||
# See https://github.com/lizardfs/lizardfs/pull/677
|
# See https://github.com/lizardfs/lizardfs/pull/677
|
||||||
Patch1: 0001-Add-missing-header.patch
|
Patch1: 0001-Add-missing-header.patch
|
||||||
|
# Use python 3 rather than python 2 for cgi server
|
||||||
|
Patch2: lizardfs-3.12-cgi-py3.patch
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: fuse-devel
|
BuildRequires: fuse-devel
|
||||||
|
@ -84,7 +86,7 @@ LizardFS client: mfsmount and lizardfs.
|
||||||
|
|
||||||
%package cgi
|
%package cgi
|
||||||
Summary: LizardFS CGI Monitor
|
Summary: LizardFS CGI Monitor
|
||||||
Requires: python2
|
Requires: python3
|
||||||
|
|
||||||
%description cgi
|
%description cgi
|
||||||
LizardFS CGI Monitor.
|
LizardFS CGI Monitor.
|
||||||
|
@ -191,12 +193,8 @@ 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
|
utils/coverage.sh utils/cpp-interpreter.sh utils/wireshark/plugins/lizardfs/generate.sh; do
|
||||||
sed -i 's@#!/usr/bin/env bash@#!/bin/bash@' $i
|
sed -i 's@#!/usr/bin/env bash@#!/bin/bash@' $i
|
||||||
done
|
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
|
# Remove /usr/bin/env from python3 scripts
|
||||||
for i in utils/wireshark/plugins/lizardfs/make_dissector.py; do
|
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
|
||||||
sed -i 's@#!/usr/bin/env python3@#!/usr/bin/python3@' $i
|
sed -i 's@#!/usr/bin/env python3@#!/usr/bin/python3@' $i
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -399,6 +397,9 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/limits.d/95-lizardf
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-10
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue