Update to 1.0.15 and perform hardened build
This commit is contained in:
parent
4cdcd0ccc3
commit
669abfd1c4
14
nginx.spec
14
nginx.spec
@ -1,3 +1,4 @@
|
|||||||
|
%global _hardened_build 1
|
||||||
%global nginx_user nginx
|
%global nginx_user nginx
|
||||||
%global nginx_group %{nginx_user}
|
%global nginx_group %{nginx_user}
|
||||||
%global nginx_home %{_localstatedir}/lib/nginx
|
%global nginx_home %{_localstatedir}/lib/nginx
|
||||||
@ -9,7 +10,7 @@
|
|||||||
|
|
||||||
Name: nginx
|
Name: nginx
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.0.14
|
Version: 1.0.15
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Summary: A high performance web server and reverse proxy server
|
Summary: A high performance web server and reverse proxy server
|
||||||
@ -34,7 +35,7 @@ Source104: 50x.html
|
|||||||
|
|
||||||
# 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
|
||||||
|
|
||||||
BuildRequires: GeoIP-devel
|
BuildRequires: GeoIP-devel
|
||||||
BuildRequires: gd-devel
|
BuildRequires: gd-devel
|
||||||
@ -64,7 +65,7 @@ memory usage.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p0
|
#%patch0 -p0
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -109,7 +110,7 @@ export DESTDIR=%{buildroot}
|
|||||||
--with-mail \
|
--with-mail \
|
||||||
--with-mail_ssl_module \
|
--with-mail_ssl_module \
|
||||||
--with-cc-opt="%{optflags} $(pcre-config --cflags)" \
|
--with-cc-opt="%{optflags} $(pcre-config --cflags)" \
|
||||||
--with-ld-opt="-Wl,-E" # so the perl module finds its symbols
|
--with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
@ -212,6 +213,11 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Apr 14 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk. - 1:1.0.15-1
|
||||||
|
- update to upstream release 1.0.15
|
||||||
|
- no need to apply auto-cc-gcc patch
|
||||||
|
- add %%global _hardened_build 1
|
||||||
|
|
||||||
* Thu Mar 15 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk> - 1:1.0.14-1
|
* Thu Mar 15 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk> - 1:1.0.14-1
|
||||||
- update to upstream release 1.0.14
|
- update to upstream release 1.0.14
|
||||||
- amend some %%changelog formatting
|
- amend some %%changelog formatting
|
||||||
|
Loading…
Reference in New Issue
Block a user