- support for /udev/* devices

Changed files:
    ppp-udev.patch -> 1.1
    ppp.spec -> 1.120

diff --git a/ppp-udev.patch b/ppp-udev.patch
new file mode 100644 (file)
index 0000000..b3726b0
--- /dev/null
+++ b/ppp-udev.patch
@@ -0,0 +1,57 @@
+diff -Nur ppp-2.4.2/pppd.orig/auth.c ppp-2.4.2/pppd/auth.c
+--- ppp-2.4.2/pppd.orig/auth.c 2003-06-12 01:56:26.000000000 +0200
++++ ppp-2.4.2/pppd/auth.c      2004-09-18 16:10:54.004502160 +0200
+@@ -1506,8 +1506,11 @@
+      */
+ 
+     tty = devnam;
+-    if (strncmp(tty, "/dev/", 5) == 0)
++    if (strncmp(tty, "/dev/", 5) == 0) {
+       tty += 5;
++    } else if (strncmp(tty, "/udev/", 6) == 0) {
++      tty += 6;
++    }
+     logwtmp(tty, user, ifname);               /* Add wtmp login entry */
+ 
+ #if defined(_PATH_LASTLOG) && !defined(USE_PAM)
+@@ -1552,8 +1555,11 @@
+     char *tty;
+ 
+     tty = devnam;
+-    if (strncmp(tty, "/dev/", 5) == 0)
++    if (strncmp(tty, "/dev/", 5) == 0) {
+       tty += 5;
++    } else if (strncmp(tty, "/udev/", 6) == 0) {
++      tty += 6;
++    }
+     logwtmp(tty, "", "");             /* Wipe out utmp logout entry */
+ #endif /* ! USE_PAM */
+     logged_in = 0;
+diff -Nur ppp-2.4.2/pppd.orig/options.c ppp-2.4.2/pppd/options.c
+--- ppp-2.4.2/pppd.orig/options.c      2004-01-13 05:02:07.000000000 +0100
++++ ppp-2.4.2/pppd/options.c   2004-09-18 17:05:09.334032064 +0200
+@@ -487,8 +487,11 @@
+     size_t pl;
+ 
+     dev = devnam;
+-    if ((p = strstr(dev, "/dev/")) != NULL)
++    if ((p = strstr(dev, "/dev/")) != NULL) {
+       dev = p + 5;
++    } else if ((p = strstr(dev, "/udev/")) != NULL) {
++      dev = p + 6;
++    }
+     if (dev[0] == 0 || strcmp(dev, "tty") == 0)
+       return 1;               /* don't look for /etc/ppp/options.tty */
+     pl = strlen(_PATH_TTYOPT) + strlen(dev) + 1;
+diff -Nur ppp-2.4.2/pppd.orig/tty.c ppp-2.4.2/pppd/tty.c
+--- ppp-2.4.2/pppd.orig/tty.c  2004-01-13 05:17:59.000000000 +0100
++++ ppp-2.4.2/pppd/tty.c       2004-09-18 17:04:27.953757120 +0200
+@@ -300,7 +300,7 @@
+       if (*cp == 0)
+               return 0;
+ 
+-      if (strncmp("/dev/", cp, 5) != 0) {
++      if (strncmp("/dev/", cp, 5) != 0 && strncmp("/udev/", cp, 6) != 0) {
+               strlcpy(dev, "/dev/", sizeof(dev));
+               strlcat(dev, cp, sizeof(dev));
+               cp = dev;

diff --git a/ppp.spec b/ppp.spec
index c39c2328bfe6155a2f49b357e1e9e314c8ec72a1..dcab7901eac2892d3e3e50e68428ad5f3a6ef7ba 100644 (file)
--- a/ppp.spec
+++ b/ppp.spec
@@ -37,6 +37,7 @@ Patch7:               %{name}-rp-pppoe-macaddr.patch
 Patch8:                %{name}-radius.patch
 Patch9:                %{name}-pcap.patch
 Patch10:       %{name}-lib64.patch
+Patch11:       %{name}-udev.patch
 URL:           http://www.samba.org/ppp/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -127,6 +128,7 @@ Wtyczka PPPoATM dla pppd.
 %if "%{_lib}" == "lib64"
 %patch10 -p1
 %endif
+%patch11 -p1
 
 %build
 cd pppd/plugins/radius/radiusclient