From fc9c813cccf2e93ff66130fb09d13d4b642ca322 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 11:49:21 +0000 Subject: [PATCH 1/3] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- nginx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index 5f4fd2c..309a6c2 100644 --- a/nginx.spec +++ b/nginx.spec @@ -27,7 +27,7 @@ Name: nginx Epoch: 1 Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -281,6 +281,9 @@ fi %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1:1.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Aug 05 2014 Jamie Nguyen - 1:1.6.1-2 - add logic for EPEL 7 From 8f91f185c5a965447f2aa1f668922a9882e7df34 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Aug 2014 10:33:39 +0200 Subject: [PATCH 2/3] Perl 5.20 rebuild --- nginx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index 309a6c2..e8c88e0 100644 --- a/nginx.spec +++ b/nginx.spec @@ -27,7 +27,7 @@ Name: nginx Epoch: 1 Version: 1.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -281,6 +281,9 @@ fi %changelog +* Wed Aug 27 2014 Jitka Plesnikova - 1:1.6.1-4 +- Perl 5.20 rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 1:1.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 934d6046fab7b8b482b566268f147baa28a1d8e3 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Wed, 17 Sep 2014 07:37:25 +0100 Subject: [PATCH 3/3] Update to upstream release 1.6.2 --- .gitignore | 2 ++ nginx.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7779b9f..06e39e6 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/nginx.spec b/nginx.spec index e8c88e0..74a73d8 100644 --- a/nginx.spec +++ b/nginx.spec @@ -26,8 +26,8 @@ Name: nginx Epoch: 1 -Version: 1.6.1 -Release: 4%{?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,10 @@ fi %changelog +* Wed Sep 17 2014 Jamie Nguyen - 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 - 1:1.6.1-4 - Perl 5.20 rebuild diff --git a/sources b/sources index 4ca60ec..b3a4f89 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -45e5a11f48b001644676f7767980a2bf nginx-1.6.1.tar.gz -0d93ec092a87924ed2ba29ee4ff24334 nginx-1.6.1.tar.gz.asc +d1b55031ae6e4bce37f8776b94d8b930 nginx-1.6.2.tar.gz +694c9a8a6cac70e8c9731fbee210079e nginx-1.6.2.tar.gz.asc