public/rpms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nginx spec changed for better mainline comaptibility. Gitea update

Browse Source
This commit is contained in:
admin
2021-07-10 08:16:28 +02:00
parent 7efa714b4b
commit ca33d0a4dd
2 changed files with 71 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
centos/SPECS/nginx.spec
View File

@@ -10,15 +10,11 @@
%global modsecver 3.0.2 %global modsecver 3.0.2
%global vtsversion 0.1.18 %global vtsversion 0.1.18
%global headervers 0.33 %global headervers 0.33
# gperftools exist only on selected arches
%global with_gperftools 0
%global with_aio 1 %global with_aio 1
%if 0%{?rhel} > 6 || 0%{?fedora} > 24 # Disable strict symbol checks in the link editor.
%global with_mailcap_mimetypes 1 # See: https://src.fedoraproject.org/rpms/redhat-rpm-config/c/078af19
%endif %undefine _strict_symbol_defs_build
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
@@ -30,7 +26,7 @@ Group: System Environment/Daemons
# BSD License (two clause) # BSD License (two clause)
# http://www.freebsd.org/copyright/freebsd-license.html # http://www.freebsd.org/copyright/freebsd-license.html
License: BSD License: BSD
URL: http://nginx.org/ URL: https://nginx.org/
Source0: https://nginx.org/download/nginx-%{version}.tar.gz Source0: https://nginx.org/download/nginx-%{version}.tar.gz
Source1: ngx_http_auth_ldap_module.tar.gz Source1: ngx_http_auth_ldap_module.tar.gz
@@ -59,11 +55,7 @@ Source210: UPGRADE-NOTES-1.6-to-1.10
# removes -Werror in upstream build scripts. -Werror conflicts with # removes -Werror in upstream build scripts. -Werror conflicts with
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors. # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
Patch0: nginx-auto-cc-gcc.patch Patch0: nginx-auto-cc-gcc.patch
#Patch1: ngx_user_crypt.patch
%if 0%{?with_gperftools}
BuildRequires: gperftools-devel
%endif
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
@@ -301,7 +293,9 @@ sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' nginx.conf
# to error out. This is is also the reason for the DESTDIR environment # to error out. This is is also the reason for the DESTDIR environment
# variable. # variable.
export DESTDIR=%{buildroot} export DESTDIR=%{buildroot}
./configure \ # So the perl module finds its symbols:
nginx_ldopts="$RPM_LD_FLAGS -Wl,-E"
if ! ./configure \
--prefix=%{_datadir}/nginx \ --prefix=%{_datadir}/nginx \
--sbin-path=%{_sbindir}/nginx \ --sbin-path=%{_sbindir}/nginx \
--modules-path=%{_libdir}/nginx/modules \ --modules-path=%{_libdir}/nginx/modules \
@@ -317,19 +311,16 @@ export DESTDIR=%{buildroot}
--lock-path=/run/lock/subsys/nginx \ --lock-path=/run/lock/subsys/nginx \
--user=%{nginx_user} \ --user=%{nginx_user} \
--group=%{nginx_user} \ --group=%{nginx_user} \
--with-compat \
%if 0%{?with_aio} %if 0%{?with_aio}
--with-file-aio \ --with-file-aio \
%endif %endif
--with-ipv6 \
--with-http_ssl_module \
--with-http_v2_module \
--with-http_realip_module \ --with-http_realip_module \
--with-http_addition_module \ --with-http_addition_module \
--with-http_auth_request_module \ --with-http_auth_request_module \
--with-http_xslt_module=dynamic \ --with-http_xslt_module=dynamic \
--with-http_image_filter_module=dynamic \ --with-http_image_filter_module=dynamic \
--with-http_geoip_module=dynamic \ --with-http_geoip_module=dynamic \
--with-http_sub_module \
--with-http_dav_module \ --with-http_dav_module \
--with-http_flv_module \ --with-http_flv_module \
--with-http_mp4_module \ --with-http_mp4_module \
@@ -339,11 +330,10 @@ export DESTDIR=%{buildroot}
--with-http_secure_link_module \ --with-http_secure_link_module \
--with-http_degradation_module \ --with-http_degradation_module \
--with-http_slice_module \ --with-http_slice_module \
--with-http_ssl_module \
--with-http_stub_status_module \ --with-http_stub_status_module \
--with-http_sub_module \ --with-http_sub_module \
--with-http_v2_module \ --with-http_v2_module \
--with-http_perl_module=dynamic \
--with-http_auth_request_module \
--with-mail=dynamic \ --with-mail=dynamic \
--with-mail_ssl_module \ --with-mail_ssl_module \
--with-pcre \ --with-pcre \
@@ -353,9 +343,6 @@ export DESTDIR=%{buildroot}
%if 0%{?with_vts_module} %if 0%{?with_vts_module}
--add-dynamic-module=%{_builddir}/nginx-module-vts-%{vtsversion} \ --add-dynamic-module=%{_builddir}/nginx-module-vts-%{vtsversion} \
%endif %endif
%if 0%{?with_gperftools}
--with-google_perftools_module \
%endif
%if 0%{?with_ldap_module} %if 0%{?with_ldap_module}
--add-dynamic-module=%{_builddir}/ngx_http_auth_ldap_module \ --add-dynamic-module=%{_builddir}/ngx_http_auth_ldap_module \
%endif %endif
@@ -367,7 +354,6 @@ export DESTDIR=%{buildroot}
%endif %endif
%if 0%{?with_modsecurity_module} %if 0%{?with_modsecurity_module}
--add-dynamic-module=%{_builddir}/modsecurity-nginx-%{modsecver} \ --add-dynamic-module=%{_builddir}/modsecurity-nginx-%{modsecver} \
--with-compat \
%endif %endif
%if 0%{?with_set_misc_module} %if 0%{?with_set_misc_module}
--add-dynamic-module=%{_builddir}/ngx_devel_kit-master \ --add-dynamic-module=%{_builddir}/ngx_devel_kit-master \
@@ -376,9 +362,13 @@ export DESTDIR=%{buildroot}
--with-debug \ --with-debug \
--with-threads \ --with-threads \
--with-cc-opt="%{optflags} $(pcre-config --cflags)" \ --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
--with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols --with-ld-opt="$nginx_ldopts"; then
: configure failed
cat objs/autoconf.err
exit 1
fi
make %{?_smp_mflags} %make_build
%install %install
make install DESTDIR=%{buildroot} INSTALLDIRS=vendor make install DESTDIR=%{buildroot} INSTALLDIRS=vendor
@@ -591,11 +581,8 @@ fi
%config(noreplace) %{_sysconfdir}/nginx/fastcgi_params.default %config(noreplace) %{_sysconfdir}/nginx/fastcgi_params.default
%config(noreplace) %{_sysconfdir}/nginx/koi-utf %config(noreplace) %{_sysconfdir}/nginx/koi-utf
%config(noreplace) %{_sysconfdir}/nginx/koi-win %config(noreplace) %{_sysconfdir}/nginx/koi-win
%if ! 0%{?with_mailcap_mimetypes}
%config(noreplace) %{_sysconfdir}/nginx/mime.types %config(noreplace) %{_sysconfdir}/nginx/mime.types
%endif
%config(noreplace) %{_sysconfdir}/nginx/mime.types.default %config(noreplace) %{_sysconfdir}/nginx/mime.types.default
%config(noreplace) %{_sysconfdir}/nginx/mime.types
%config(noreplace) %{_sysconfdir}/nginx/nginx.conf %config(noreplace) %{_sysconfdir}/nginx/nginx.conf
%config(noreplace) %{_sysconfdir}/nginx/nginx.conf.default %config(noreplace) %{_sysconfdir}/nginx/nginx.conf.default
%config(noreplace) %{_sysconfdir}/nginx/scgi_params %config(noreplace) %{_sysconfdir}/nginx/scgi_params

