summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2014-08-09 22:31:39 +1000
committerPaul Mackerras <paulus@samba.org>2014-08-09 22:31:39 +1000
commit6e8eaa7a78b31cdab2edf140a9c8afdb02ffaca5 (patch)
treeb506f6786435f3b42695e551debac119384660f8
parentf8c05f21cc743132fb7c4b996568c09a374725b9 (diff)
downloadppp-6e8eaa7a78b31cdab2edf140a9c8afdb02ffaca5.tar.gz
Update README and patchlevel for 2.4.7 releaseppp-2.4.7
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--README13
-rw-r--r--pppd/patchlevel.h4
-rw-r--r--solaris/ppp_mod.c2
3 files changed, 15 insertions, 4 deletions
diff --git a/README b/README
index 3f172f8..a21d9f1 100644
--- 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.)
-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.
diff --git a/pppd/patchlevel.h b/pppd/patchlevel.h
index cd4b6b3..da5e052 100644
--- 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 4f4fd44..80ca203 100644
--- 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 */
- "PPP-2.4.6 multiplexing driver",
+ "PPP-2.4.7 multiplexing driver",
&ppp_ops /* driver ops */
};