Google Git
Sign in
nginx/nginx-pkgoss/refs/tags/nginx-1.12.1^!/.
commit
3205f892bf6146553bdc2784d12f87b5dfa51aa5
[log]
author
Konstantin Pavlov <thresh@nginx.com>
Mon Jul 10 16:33:18 2017 +0300
committer
Konstantin Pavlov <thresh@nginx.com>
Mon Jul 10 16:33:18 2017 +0300
tree
956a50dfe1ef21ec8418ec0cc75c263b1646e4d8
parent
d44674306eb1608b0278155f767d29ded407aa00 [diff]
Updated nginx to 1.12.1.

diff --git a/debian/Makefile b/debian/Makefile
index 264a717..6c9fffd 100644
--- a/debian/Makefile
+++ b/debian/Makefile

@@ -1,9 +1,9 @@
 SHELL=		/bin/bash
 
-BASE_VERSION=	1.12.0
+BASE_VERSION=	1.12.1
 BASE_RELEASE=	1
-BASE_PREV=	1.11.13
-BASE_NEXT=	1.12.1
+BASE_PREV=	1.12.0
+BASE_NEXT=	1.12.2
 BASE_SRC=	nginx-$(BASE_VERSION).tar.gz
 SRCDIR=		nginx-$(BASE_VERSION)
 SRCPATH?=	../..

diff --git a/debian/nginx-module-geoip.changelog.in b/debian/nginx-module-geoip.changelog.in
index 6b8024f..e07ffd0 100644
--- a/debian/nginx-module-geoip.changelog.in
+++ b/debian/nginx-module-geoip.changelog.in

