Updates for Fedora36
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
# You can get the latest commit using this commands:
|
# You can get the latest commit using this commands:
|
||||||
# git pull
|
# git pull
|
||||||
# git log --oneline | head -n 1 | awk '{print $1}'
|
# git log --oneline | head -n 1 | awk '{print $1}'
|
||||||
%define gitv 58fd8a6
|
%define gitv ffa6674
|
||||||
%define webd %{_var}/www
|
%define webd %{_var}/www
|
||||||
%define gopath $(pwd)/go
|
%define gopath $(pwd)/go
|
||||||
%define domain echoip.daniel-steiner.org
|
%define domain echoip.dsteiner.ch
|
||||||
%define protocol https
|
%define protocol https
|
||||||
%define port 443
|
%define port 443
|
||||||
|
|
||||||
@@ -36,6 +36,7 @@ A simple service for looking up your IP address. This is the code that powers ht
|
|||||||
%setup -q -n %{name}-%{version}.%{gitv}
|
%setup -q -n %{name}-%{version}.%{gitv}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
mkdir go bin
|
||||||
# save system PATH environment:
|
# save system PATH environment:
|
||||||
SAVEPATH=$PATH
|
SAVEPATH=$PATH
|
||||||
# prepare go environment:
|
# prepare go environment:
|
||||||
@@ -53,11 +54,11 @@ export PATH=$SAVEPATH
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
# modifying index.html file for required settings:
|
# modifying index.html file for required settings:
|
||||||
sed -i -e 's|.. .Host ..|%{protocol}://%{domain}|g' index.html
|
sed -i -e 's|.. .Host ..|%{protocol}://%{domain}|g' html/index.html
|
||||||
sed -i -e 's/8080/%{port}/g' index.html
|
sed -i -e 's/8080/%{port}/g' html/index.html
|
||||||
install -d -m 0770 %{buildroot}%{_rundir}/%{name}
|
install -d -m 0770 %{buildroot}%{_rundir}/%{name}
|
||||||
install -D -m 0775 %{gopath}/bin/echoip %{buildroot}%{_bindir}/%{name}
|
install -D -m 0775 %{gopath}/bin/echoip %{buildroot}%{_bindir}/%{name}
|
||||||
install -D -m 0644 index.html %{buildroot}%{webd}/%{name}/orig-index.html
|
install -D -m 0644 html/index.html %{buildroot}%{webd}/%{name}/orig-index.html
|
||||||
install -D -m 0644 %{SOURCE2} %{buildroot}%{webd}/%{name}/index.html
|
install -D -m 0644 %{SOURCE2} %{buildroot}%{webd}/%{name}/index.html
|
||||||
sed -i -e 's|.. .Host ..|%{protocol}://%{domain}|g' %{buildroot}%{webd}/%{name}/index.html
|
sed -i -e 's|.. .Host ..|%{protocol}://%{domain}|g' %{buildroot}%{webd}/%{name}/index.html
|
||||||
sed -i -e 's/8080/%{port}/g' %{buildroot}%{webd}/%{name}/index.html
|
sed -i -e 's/8080/%{port}/g' %{buildroot}%{webd}/%{name}/index.html
|
||||||
@@ -116,6 +117,10 @@ fi
|
|||||||
%dir %attr(-,%{name},%{name}) %{_rundir}/%{name}
|
%dir %attr(-,%{name},%{name}) %{_rundir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 24 2022 Daniel Steiner <daniel.steiner@greenmail.ch>
|
||||||
|
- First build on Fedora 35.
|
||||||
|
- Domain pattern changed and upated to latest git version.
|
||||||
|
|
||||||
* Fri May 11 2021 Daniel Steiner <daniel.steiner@greenmail.ch>
|
* Fri May 11 2021 Daniel Steiner <daniel.steiner@greenmail.ch>
|
||||||
- First build on Fedora 34.
|
- First build on Fedora 34.
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
Name: gitea
|
Name: gitea
|
||||||
Version: 1.16.7
|
Version: 1.16.8
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Gitea is a painless self-hosted Git service.
|
Summary: Gitea is a painless self-hosted Git service.
|
||||||
%define MyVersion %version
|
%define MyVersion %version
|
||||||
@@ -46,11 +46,11 @@ done
|
|||||||
# Fedora only provides golang 1.16, but we require 1.17 in mimimum:
|
# Fedora only provides golang 1.16, but we require 1.17 in mimimum:
|
||||||
if [ -x /usr/local/go/bin/go ]; then
|
if [ -x /usr/local/go/bin/go ]; then
|
||||||
export PATH=/usr/local/go/bin:$PATH
|
export PATH=/usr/local/go/bin:$PATH
|
||||||
TAGS="bindata" make build
|
|
||||||
else
|
|
||||||
echo -e "Please install go from https://golang.org/dl/ into /usr/local/go first, exiting"
|
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
# Overwrite LDFLAGS from rpm macros should be removed later:
|
||||||
|
LDFLAGS=''
|
||||||
|
export LDFLAGS
|
||||||
|
TAGS="bindata" make build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@@ -84,6 +84,9 @@ getent passwd gitea > /dev/null || \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 20 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
||||||
|
- Update to 1.16.8.
|
||||||
|
|
||||||
* Fri May 6 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
* Fri May 6 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
||||||
- Update to 1.16.7.
|
- Update to 1.16.7.
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: goaccess
|
Name: goaccess
|
||||||
Version: 1.5.5
|
Version: 1.6
|
||||||
Release: 99%{?dist}
|
Release: 99%{?dist}
|
||||||
Summary: Real-time web log analyzer and interactive viewer
|
Summary: Real-time web log analyzer and interactive viewer
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@@ -93,6 +93,9 @@ sed -i '/-pthread/d' configure.ac
|
|||||||
%{_mandir}/man1/%{name}.1*
|
%{_mandir}/man1/%{name}.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 24 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
||||||
|
- Update to 1.6.
|
||||||
|
|
||||||
* Fri Feb 18 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
* Fri Feb 18 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
||||||
- Update to 1.5.5.
|
- Update to 1.5.5.
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
%global httpd_pkg_cache_dir /var/cache/httpd/mod_auth_openidc
|
%global httpd_pkg_cache_dir /var/cache/httpd/mod_auth_openidc
|
||||||
|
|
||||||
Name: mod_auth_openidc
|
Name: mod_auth_openidc
|
||||||
Version: 2.4.11
|
Version: 2.4.11.2
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: OpenID Connect auth module for Apache HTTP Server
|
Summary: OpenID Connect auth module for Apache HTTP Server
|
||||||
|
|
||||||
@@ -94,6 +94,9 @@ install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/cache
|
|||||||
%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache
|
%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 24 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
||||||
|
- Update to 2.4.11.2.
|
||||||
|
|
||||||
* Fri Feb 18 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
* Fri Feb 18 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
||||||
- Update to 2.4.11.
|
- Update to 2.4.11.
|
||||||
|
|
||||||
|
|||||||
77
fedora/SPECS/mydumper.spec
Normal file
77
fedora/SPECS/mydumper.spec
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
# to build agains mariadb libraries, set it to 0
|
||||||
|
%define _mysql 0
|
||||||
|
Name: mydumper
|
||||||
|
Summary: mydumper and myloader MySQL backup tools
|
||||||
|
Version: 0.12.3
|
||||||
|
Release: 3%{?dist}
|
||||||
|
Group: Applications/Databases
|
||||||
|
License: GPL
|
||||||
|
Vendor: Max Bubenick
|
||||||
|
URL: https://github.com/maxbube/mydumper
|
||||||
|
Source: mydumper-%{version}.tar.gz
|
||||||
|
BuildArch: x86_64
|
||||||
|
AutoReq: no
|
||||||
|
%if 0%{?_mysql}
|
||||||
|
BuildRequires: community-mysql-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: mariadb-devel
|
||||||
|
%endif
|
||||||
|
BuildRequires: pkgconf-pkg-config
|
||||||
|
BuildRequires: pcre-devel
|
||||||
|
BuildRequires: glib2-devel
|
||||||
|
BuildRequires: zlib-devel
|
||||||
|
BuildRequires: pcre-devel
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: cmake
|
||||||
|
BuildRequires: python3-sphinx
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: git
|
||||||
|
|
||||||
|
%description
|
||||||
|
This package provides mydumper and myloader MySQL backup tools.
|
||||||
|
|
||||||
|
mydumper is a tool used for backing up MySQL database servers much
|
||||||
|
faster than the mysqldump tool distributed with MySQL. It also has the
|
||||||
|
capability to retrieve the binary logs from the remote server at the same time
|
||||||
|
as the dump itself. The advantages of mydumper are: parallelism,
|
||||||
|
easier to manage output, consistency, manageability.
|
||||||
|
|
||||||
|
myloader is a tool used for multi-threaded restoration of mydumper backups.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n %{name}-%{version}-3
|
||||||
|
|
||||||
|
%build
|
||||||
|
# required for Fedora 36:
|
||||||
|
export LDFLAGS=''
|
||||||
|
%define debug_package %{nil}
|
||||||
|
%if 0%{?_mysql}
|
||||||
|
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DWITH_BINLOG=OFF -DWITH_SSL=ON .
|
||||||
|
%else
|
||||||
|
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DWITH_BINLOG=OFF -DWITH_SSL=OFF .
|
||||||
|
%endif
|
||||||
|
make
|
||||||
|
|
||||||
|
%install
|
||||||
|
%__make install DESTDIR=${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_bindir}/*
|
||||||
|
%{_datarootdir}/doc/%{name}/*
|
||||||
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Fri Jun 24 2022 Daniel Steiner <daniel.steiner@daniel-steiner.org>
|
||||||
|
- First build on Fedora 36.
|
||||||
|
- Update to 0.12.3.
|
||||||
|
|
||||||
|
* Fri Mar 18 2022 Daniel Steiner <daniel.steiner@daniel-steiner.org>
|
||||||
|
- First build on Fedora 35.
|
||||||
|
|
||||||
|
* Sun Jul 4 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org>
|
||||||
|
- First build on Fedora 33.
|
||||||
|
|
||||||
@@ -13,6 +13,7 @@ Source0: %{name}-%{version}.tar.gz
|
|||||||
Source1: %{name}.toml
|
Source1: %{name}.toml
|
||||||
Source2: navidrome.sysuser
|
Source2: navidrome.sysuser
|
||||||
Source3: navidrome.service
|
Source3: navidrome.service
|
||||||
|
Patch0: nagidrom-wader-tag.patch
|
||||||
|
|
||||||
BuildRequires: nodejs >= 16
|
BuildRequires: nodejs >= 16
|
||||||
BuildRequires: npm
|
BuildRequires: npm
|
||||||
@@ -45,8 +46,10 @@ Features
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %name-%{version}
|
%setup -q -n %name-%{version}
|
||||||
|
%patch0 -p0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
export NODE_OPTIONS='--openssl-legacy-provider'
|
||||||
make setup
|
make setup
|
||||||
make buildjs
|
make buildjs
|
||||||
export CGO_LDFLAGS="${LDFLAGS}"
|
export CGO_LDFLAGS="${LDFLAGS}"
|
||||||
@@ -54,7 +57,7 @@ export CGO_CFLAGS="${CFLAGS}"
|
|||||||
export CGO_CPPFLAGS="${CPPFLAGS}"
|
export CGO_CPPFLAGS="${CPPFLAGS}"
|
||||||
export CGO_CXXFLAGS="${CXXFLAGS}"
|
export CGO_CXXFLAGS="${CXXFLAGS}"
|
||||||
export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
|
export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
|
||||||
go build -ldflags="-X github.com/%{name}/%{name}/consts.gitSha=%{gitSha} -X github.com/%{name}/%{name}/consts.gitTag=v%{version}" -tags=netgo
|
go build -ldflags="-X github.com/%{name}/%{name}/consts.gitSha=%{gitSha} -X github.com/%{name}/%{name}/consts.gitTag=v%{version}" -tags=netgo -buildvcs=false
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -Dm755 %{name} %{buildroot}%{_bindir}/%{name}
|
install -Dm755 %{name} %{buildroot}%{_bindir}/%{name}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
%global nginx_user nginx
|
%global nginx_user nginx
|
||||||
%global with_ldap_module 1
|
%global with_ldap_module 1
|
||||||
%global with_modsecurity_module 1
|
%global with_modsecurity_module 0
|
||||||
%global with_vts_module 1
|
%global with_vts_module 1
|
||||||
%global modsecver 3.0.2
|
%global modsecver 3.0.2
|
||||||
%global vtsversion 0.1.18
|
%global vtsversion 0.1.18
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
Name: nginx
|
Name: nginx
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.20.2
|
Version: 1.22.0
|
||||||
Release: 99%{?dist}
|
Release: 99%{?dist}
|
||||||
|
|
||||||
Summary: A high performance web server and reverse proxy server
|
Summary: A high performance web server and reverse proxy server
|
||||||
@@ -569,6 +569,9 @@ fi
|
|||||||
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
|
[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jun 4 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
||||||
|
- Updated to mainline version 1.22.0.
|
||||||
|
|
||||||
* Sat Jan 1 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
* Sat Jan 1 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
|
||||||
- Updated to mainline version 1.20.2.
|
- Updated to mainline version 1.20.2.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user