From b71152f498668ebcdc44e2401a2f3c2ba488df41 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 24 Jun 2022 19:49:18 +0200 Subject: [PATCH] Updates for Fedora36 --- fedora/SPECS/echoip.spec | 15 ++++-- fedora/SPECS/gitea.spec | 13 +++-- fedora/SPECS/goaccess.spec | 5 +- fedora/SPECS/mod_auth_openidc.spec | 5 +- fedora/SPECS/mydumper.spec | 77 ++++++++++++++++++++++++++++++ fedora/SPECS/navidrome.spec | 5 +- fedora/SPECS/nginx.spec | 7 ++- 7 files changed, 112 insertions(+), 15 deletions(-) create mode 100644 fedora/SPECS/mydumper.spec diff --git a/fedora/SPECS/echoip.spec b/fedora/SPECS/echoip.spec index 51d79b8..c66c4a1 100644 --- a/fedora/SPECS/echoip.spec +++ b/fedora/SPECS/echoip.spec @@ -1,10 +1,10 @@ # You can get the latest commit using this commands: # git pull # git log --oneline | head -n 1 | awk '{print $1}' -%define gitv 58fd8a6 +%define gitv ffa6674 %define webd %{_var}/www %define gopath $(pwd)/go -%define domain echoip.daniel-steiner.org +%define domain echoip.dsteiner.ch %define protocol https %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} %build +mkdir go bin # save system PATH environment: SAVEPATH=$PATH # prepare go environment: @@ -53,11 +54,11 @@ export PATH=$SAVEPATH %install # modifying index.html file for required settings: -sed -i -e 's|.. .Host ..|%{protocol}://%{domain}|g' index.html -sed -i -e 's/8080/%{port}/g' index.html +sed -i -e 's|.. .Host ..|%{protocol}://%{domain}|g' html/index.html +sed -i -e 's/8080/%{port}/g' html/index.html install -d -m 0770 %{buildroot}%{_rundir}/%{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 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 @@ -116,6 +117,10 @@ fi %dir %attr(-,%{name},%{name}) %{_rundir}/%{name} %changelog +* Tue May 24 2022 Daniel Steiner +- First build on Fedora 35. +- Domain pattern changed and upated to latest git version. + * Fri May 11 2021 Daniel Steiner - First build on Fedora 34. diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index f6b446f..6238f87 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.16.7 +Version: 1.16.8 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -46,11 +46,11 @@ done # Fedora only provides golang 1.16, but we require 1.17 in mimimum: if [ -x /usr/local/go/bin/go ]; then 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 +# Overwrite LDFLAGS from rpm macros should be removed later: +LDFLAGS='' +export LDFLAGS +TAGS="bindata" make build %install rm -rf $RPM_BUILD_ROOT @@ -84,6 +84,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Fri May 20 2022 Daniel Steiner +- Update to 1.16.8. + * Fri May 6 2022 Daniel Steiner - Update to 1.16.7. diff --git a/fedora/SPECS/goaccess.spec b/fedora/SPECS/goaccess.spec index 67c2357..16064ec 100644 --- a/fedora/SPECS/goaccess.spec +++ b/fedora/SPECS/goaccess.spec @@ -7,7 +7,7 @@ %endif Name: goaccess -Version: 1.5.5 +Version: 1.6 Release: 99%{?dist} Summary: Real-time web log analyzer and interactive viewer License: GPLv2+ @@ -93,6 +93,9 @@ sed -i '/-pthread/d' configure.ac %{_mandir}/man1/%{name}.1* %changelog +* Fri Jun 24 2022 Daniel Steiner +- Update to 1.6. + * Fri Feb 18 2022 Daniel Steiner - Update to 1.5.5. diff --git a/fedora/SPECS/mod_auth_openidc.spec b/fedora/SPECS/mod_auth_openidc.spec index dddd075..cb0261c 100644 --- a/fedora/SPECS/mod_auth_openidc.spec +++ b/fedora/SPECS/mod_auth_openidc.spec @@ -14,7 +14,7 @@ %global httpd_pkg_cache_dir /var/cache/httpd/mod_auth_openidc Name: mod_auth_openidc -Version: 2.4.11 +Version: 2.4.11.2 Release: 1%{?dist} 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 %changelog +* Fri Jun 24 2022 Daniel Steiner +- Update to 2.4.11.2. + * Fri Feb 18 2022 Daniel Steiner - Update to 2.4.11. diff --git a/fedora/SPECS/mydumper.spec b/fedora/SPECS/mydumper.spec new file mode 100644 index 0000000..db8820b --- /dev/null +++ b/fedora/SPECS/mydumper.spec @@ -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 +- First build on Fedora 36. +- Update to 0.12.3. + +* Fri Mar 18 2022 Daniel Steiner +- First build on Fedora 35. + +* Sun Jul 4 2021 Daniel Steiner +- First build on Fedora 33. + diff --git a/fedora/SPECS/navidrome.spec b/fedora/SPECS/navidrome.spec index ad6d344..75db259 100644 --- a/fedora/SPECS/navidrome.spec +++ b/fedora/SPECS/navidrome.spec @@ -13,6 +13,7 @@ Source0: %{name}-%{version}.tar.gz Source1: %{name}.toml Source2: navidrome.sysuser Source3: navidrome.service +Patch0: nagidrom-wader-tag.patch BuildRequires: nodejs >= 16 BuildRequires: npm @@ -45,8 +46,10 @@ Features %prep %setup -q -n %name-%{version} +%patch0 -p0 %build +export NODE_OPTIONS='--openssl-legacy-provider' make setup make buildjs export CGO_LDFLAGS="${LDFLAGS}" @@ -54,7 +57,7 @@ export CGO_CFLAGS="${CFLAGS}" export CGO_CPPFLAGS="${CPPFLAGS}" export CGO_CXXFLAGS="${CXXFLAGS}" 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 -Dm755 %{name} %{buildroot}%{_bindir}/%{name} diff --git a/fedora/SPECS/nginx.spec b/fedora/SPECS/nginx.spec index 5b41cfa..4564025 100644 --- a/fedora/SPECS/nginx.spec +++ b/fedora/SPECS/nginx.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 %global nginx_user nginx %global with_ldap_module 1 -%global with_modsecurity_module 1 +%global with_modsecurity_module 0 %global with_vts_module 1 %global modsecver 3.0.2 %global vtsversion 0.1.18 @@ -19,7 +19,7 @@ Name: nginx Epoch: 1 -Version: 1.20.2 +Version: 1.22.0 Release: 99%{?dist} Summary: A high performance web server and reverse proxy server @@ -569,6 +569,9 @@ fi [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Sat Jun 4 2022 Daniel Steiner +- Updated to mainline version 1.22.0. + * Sat Jan 1 2022 Daniel Steiner - Updated to mainline version 1.20.2.