Update README and patchlevel for 2.4.7 release

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/README b/README
index 3f172f8e9332ad1c8781aa508cdd34c31d58254f..a21d9f1dac7bfa143a5fcd334d324edbd76b3864 100644 (file)
--- a/README
+++ b/README
@@ -61,9 +61,20 @@ use any IP address.  (This only applies where the peer is
 authenticating itself to you, of course.)
 
 
 authenticating itself to you, of course.)
 
 

-What's new in ppp-2.4.6.
+What's new in ppp-2.4.7.

 ************************
 
 ************************
 

+* Fixed a potential security issue in parsing option files (CVE-2014-3158).
+
+* There is a new "stop-bits" option, which takes an argument of 1 or 2,
+  indicating the number of stop bits to use for async serial ports.
+
+* Various bug fixes.
+
+
+What was new in ppp-2.4.6.
+**************************
+

 * Man page updates.
 
 * Several bug fixes.
 * Man page updates.
 
 * Several bug fixes.

diff --git a/pppd/patchlevel.h b/pppd/patchlevel.h
index cd4b6b36563ba02c518909b908101715d0c42c7c..da5e0523dfc847b9e29bd0546c7dff2336fcafe2 100644 (file)
--- a/pppd/patchlevel.h
+++ b/pppd/patchlevel.h
@@ -1,2 +1,2 @@
-#define VERSION                "2.4.6"
-#define DATE           "2 January 2014"
+#define VERSION                "2.4.7"
+#define DATE           "9 August 2014"

diff --git a/solaris/ppp_mod.c b/solaris/ppp_mod.c
index 4f4fd44668b0801440d6617b6e8f574ddd14cdc7..80ca20345644fb583a488bc1f68475eec1f3bd38 100644 (file)
--- a/solaris/ppp_mod.c
+++ b/solaris/ppp_mod.c
@@ -91,7 +91,7 @@ static struct dev_ops ppp_ops = {
 
 static struct modldrv modldrv = {
     &mod_driverops,                    /* says this is a pseudo driver */
 
 static struct modldrv modldrv = {
     &mod_driverops,                    /* says this is a pseudo driver */

-    "PPP-2.4.6 multiplexing driver",
+    "PPP-2.4.7 multiplexing driver",

     &ppp_ops                           /* driver ops */
 };
 
     &ppp_ops                           /* driver ops */
 };