From 170b75b31b1c4e1631a9f22a33b55922bf849601 Mon Sep 17 00:00:00 2001
From: Thomas Ruecker <thomas@ruecker.fi>
Date: Wed, 8 Apr 2015 11:32:27 +0300
Subject: [PATCH] Updated version number to 2.4.2, prep for release

This is going to be a strict security release
---
 ChangeLog                | 9 +++++++++
 configure.in             | 2 +-
 doc/admin-interface.html | 2 +-
 doc/auth.html            | 2 +-
 doc/basic-setup.html     | 2 +-
 doc/changes.html         | 6 +++---
 doc/config-file.html     | 4 ++--
 doc/faq.html             | 2 +-
 doc/glossary.html        | 2 +-
 doc/index.html           | 4 ++--
 doc/introduction.html    | 2 +-
 doc/relaying.html        | 2 +-
 doc/server-stats.html    | 2 +-
 doc/win32.html           | 2 +-
 doc/yp.html              | 2 +-
 15 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ef67ce22..4ed3aaef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-04-08 11:32:23  dm8tbr
+
+	* update version number to 2.4.2 in preparation for release
+	  this will be a strict security release
+
+2015-04-08 11:18:40  dm8tbr
+
+	* applying curl fix for win32 from master
+
 2014-11-19 13:42:23  dm8tbr
 
 	* This is Spaaarrr^w Icecast 2.4.1!
diff --git a/configure.in b/configure.in
index b13bc36c..964def45 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([Icecast], [2.4.1], [icecast@xiph.org])
+AC_INIT([Icecast], [2.4.2], [icecast@xiph.org])
 
 AC_PREREQ(2.54)
 AC_CONFIG_SRCDIR(src/main.c)
diff --git a/doc/admin-interface.html b/doc/admin-interface.html
index 7553f8c9..641cd1ae 100644
--- a/doc/admin-interface.html
+++ b/doc/admin-interface.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Admin Interface</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Admin Interface</h2>
       
 <div class="article">
 
diff --git a/doc/auth.html b/doc/auth.html
index 2454fc15..bd0c652b 100644
--- a/doc/auth.html
+++ b/doc/auth.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Authentication</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Authentication</h2>
       
 <div class="article">
   <h3 id="listener-authentication">Listener Authentication</h3>
diff --git a/doc/basic-setup.html b/doc/basic-setup.html
index 72bd22dc..2b76a4e9 100644
--- a/doc/basic-setup.html
+++ b/doc/basic-setup.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Basic Setup</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Basic Setup</h2>
       
 <div class="article">
   <h3 id="basic-requirements">Basic Requirements</h3>
diff --git a/doc/changes.html b/doc/changes.html
index 374686cb..6f27217b 100644
--- a/doc/changes.html
+++ b/doc/changes.html
@@ -16,10 +16,10 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Changes</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Changes</h2>
       
-<div id="v2.4.1" class="article">
-  <h3 id="version-241">Version 2.4.1</h3>
+<div id="v2.4.2" class="article">
+  <h3 id="version-241">Version 2.4.2</h3>
 
   <h4 id="fixes">Fixes</h4>
 
diff --git a/doc/config-file.html b/doc/config-file.html
index 92accfe5..8122ed80 100644
--- a/doc/config-file.html
+++ b/doc/config-file.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Config File</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Config File</h2>
       
 <div class="article">
   <h3 id="overview">Overview</h3>
@@ -168,7 +168,7 @@ The value for this setting is provided by the owner of the Directory server.</dd
 <span class="nt">&lt;location&gt;</span>earth<span class="nt">&lt;/location&gt;</span>
 <span class="nt">&lt;admin&gt;</span>icemaster@localhost<span class="nt">&lt;/admin&gt;</span>
 <span class="nt">&lt;fileserve&gt;</span>1<span class="nt">&lt;/fileserve&gt;</span>
-<span class="nt">&lt;server-id&gt;</span>icecast 2.4.1<span class="nt">&lt;/server-id&gt;</span></code></pre></div>
+<span class="nt">&lt;server-id&gt;</span>icecast 2.4.2<span class="nt">&lt;/server-id&gt;</span></code></pre></div>
 
   <dl>
     <dt>hostname</dt>
diff --git a/doc/faq.html b/doc/faq.html
index 6b20686d..aeb3605e 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; FAQ</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; FAQ</h2>
       
 <div class="article">
   <h3 id="general-questions">General Questions</h3>
diff --git a/doc/glossary.html b/doc/glossary.html
index 36006bd0..607b6a6f 100644
--- a/doc/glossary.html
+++ b/doc/glossary.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Glossary</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Glossary</h2>
       
 <div class="article">
   <dl>
diff --git a/doc/index.html b/doc/index.html
index 9ab3cf53..8a00c5a5 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Table of Contents</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Table of Contents</h2>
       
 <div class="article">
   <h3 id="pages">Pages</h3>
@@ -39,7 +39,7 @@
 </div>
 
 <div class="article">
-  <h3 id="icecast-241-readme">Icecast 2.4.1 Readme</h3>
+  <h3 id="icecast-241-readme">Icecast 2.4.2 Readme</h3>
   <p>Icecast is a streaming media server which currently supports Ogg
 Vorbis and MP3 audio streams. It can be used to create an Internet
 radio station or a privately running jukebox and many things in
diff --git a/doc/introduction.html b/doc/introduction.html
index ad3f3699..f3bccd5e 100644
--- a/doc/introduction.html
+++ b/doc/introduction.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Introduction</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Introduction</h2>
       
 <div class="article">
   <h3 id="what-is-icecast">What is Icecast?</h3>
diff --git a/doc/relaying.html b/doc/relaying.html
index ff920712..6b9f5249 100644
--- a/doc/relaying.html
+++ b/doc/relaying.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Relaying</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Relaying</h2>
       
 <div class="article">
   <h3 id="overview">Overview</h3>
diff --git a/doc/server-stats.html b/doc/server-stats.html
index 44d06cd0..d9983554 100644
--- a/doc/server-stats.html
+++ b/doc/server-stats.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Server Statistics</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Server Statistics</h2>
       
 <div class="article">
   <h3 id="overview">Overview</h3>
diff --git a/doc/win32.html b/doc/win32.html
index 6dcb8820..fc354c54 100644
--- a/doc/win32.html
+++ b/doc/win32.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; Win32 Specifics</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; Win32 Specifics</h2>
       
 <div class="article">
   <p>The Win32 port of Icecast 2 is a simple command line application,
diff --git a/doc/yp.html b/doc/yp.html
index d805bb57..2f8f76ab 100644
--- a/doc/yp.html
+++ b/doc/yp.html
@@ -16,7 +16,7 @@
 
     <div class="section">
       
-      <h2>Icecast 2.4.1 Docs &mdash; YP Directories</h2>
+      <h2>Icecast 2.4.2 Docs &mdash; YP Directories</h2>
       
 <div class="article">
   <h3 id="overview">Overview</h3>
-- 
GitLab