29
fedora/SPECS/gitea.spec
View File

@@ -1,5 +1,5 @@
Name: gitea Name: gitea
Version: 1.14.3 Version: 1.14.4
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
@@ -82,39 +82,42 @@ getent passwd gitea > /dev/null || \
%changelog %changelog
* Wed Jun 23 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Sat Jul 10 2021 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to 1.14.4.
* Wed Jun 23 2021 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to 1.14.3. - Update to 1.14.3.
* Fri May 21 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Fri May 21 2021 Daniel Steiner <daniel.steiner@dsteiner.ch>
- First build on Fedora 34. - First build on Fedora 34.
* Mon May 10 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Mon May 10 2021 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to version 1.14.2. - Update to version 1.14.2.
* Thu Apr 22 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Thu Apr 22 2021 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to version 1.14.1. - Update to version 1.14.1.
* Fri Apr 9 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Fri Apr 9 2021 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to version 1.13.7. - Update to version 1.13.7.
* Sun Apr 4 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Sun Apr 4 2021 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to version 1.13.6. - Update to version 1.13.6.
* Sun Mar 7 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Sun Mar 7 2021 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to version 1.13.3. - Update to version 1.13.3.
* Sun Feb 7 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Sun Feb 7 2021 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to version 1.13.2. - Update to version 1.13.2.
* Wed Jan 6 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Wed Jan 6 2021 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to version 1.13.1. - Update to version 1.13.1.
* Sun Dec 20 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Sun Dec 20 2020 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to version 1.13.0. - Update to version 1.13.0.
* Sun Nov 29 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Sun Nov 29 2020 Daniel Steiner <daniel.steiner@dsteiner.ch>
- Update to version 1.12.6. - Update to version 1.12.6.
* Sat Oct 31 2020 Daniel Steiner <daniel.steiner@daniel-steiner.org> * Sat Oct 31 2020 Daniel Steiner <daniel.steiner@dsteiner.ch>
- First build for Fedora 33. - First build for Fedora 33.