releasing version 3.2.4-1debian/3.2.4-1

3 files changed, 31 insertions, 6 deletions

diff --git a/debian/NEWS b/debian/NEWS
index fb7131b96..89fcaec03 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,11 +1,11 @@
-puppet (3.2.3-2) UNRELEASED; urgency=low
+puppet (3.2.4-1) unstable; urgency=high
 
   The puppet agent is now started by default, regardless of init system.
 
-  On a fresh installation, you will need to run "puppet agent --enable" before
-  it will connect to a puppet master to retrieve its catalog.
+    - On a fresh installation, you will need to run "puppet agent --enable"
+      before it will connect to a puppet master to retrieve its catalog.
 
- -- Stig Sandbeck Mathisen <ssm@debian.org>  Mon, 05 Aug 2013 23:26:19 +0200
+ -- Stig Sandbeck Mathisen <ssm@debian.org>  Fri, 16 Aug 2013 14:39:55 +0200
 
 puppet (3.1.0-1) experimental; urgency=low
 
diff --git a/debian/changelog b/debian/changelog
index 6f288ec23..11d1dc639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-puppet (3.2.3-2) UNRELEASED; urgency=low
+puppet (3.2.4-1) unstable; urgency=high
 
+  [ Micah Anderson ]
   * Change dependency on libaugeas-ruby to ruby-augeas (Closes: #719424)
 
- -- Micah Anderson <micah@debian.org>  Mon, 12 Aug 2013 15:32:11 -0400
+  [ Stig Sandbeck Mathisen ]
+  * Imported upstream version 3.2.4 (CVE-2013-4956, CVE-2013-4761)
+  * Start puppet agent by default, to reflect systemd configuration
+    * …but disable puppet agent on initial install
+    * Add dep8 tests for initially disabled puppet agent
+  * Remove deprecated passenger options
+
+ -- Stig Sandbeck Mathisen <ssm@debian.org>  Fri, 16 Aug 2013 16:47:28 +0200
 
 puppet (3.2.3-1) unstable; urgency=low
 
diff --git a/debian/puppetmaster-passenger.NEWS b/debian/puppetmaster-passenger.NEWS
new file mode 100644
index 000000000..f2dd069cf
--- /dev/null
+++ b/debian/puppetmaster-passenger.NEWS
@@ -0,0 +1,17 @@
+puppet (3.2.4-1) unstable; urgency=high
+
+  Two manual configuration changes needed for puppetmaster-passenger
+
+  For systems upgrading from apache 2.2 to apache 2.4, the file
+  /etc/apache2/sites-enabled/puppetmaster should be renamed to
+  /etc/apache2/sites-enabled/puppetmaster.conf
+
+  Some passenger options used by puppetmaster-passenger in the past have been
+  deprecated on passenger 4.0.0.  You will most likely have to remove the
+  keywords "RailsAutoDetect" and "RackAutoDetect" from puppetmaster-passenger's
+  apache2 configuration, by default in /etc/apache2/sites-enabled/puppetmaster.conf
+
+  For more information about this from Phusion Passenger. See
+  http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_rackautodetect_and_wsgiautodetect
+
+ -- Stig Sandbeck Mathisen <ssm@debian.org>  Fri, 16 Aug 2013 14:55:46 +0200