Sync from SUSE:SLFO:Main nginx-macros revision ab02c5ee3142961ebcba888970e5631d
This commit is contained in:
commit
6eea352c64
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
26
nginx-macros.changes
Normal file
26
nginx-macros.changes
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 16 23:31:02 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
|
||||||
|
|
||||||
|
- Since we only target sle 12 and above we can skip all
|
||||||
|
conditionals which apply to suse_version before 1315
|
||||||
|
|
||||||
|
With changes in nginx itself we will drop support for sysvinit.
|
||||||
|
http2, libatomic support and pcre_jit will always be on now.
|
||||||
|
and we build all binaries with PIE now.
|
||||||
|
- Moved the last 2 path macros from nginx.spec to the macros file.
|
||||||
|
(pid and lock path)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 11 08:43:09 UTC 2021 - Felix Schnizlein <fschnizlein@suse.com>
|
||||||
|
|
||||||
|
- Remove {?is_opensuse} conditions to sync openSUSE and SLE (jsc#SLE-12124)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Nov 9 15:41:53 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
|
||||||
|
|
||||||
|
- Refresh spec-file via spec-cleaner and manual optimizations.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 2 03:15:57 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
|
||||||
|
|
||||||
|
- initial package
|
42
nginx-macros.spec
Normal file
42
nginx-macros.spec
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
#
|
||||||
|
# spec file for package nginx-macros
|
||||||
|
#
|
||||||
|
# Copyright (c) 2021 SUSE LLC
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
Name: nginx-macros
|
||||||
|
Version: 0.0.1
|
||||||
|
Release: 0
|
||||||
|
Summary: Just some macros to make packaging nginx and modules easier
|
||||||
|
License: BSD-2-Clause
|
||||||
|
Group: Productivity/Networking/Web/Proxy
|
||||||
|
URL: https://nordisch.org
|
||||||
|
Source0: nginx.macros
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description
|
||||||
|
Just some macros to make packaging nginx and modules easier.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
|
||||||
|
%build
|
||||||
|
|
||||||
|
%install
|
||||||
|
install -Dpm0644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/macros.nginx
|
||||||
|
|
||||||
|
%files
|
||||||
|
%{_rpmmacrodir}/macros.nginx
|
||||||
|
|
||||||
|
%changelog
|
87
nginx.macros
Normal file
87
nginx.macros
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
%ngx_prefix %{_prefix}
|
||||||
|
%ngx_sbin_path %{_sbindir}/nginx
|
||||||
|
%ngx_module_dir %{_libdir}/nginx/modules
|
||||||
|
%ngx_conf_dir %{_sysconfdir}/nginx
|
||||||
|
%ngx_conf_path %{ngx_conf_dir}/nginx.conf
|
||||||
|
%ngx_log_dir %{_localstatedir}/log/nginx
|
||||||
|
%ngx_error_log %{ngx_log_dir}/error.log
|
||||||
|
%ngx_access_log %{ngx_log_dir}/access.log
|
||||||
|
%ngx_home %{_localstatedir}/lib/nginx
|
||||||
|
%ngx_tmp_http %{ngx_home}/tmp/
|
||||||
|
%ngx_tmp_proxy %{ngx_home}/proxy/
|
||||||
|
%ngx_tmp_fcgi %{ngx_home}/fastcgi/
|
||||||
|
%ngx_tmp_scgi %{ngx_home}/scgi/
|
||||||
|
%ngx_tmp_uwsgi %{ngx_home}/uwsgi/
|
||||||
|
%ngx_user_group nginx
|
||||||
|
%ngx_doc_dir %{_docdir}/%{name}
|
||||||
|
%ngx_pid_path /run/nginx.pid
|
||||||
|
%ngx_lock_path /run/nginx.lock
|
||||||
|
|
||||||
|
%ngx_conditionals \
|
||||||
|
%bcond_with ngx_cpp_test \
|
||||||
|
%bcond_with ngx_google_perftools \
|
||||||
|
%{nil}
|
||||||
|
|
||||||
|
%ngx_configure \
|
||||||
|
./configure \\\
|
||||||
|
--prefix=%{ngx_prefix}/ \\\
|
||||||
|
--sbin-path=%{ngx_sbin_path} \\\
|
||||||
|
--modules-path=%{ngx_module_dir} \\\
|
||||||
|
--conf-path=%{ngx_conf_path} \\\
|
||||||
|
--error-log-path=%{ngx_error_log} \\\
|
||||||
|
--http-log-path=%{ngx_access_log} \\\
|
||||||
|
--pid-path=%{ngx_pid_path} \\\
|
||||||
|
--lock-path=%{ngx_lock_path} \\\
|
||||||
|
--http-client-body-temp-path=%{ngx_tmp_http} \\\
|
||||||
|
--http-proxy-temp-path=%{ngx_tmp_proxy} \\\
|
||||||
|
--http-fastcgi-temp-path=%{ngx_tmp_fcgi} \\\
|
||||||
|
--http-uwsgi-temp-path=%{ngx_tmp_uwsgi} \\\
|
||||||
|
--http-scgi-temp-path=%{ngx_tmp_scgi} \\\
|
||||||
|
--user=nginx --group=nginx \\\
|
||||||
|
--without-select_module \\\
|
||||||
|
--without-poll_module \\\
|
||||||
|
--with-threads \\\
|
||||||
|
--with-file-aio \\\
|
||||||
|
--with-ipv6 \\\
|
||||||
|
--with-http_ssl_module \\\
|
||||||
|
--with-http_v2_module \\\
|
||||||
|
--with-http_realip_module \\\
|
||||||
|
--with-http_addition_module \\\
|
||||||
|
--with-http_xslt_module=dynamic \\\
|
||||||
|
--with-http_image_filter_module=dynamic \\\
|
||||||
|
--with-http_sub_module \\\
|
||||||
|
--with-http_dav_module \\\
|
||||||
|
--with-http_flv_module \\\
|
||||||
|
--with-http_mp4_module \\\
|
||||||
|
--with-http_gunzip_module \\\
|
||||||
|
--with-http_gzip_static_module \\\
|
||||||
|
--with-http_auth_request_module \\\
|
||||||
|
--with-http_random_index_module \\\
|
||||||
|
--with-http_secure_link_module \\\
|
||||||
|
--with-http_degradation_module \\\
|
||||||
|
--with-http_slice_module \\\
|
||||||
|
--with-http_stub_status_module \\\
|
||||||
|
--with-http_perl_module=dynamic \\\
|
||||||
|
--with-perl=%{_bindir}/perl \\\
|
||||||
|
--with-mail=dynamic \\\
|
||||||
|
--with-mail_ssl_module \\\
|
||||||
|
--with-stream=dynamic \\\
|
||||||
|
--with-stream_ssl_module \\\
|
||||||
|
--with-stream_realip_module \\\
|
||||||
|
--with-stream_ssl_preread_module \\\
|
||||||
|
--with-pcre \\\
|
||||||
|
--with-pcre-jit \\\
|
||||||
|
%if %{with ngx_google_perftools} \
|
||||||
|
--with-google_perftools_module \\\
|
||||||
|
%endif \
|
||||||
|
%if %{with ngx_cpp_test} \
|
||||||
|
--with-cpp_test_module \\\
|
||||||
|
%endif \
|
||||||
|
--with-cc-opt="%{optflags} -fPIC -D_GNU_SOURCE" \\\
|
||||||
|
--with-ld-opt="-Wl,-z,relro,-z,now -pie" \\\
|
||||||
|
--with-compat
|
||||||
|
|
||||||
|
|
||||||
|
%ngx_requires \
|
||||||
|
%requires_eq nginx \
|
||||||
|
%{nil}
|
Loading…
Reference in New Issue
Block a user