Merge branch 'master' into epel7
This commit is contained in:
commit
618531bf75
2
.gitignore
vendored
2
.gitignore
vendored
@ -36,3 +36,5 @@ x86_64/
|
||||
/nginx-1.6.0.tar.gz.asc
|
||||
/nginx-1.6.1.tar.gz
|
||||
/nginx-1.6.1.tar.gz.asc
|
||||
/nginx-1.6.2.tar.gz
|
||||
/nginx-1.6.2.tar.gz.asc
|
||||
|
14
nginx.spec
14
nginx.spec
@ -26,8 +26,8 @@
|
||||
|
||||
Name: nginx
|
||||
Epoch: 1
|
||||
Version: 1.6.1
|
||||
Release: 2%{?dist}
|
||||
Version: 1.6.2
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: A high performance web server and reverse proxy server
|
||||
Group: System Environment/Daemons
|
||||
@ -281,6 +281,16 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Sep 17 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.2-1
|
||||
- update to upstream release 1.6.2
|
||||
- CVE-2014-3616 nginx: virtual host confusion (#1142573)
|
||||
|
||||
* Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.6.1-4
|
||||
- Perl 5.20 rebuild
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.6.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Tue Aug 05 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.1-2
|
||||
- add logic for EPEL 7
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user