@@ -1,5 +1,11 @@
 nginx-module-geoip (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
 
+  * base version updated to 1.12.1-1.
+
+ -- Konstantin Pavlov <thresh@nginx.com>  Tue, 11 Jul 2017 16:24:50 +0300
+
+nginx-module-geoip (1.12.0-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
   * base version updated to 1.12.0-1.
 
  -- Konstantin Pavlov <thresh@nginx.com>  Wed, 12 Apr 2017 16:07:54 +0300

diff --git a/debian/nginx-module-image-filter.changelog.in b/debian/nginx-module-image-filter.changelog.in
index 06c167c..c9d32e6 100644
--- a/debian/nginx-module-image-filter.changelog.in
+++ b/debian/nginx-module-image-filter.changelog.in

@@ -1,5 +1,11 @@
 nginx-module-image-filter (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
 
+  * base version updated to 1.12.1-1.
+
+ -- Konstantin Pavlov <thresh@nginx.com>  Tue, 11 Jul 2017 16:25:24 +0300
+
+nginx-module-image-filter (1.12.0-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
   * base version updated to 1.12.0-1.
 
  -- Konstantin Pavlov <thresh@nginx.com>  Wed, 12 Apr 2017 16:08:58 +0300

diff --git a/debian/nginx-module-njs.changelog.in b/debian/nginx-module-njs.changelog.in
index 952d2eb..bb10f15 100644
--- a/debian/nginx-module-njs.changelog.in
+++ b/debian/nginx-module-njs.changelog.in

@@ -1,5 +1,11 @@
 nginx-module-njs (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
 
+  * base version updated to 1.12.1.
+
+ -- Konstantin Pavlov <thresh@nginx.com>  Tue, 11 Jul 2017 16:27:33 +0300
+
+nginx-module-njs (1.12.0.0.1.10-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
   * base version updated to 1.12.0.
 
  -- Konstantin Pavlov <thresh@nginx.com>  Wed, 12 Apr 2017 16:09:30 +0300

diff --git a/debian/nginx-module-perl.changelog.in b/debian/nginx-module-perl.changelog.in
index d91b7c1..5bbdd23 100644
--- a/debian/nginx-module-perl.changelog.in
+++ b/debian/nginx-module-perl.changelog.in

@@ -1,5 +1,11 @@
 nginx-module-perl (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
 
+  * base version updated to 1.12.1-1.
+
+ -- Konstantin Pavlov <thresh@nginx.com>  Tue, 11 Jul 2017 16:26:27 +0300
+
+nginx-module-perl (1.12.0-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
   * base version updated to 1.12.0-1.
 
  -- Konstantin Pavlov <thresh@nginx.com>  Wed, 12 Apr 2017 16:11:02 +0300

diff --git a/debian/nginx-module-xslt.changelog.in b/debian/nginx-module-xslt.changelog.in
index c739dab..d6ffc12 100644
--- a/debian/nginx-module-xslt.changelog.in
+++ b/debian/nginx-module-xslt.changelog.in

@@ -1,5 +1,11 @@
 nginx-module-xslt (%%VERSION_PREFIX%%%%MODULE_VERSION%%-%%MODULE_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
 
+  * base version updated to 1.12.1-1.
+
+ -- Konstantin Pavlov <thresh@nginx.com>  Tue, 11 Jul 2017 16:26:57 +0300
+
+nginx-module-xslt (1.12.0-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
   * base version updated to 1.12.0-1.
 
  -- Konstantin Pavlov <thresh@nginx.com>  Wed, 12 Apr 2017 16:11:42 +0300

diff --git a/debian/nginx.changelog.in b/debian/nginx.changelog.in
index 0710f17..6feb207 100644
--- a/debian/nginx.changelog.in
+++ b/debian/nginx.changelog.in

@@ -1,5 +1,12 @@
 nginx (%%MAIN_VERSION%%-%%MAIN_RELEASE%%~%%CODENAME%%) %%CODENAME%%; urgency=low
 
+  * 1.12.1
+  * Fixes CVE-2017-7529
+
+ -- Konstantin Pavlov <thresh@nginx.com>  Tue, 11 Jul 2017 16:29:18 +0300
+
+nginx (1.12.0-1~%%CODENAME%%) %%CODENAME%%; urgency=low
+
   * 1.12.0
 
  -- Konstantin Pavlov <thresh@nginx.com>  Wed, 12 Apr 2017 16:05:18 +0300

diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile
index 5dc8021..41fb086 100644
--- a/rpm/SPECS/Makefile
+++ b/rpm/SPECS/Makefile

@@ -1,6 +1,6 @@
 SHELL=		/bin/bash
 
-BASE_VERSION=	1.12.0
+BASE_VERSION=	1.12.1
 BASE_RELEASE=	1
 BASE_SRC=	nginx-$(BASE_VERSION).tar.gz
 SRCPATH?=	../SOURCES

diff --git a/rpm/SPECS/nginx-module-njs.changelog.in b/rpm/SPECS/nginx-module-njs.changelog.in
index 9a46de9..78e2fa2 100644
--- a/rpm/SPECS/nginx-module-njs.changelog.in
+++ b/rpm/SPECS/nginx-module-njs.changelog.in

@@ -1,3 +1,6 @@
+* Tue Jul 11 2017 Konstantin Pavlov <thresh@nginx.com>
+- base version updated to 1.12.1
+
 * Wed Apr 12 2017 Konstantin Pavlov <thresh@nginx.com>
 - base version updated to 1.12.0
 

diff --git a/rpm/SPECS/nginx-module.changelog.in b/rpm/SPECS/nginx-module.changelog.in
index bc280d1..9a5f52e 100644
--- a/rpm/SPECS/nginx-module.changelog.in
+++ b/rpm/SPECS/nginx-module.changelog.in

@@ -1,5 +1,8 @@
 # default changelog for module packages
 #
+* Tue Jul 11 2017 Konstantin Pavlov <thresh@nginx.com>
+- base version updated to 1.12.1
+
 * Wed Apr 12 2017 Konstantin Pavlov <thresh@nginx.com>
 - base version updated to 1.12.0
 

diff --git a/rpm/SPECS/nginx.spec.in b/rpm/SPECS/nginx.spec.in
index 33b7f58..5ba787f 100644
--- a/rpm/SPECS/nginx.spec.in
+++ b/rpm/SPECS/nginx.spec.in

@@ -312,6 +312,10 @@
 fi
 
 %changelog
+* Tue Jul 11 2017 Konstantin Pavlov <thresh@nginx.com>
+- 1.12.1
+- Fixes CVE-2017-7529
+
 * Wed Apr 12 2017 Konstantin Pavlov <thresh@nginx.com>
 - 1.12.0