From 52cc8591839b756619eb4af1c33dd9ca1653369a Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Fri, 26 Apr 2013 21:21:15 +0100 Subject: [PATCH] Update to upstream release 1.4.0 --- .gitignore | 1 + nginx-1.4.0.tar.gz.asc | 11 +++ nginx.spec | 165 +++++------------------------------------ sources | 3 +- 4 files changed, 33 insertions(+), 147 deletions(-) create mode 100644 nginx-1.4.0.tar.gz.asc diff --git a/.gitignore b/.gitignore index bec8aed..bf4c3f0 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ x86_64/ /nginx-1.2.7.tar.gz.asc /nginx-1.2.8.tar.gz /nginx-1.2.8.tar.gz.asc +/nginx-1.4.0.tar.gz diff --git a/nginx-1.4.0.tar.gz.asc b/nginx-1.4.0.tar.gz.asc new file mode 100644 index 0000000..a6b5697 --- /dev/null +++ b/nginx-1.4.0.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.13 (FreeBSD) + +iQEcBAABAgAGBQJRd+W7AAoJEFIKmZOhwFL4vCkH/i8KXSXisZksvw+n5QM2Wdx2 +h/hgGcBmhgGsbSVvp5KmDnxvv4vxmXk1OzoLBm8yhk8PrPF65O/XKA1wdPoy0fa3 +gTp3WFi2ySKP73zqDJRU95SviZjoAZUcOiaHdNX/Yj9WD6l5v1a5eM83Ck9NpNKT +7/JndYYZoYN4+UN4iEJDn+5cDnx6x4vOedB7bYyAucO5cECC/RPvPyrqi98rdvoZ +BQdYGwp8v5zspiHp3aPKpiCLm+f++jJGitZFAcU5axLi71sYnMnELpG2lSSJQHc4 +7T1QVz5KMhdTwa3NveKSaJMOD+0WJJLVItedKiVLYdt/9fCo18VeGxnPi4b/ON0= +=fIaG +-----END PGP SIGNATURE----- diff --git a/nginx.spec b/nginx.spec index 7d4fd46..da13ee9 100644 --- a/nginx.spec +++ b/nginx.spec @@ -10,7 +10,7 @@ Name: nginx Epoch: 1 -Version: 1.2.8 +Version: 1.4.0 Release: 1%{?dist} Summary: A high performance web server and reverse proxy server @@ -39,6 +39,7 @@ Patch0: nginx-auto-cc-gcc.patch BuildRequires: GeoIP-devel BuildRequires: gd-devel +BuildRequires: gperftools-devel BuildRequires: libxslt-devel BuildRequires: openssl-devel BuildRequires: pcre-devel @@ -92,6 +93,7 @@ export DESTDIR=%{buildroot} --with-file-aio \ --with-ipv6 \ --with-http_ssl_module \ + --with-http_spdy_module \ --with-http_realip_module \ --with-http_addition_module \ --with-http_xslt_module \ @@ -101,6 +103,7 @@ export DESTDIR=%{buildroot} --with-http_dav_module \ --with-http_flv_module \ --with-http_mp4_module \ + --with-http_gunzip_module \ --with-http_gzip_static_module \ --with-http_random_index_module \ --with-http_secure_link_module \ @@ -109,6 +112,9 @@ export DESTDIR=%{buildroot} --with-http_perl_module \ --with-mail \ --with-mail_ssl_module \ + --with-pcre \ + --with-google_perftools_module \ + --with-debug \ --with-cc-opt="%{optflags} $(pcre-config --cflags)" \ --with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols @@ -151,13 +157,11 @@ install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_mandir}/man8/nginx-upgrade.8 %pre -if [ $1 -eq 1 ]; then - getent group %{nginx_group} > /dev/null || groupadd -r %{nginx_group} - getent passwd %{nginx_user} > /dev/null || \ - useradd -r -d %{nginx_home} -g %{nginx_group} \ - -s /sbin/nologin -c "Nginx web server" %{nginx_user} - exit 0 -fi +getent group %{nginx_group} > /dev/null || groupadd -r %{nginx_group} +getent passwd %{nginx_user} > /dev/null || \ + useradd -r -d %{nginx_home} -g %{nginx_group} \ + -s /sbin/nologin -c "Nginx web server" %{nginx_user} +exit 0 %post %systemd_post nginx.service @@ -210,6 +214,14 @@ fi %changelog +* Fri Apr 26 2013 Jamie Nguyen - 1:1.4.0-1 +- update to upstream release 1.4.0 +- enable SPDY module (new in this version) +- enable http gunzip module (new in this version) +- enable google perftools module and add gperftools-devel to BR +- enable debugging (#956845) +- trim changelog + * Tue Apr 02 2013 Jamie Nguyen - 1:1.2.8-1 - update to upstream release 1.2.8 @@ -385,140 +397,3 @@ fi * Fri Dec 04 2009 Jeremy Hinegardner - 0.7.64-1 - Update to new stable 0.7.64 - -* Tue Oct 29 2009 Jeremy Hinegardner - 0.7.63-1 -- Update to new stable 0.7.63 -- reinstate zlib dependency - -* Mon Sep 14 2009 Jeremy Hinegardner - 0.7.62-1 -- Update to new stable 0.7.62 -- fixes CVE-2009-2629 -- fix rpmlint zlib dependency complaint - -* Fri Aug 21 2009 Tomas Mraz - 0.7.61-2 -- rebuilt with new openssl - -* Sun Aug 02 2009 Jeremy Hinegardner - 0.7.61-1 -- Update to new stable 0.7.61 - -* Sat Jul 25 2009 Fedora Release Engineering - 0.6.36-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sun May 17 2009 Jeremy Hinegardner - 0.6.36-2 -- init script updates from Gena Makhomed -- remove nginx-upstream-fair - -* Sat Apr 11 2009 Jeremy Hinegardner - 0.6.36-1 -- update to 0.6.36 - -* Wed Feb 25 2009 Fedora Release Engineering - 0.6.35-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Feb 19 2009 Jeremy Hinegardner - 0.6.35-2 -- rebuild - -* Thu Feb 19 2009 Jeremy Hinegardner - 0.6.35-1 -- update to 0.6.35 - -* Sat Jan 17 2009 Tomas Mraz - 0.6.34-2 -- rebuild with new openssl - -* Tue Dec 30 2008 Jeremy Hinegardner - 0.6.34-1 -- update to 0.6.34 - -* Thu Dec 4 2008 Michael Schwendt - 0.6.33-2 -- Fix inclusion of /usr/share/nginx tree => no unowned directories. - -* Sun Nov 23 2008 Jeremy Hinegardner - 0.6.33-1 -- update to 0.6.33 - -* Tue Jul 22 2008 Jeremy Hinegardner - 0.6.32-1 -- update to 0.6.32 -- nginx now supports DESTDIR so removed the patches that enabled it - -* Mon May 26 2008 Jeremy Hinegardner - 0.6.31-3 -- init script fixes -- resolve 'listen 80 default' [#447873] - -* Mon May 12 2008 Jeremy Hinegardner - 0.6.31-2 -- update to 0.6.31 - -* Sun May 11 2008 Jeremy Hinegardner - 0.6.30-2 -- upate to new upstream stable branch 0.6 -- added 3rd party module nginx-upstream-fair -- added default webpages - -* Sun Apr 20 2008 Jeremy Hinegardner - 0.5.35-2 -- update init script to match recommended guidelines -- add /etc/nginx/conf.d support [#443280] -- use /etc/sysconfig/nginx to determine nginx.conf [#442708] - -* Tue Mar 18 2008 Tom "spot" Callaway - 0.5.35-3 -- add Requires for versioned perl (libperl.so) -- drop silly file Requires - -* Tue Feb 19 2008 Fedora Release Engineering - 0.5.35-2 -- Autorebuild for GCC 4.3 - -* Sat Jan 19 2008 Jeremy Hinegardner - 0.5.35-1 -- update to 0.5.35 - -* Sat Dec 15 2007 Jeremy Hinegardner - 0.5.34-1 -- update to 0.5.34 - -* Wed Dec 05 2007 Release Engineering - 0.5.33-2 - - Rebuild for deps - -* Sun Nov 11 2007 Jeremy Hinegardner - 0.5.33-1 -- update to 0.5.33 - -* Mon Sep 24 2007 Jeremy Hinegardner - 0.5.32-1 -- updated to 0.5.32 -- fixed rpmlint UTF-8 complaints. - -* Sat Aug 18 2007 Jeremy Hinegardner - 0.5.31-2 -- added --with-http_stub_status_module build option. -- added --with-http_sub_module build option. -- added use of pcre-config --cflags - -* Fri Aug 17 2007 Jeremy Hinegardner - 0.5.31-1 -- Update to 0.5.31 -- specify license is BSD - -* Sat Aug 11 2007 Jeremy Hinegardner - 0.5.30-2 -- Add BuildRequires: perl-devel - fixing rawhide build - -* Mon Jul 30 2007 Jeremy Hinegardner - 0.5.30-1 -- Update to 0.5.30 - -* Tue Jul 24 2007 Jeremy Hinegardner - 0.5.29-1 -- Update to 0.5.29 - -* Wed Jul 18 2007 Jeremy Hinegardner - 0.5.28-1 -- Update to 0.5.28 - -* Mon Jul 09 2007 Jeremy Hinegardner - 0.5.27-1 -- Update to 0.5.27 - -* Mon Jun 18 2007 Jeremy Hinegardner - 0.5.26-1 -- Update to 0.5.26 - -* Sat Apr 28 2007 Jeremy Hinegardner - 0.5.19-1 -- Update to 0.5.19 - -* Mon Apr 02 2007 Jeremy Hinegardner - 0.5.17-1 -- Update to 0.5.17 - -* Mon Mar 26 2007 Jeremy Hinegardner - 0.5.16-1 -- Update to 0.5.16 -- add ownership of /usr/share/nginx/html (#233950) - -* Fri Mar 23 2007 Jeremy Hinegardner - 0.5.15-3 -- fixed package review bugs (#235222) given by ruben@rubenkerkhof.com - -* Thu Mar 22 2007 Jeremy Hinegardner - 0.5.15-2 -- fixed package review bugs (#233522) given by kevin@tummy.com - -* Thu Mar 22 2007 Jeremy Hinegardner - 0.5.15-1 -- create patches to assist with building for Fedora -- initial packaging for Fedora diff --git a/sources b/sources index cd4f21c..a25893f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b9f7640cca35196d0e719ac5da24c7bd nginx-1.2.8.tar.gz -667456b02a3bda6851a778e06cd7a696 nginx-1.2.8.tar.gz.asc +d496e58864ab10ed56278b7655b0d0b2 nginx-1.4.0.tar.gz