Update README and patchlevel for 2.4.6 release

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

diff --git a/README b/README
index a3bfe1730ddcc1634257c3eb83ddd4cc1303aa31..3f172f8e9332ad1c8781aa508cdd34c31d58254f 100644 (file)
--- a/README
+++ b/README
@@ -61,9 +61,28 @@ use any IP address.  (This only applies where the peer is
 authenticating itself to you, of course.)
 
 
-What's new in ppp-2.4.5.
+What's new in ppp-2.4.6.
 ************************
 
+* Man page updates.
+
+* Several bug fixes.
+
+* Options files can now set and unset environment variables for
+  scripts.
+
+* The timeout for chat scripts can now be taken from an environment
+  variable.
+
+* There is a new option, master_detach, which allows pppd to detach
+  from the controlling terminal when it is the multilink bundle master
+  but its own link has terminated, even if the nodetach option has
+  been given.
+
+
+What was new in ppp-2.4.5.
+**************************
+
 * Under Linux, pppd can now operate in a mode where it doesn't request
   the peer's IP address, as some peers refuse to supply an IP address.
   Since Linux supports device routes as well as gateway routes, it's

diff --git a/pppd/patchlevel.h b/pppd/patchlevel.h
index b7d6ce335e7caa95b0bf8f5812d9a1691cf043b9..cd4b6b36563ba02c518909b908101715d0c42c7c 100644 (file)
--- a/pppd/patchlevel.h
+++ b/pppd/patchlevel.h
@@ -1,2 +1,2 @@
-#define VERSION                "2.4.5"
-#define DATE           "17 November 2009"
+#define VERSION                "2.4.6"
+#define DATE           "2 January 2014"

diff --git a/solaris/ppp_mod.c b/solaris/ppp_mod.c
index b70674c47d85dd480e80878bdd5eae6d167b874a..4f4fd44668b0801440d6617b6e8f574ddd14cdc7 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 */
-    "PPP-2.3 multiplexing driver",
+    "PPP-2.4.6 multiplexing driver",
     &ppp_ops                           /* driver ops */
 };